Skip to content

O
order-group
Commit e434b10d by ping.wu
Options

结算页提示去除

parent 0162e603
Showing with 25 additions and 21 deletions
shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/calculate/ExclusiveActivity.java
......@@ -6,7 +6,11 @@ import lombok.Data;
@Data
public class ExclusiveActivity {
private Integer type;
private Integer activityType;
private String name;
private String activityCode;
private String activityName;
private String activityTypeName;
}
shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ActivityMutexConfig.java
......@@ -10,6 +10,6 @@ public class ActivityMutexConfig {
private String activityMutex;
//优惠券与活动互斥 1=开启 0=关闭
private String couponactivityMutex;
// private String couponactivityMutex;
}
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
......@@ -3365,25 +3365,25 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
}
ActivityMutexConfig config = JSONObject.parseObject(value,ActivityMutexConfig.class);
if("0".equals(config.getActivityMutex()) && "0".equals(config.getCouponactivityMutex())){
if("0".equals(config.getActivityMutex())){
return;
}
//点餐页 添加购物车/更新购物车，（活动与活动互斥，活动与优惠券互斥）
if(ObjectUtils.equals(SubmitPageEnum.NO.getCode(), flag) && addOrUpdate && "1".equals(config.getActivityMutex())){
if(CollectionUtils.isNotEmpty(calculationDiscountResult.getCouponDiscounts())){
if(CollectionUtils.isNotEmpty(calculationDiscountResult.getCouponDiscounts())
&& calculationDiscountResult.getCouponDiscounts().get(0).getPromotionSharing() == 1){//是否与促销活动共享 0不同享 1同享
if(calculationDiscountResult.getExclusiveActivityList().size() >1 ){
toastMsg = "多个促销活动不同享 活动商品优惠发生变化";
}else {
String activityName = calculationDiscountResult.getExclusiveActivityList().get(0).getName();
toastMsg = "优惠券与" + activityName + "活动不同享 活动商品优惠发生变化";
toastMsg = "优惠券与其他促销活动不同享 活动商品优惠发生变化";
}
}
if(CollectionUtils.isNotEmpty(calculationDiscountResult.getDiscounts())){
if(calculationDiscountResult.getExclusiveActivityList().size() >1 ){
toastMsg = "多个促销活动不同享 活动商品优惠发生变化";
}else {
String activityName = calculationDiscountResult.getExclusiveActivityList().get(0).getName();
String activityName = calculationDiscountResult.getExclusiveActivityList().get(0).getActivityTypeName();
Integer type = calculationDiscountResult.getDiscounts().get(0).getType();
String name = ActivityTypeEnum.getByCode(type).getDesc();
toastMsg = name +"与"+ activityName + "活动不同享 活动商品优惠发生变化";
......@@ -3393,11 +3393,11 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
}
//结算页查询购物车　带优惠券　（优惠券与活动互斥）
if(ObjectUtils.equals(SubmitPageEnum.YES.getCode(), flag) && hasCoupon && "1".equals(config.getCouponactivityMutex())){
toastMsg = "优惠券与其他促销活动不同享 活动商品优惠发生变化";
}
// if(ObjectUtils.equals(SubmitPageEnum.YES.getCode(), flag) && hasCoupon && "1".equals(config.getCouponactivityMutex())){
// toastMsg = "优惠券与其他促销活动不同享 活动商品优惠发生变化";
// }
if(StringUtils.isNotEmpty(toastMsg)){
if(StringUtils.isNotEmpty(toastMsg) && StringUtils.isEmpty(shoppingCartGoodsResponseVo.getToastMsg())){
shoppingCartGoodsResponseVo.setToastMsg(toastMsg);
}
}
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationCommonService.java
......@@ -801,25 +801,25 @@ public class CalculationCommonService {
}
ActivityMutexConfig config = JSONObject.parseObject(value,ActivityMutexConfig.class);
if("0".equals(config.getActivityMutex()) && "0".equals(config.getCouponactivityMutex())){
if("0".equals(config.getActivityMutex())){
return;
}
//点餐页 添加购物车/更新购物车，（活动与活动互斥，活动与优惠券互斥）
if(ObjectUtils.equals(SubmitPageEnum.NO.getCode(), flag) && addOrUpdate && "1".equals(config.getActivityMutex())){
if(CollectionUtils.isNotEmpty(calculationDiscountResult.getCouponDiscounts())){
if(CollectionUtils.isNotEmpty(calculationDiscountResult.getCouponDiscounts())
&& calculationDiscountResult.getCouponDiscounts().get(0).getPromotionSharing() == 1){//是否与促销活动共享 0不同享 1同享
if(calculationDiscountResult.getExclusiveActivityList().size() >1 ){
toastMsg = "多个促销活动不同享 活动商品优惠发生变化";
}else {
String activityName = calculationDiscountResult.getExclusiveActivityList().get(0).getName();
toastMsg = "优惠券与" + activityName + "活动不同享 活动商品优惠发生变化";
toastMsg = "优惠券与其他促销活动不同享 活动商品优惠发生变化";
}
}
if(CollectionUtils.isNotEmpty(calculationDiscountResult.getDiscounts())){
if(calculationDiscountResult.getExclusiveActivityList().size() >1 ){
toastMsg = "多个促销活动不同享 活动商品优惠发生变化";
}else {
String activityName = calculationDiscountResult.getExclusiveActivityList().get(0).getName();
String activityName = calculationDiscountResult.getExclusiveActivityList().get(0).getActivityTypeName();
Integer type = calculationDiscountResult.getDiscounts().get(0).getType();
String name = ActivityTypeEnum.getByCode(type).getDesc();
toastMsg = name +"与"+ activityName + "活动不同享 活动商品优惠发生变化";
......@@ -829,11 +829,11 @@ public class CalculationCommonService {
}
//结算页查询购物车　带优惠券　（优惠券与活动互斥）
if(ObjectUtils.equals(SubmitPageEnum.YES.getCode(), flag) && hasCoupon && "1".equals(config.getCouponactivityMutex())){
toastMsg = "优惠券与其他促销活动不同享 活动商品优惠发生变化";
}
// if(ObjectUtils.equals(SubmitPageEnum.YES.getCode(), flag) && hasCoupon && "1".equals(config.getCouponactivityMutex())){
// toastMsg = "优惠券与其他促销活动不同享 活动商品优惠发生变化";
// }
if(StringUtils.isNotEmpty(toastMsg)){
if(StringUtils.isNotEmpty(toastMsg) && StringUtils.isEmpty(shoppingCartGoodsResponseVo.getToastMsg())){
shoppingCartGoodsResponseVo.setToastMsg(toastMsg);
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment