Merge remote-tracking branch 'origin/qa' into qa

order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java

@@ -76,7 +76,7 @@ import java.util.stream.Collectors;
 public class CheckOrder {
 
     // 配送费逻辑是否使用旧的
-    @Value("${store.delivery.use.old:true}")
+    @Value("${store.delivery.use.old}")
     private boolean storeDeliveryUseOld;
 
     @Autowired

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityCalculationDiscountResponseDto.java

@@ -157,6 +157,11 @@ public class ActivityCalculationDiscountResponseDto {
 
         @Data
         public static class Goods {
+
+            /**
+             * 购物车行记录
+             */
+            private String cartGoodsUid;
             /**
              * 商品id
              */

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsBaseResponseVo.java

@@ -25,5 +25,6 @@ public class ShoppingCartGoodsBaseResponseVo {
      * 购物车中商品价格或有效性是否发生变化
      */
     private Boolean changed;
+    private String uid;
 
 }

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

@@ -377,8 +377,12 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         ActivityQueryDto activityQueryDto = activityAdapter.getActivityQueryDto(partnerId, storeId, userId, appId, updateShoppingCartGoodsQtyRequestVo.getOrderType());
 
         // 促销活动的优惠金额计算
-        updateShoppingCartGoodsDiscount(null, activityQueryDto, calculationDiscountResult, cartGoodsList, shoppingCartGoodsResponseVo, null, userLoginInfoDto,updateShoppingCartGoodsQtyRequestVo.getMenuType(),deliveryAmount);
+        updateShoppingCartGoodsDiscount(null, activityQueryDto, calculationDiscountResult, cartGoodsList, shoppingCartGoodsResponseVo, null, userLoginInfoDto, updateShoppingCartGoodsQtyRequestVo.getMenuType(), deliveryAmount);
 
+        if (StringUtils.isNotBlank(shoppingCartGoodsResponseVo.getToastMsg()) && StringUtils.isNotBlank(shoppingCartGoodsResponseVo.getUid()) && !cartGoodsUid.equals(shoppingCartGoodsResponseVo.getUid())) {
+            shoppingCartGoodsResponseVo.setUid("");
+            shoppingCartGoodsResponseVo.setToastMsg("");
+        }
         //设置更新响应信息
         setAddAndUpdateResponse(shoppingCartGoodsResponseVo, calculationDiscountResult, cartGoodsList, shoppingCartGoodsResponseVo.getToastMsg(), partnerId, storeId, userId, ShoppingCartConstant.ADD_AND_UPDATE, null);
 

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/TimeSalePromotionService.java

@@ -48,6 +48,7 @@ public class TimeSalePromotionService implements IPromotionService {
         // 存储当前享受限时特价折扣的商品数量，key:goodsId; value:可享受数量
         Map<String, Integer> numberMap = new HashMap<>();
         List<Integer> discounts = Arrays.asList(ActivityTypeEnum.TYPE_2.getCode(), ActivityTypeEnum.TYPE_21.getCode());
+        String uid = "";
         for (CartGoods cartGoods : cartGoodsList) {
             ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods goods;
             if ((goods = goodsMap.get(cartGoods.getGoodsId())) == null) {
@@ -74,12 +75,14 @@ public class TimeSalePromotionService implements IPromotionService {
                         : goods.getOriginalPrice() * cartGoods.getQty());
                 if (StringUtils.isEmpty(toastMsg)) {
                     toastMsg = "该商品限" + goodsDiscount.getActualGoodsNumber() + "份优惠 超出按照原价计算哦";
+                    uid = goods.getCartGoodsUid();
                 }
             }
             numberMap.put(goods.getGoodsId(), specialActualGoodsNumber - cartGoods.getQty());
         }
         if (StringUtils.isNotBlank(toastMsg)) {
             shoppingCartGoodsResponseVo.setToastMsg(toastMsg);
+            shoppingCartGoodsResponseVo.setUid(uid);
         }
     }