Merge remote-tracking branch 'remotes/origin/feature/1.9.30_特价提示' into develop

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

@@ -64,6 +64,7 @@ public class SetMealServiceImpl implements IPromotionService {
             String toastMsg = getTotalAmount(cartGoods, productGroupAmount, numberMap, goodsMap);
             if (StringUtils.isNotEmpty(toastMsg)) {
                 shoppingCartGoodsResponseVo.setToastMsg(toastMsg);
+                shoppingCartGoodsResponseVo.setUid(cartGoods.getCartGoodsUid());
             }
 
         }

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

@@ -284,8 +284,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         ActivityQueryDto activityQueryDto = activityAdapter.getActivityQueryDto(partnerId, storeId, userId, appId, addShoppingCartGoodsRequestVo.getOrderType());
 
         // 促销活动的优惠金额计算
-        updateShoppingCartGoodsDiscount(null, activityQueryDto, calculationDiscountResult, allCartGoodsList, shoppingCartGoodsResponseVo, null, userLoginInfoDto,addShoppingCartGoodsRequestVo.getMenuType(),deliveryAmount);
-
+        updateShoppingCartGoodsDiscount(null, activityQueryDto, calculationDiscountResult, allCartGoodsList, shoppingCartGoodsResponseVo, null, userLoginInfoDto, addShoppingCartGoodsRequestVo.getMenuType(), deliveryAmount);
+        clearMsg(shoppingCartGoodsResponseVo, cartGoods.getCartGoodsUid());
         //设置更新响应信息
         setAddAndUpdateResponse(shoppingCartGoodsResponseVo, calculationDiscountResult, allCartGoodsList, null, partnerId, storeId, userId, ShoppingCartConstant.ADD_AND_UPDATE, null);
 
@@ -379,10 +379,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         // 促销活动的优惠金额计算
         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("");
-        }
+        clearMsg(shoppingCartGoodsResponseVo, cartGoodsUid);
         //设置更新响应信息
         setAddAndUpdateResponse(shoppingCartGoodsResponseVo, calculationDiscountResult, cartGoodsList, shoppingCartGoodsResponseVo.getToastMsg(), partnerId, storeId, userId, ShoppingCartConstant.ADD_AND_UPDATE, null);
 
@@ -1571,4 +1568,17 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         }
         return qty;
     }
+
+    /**
+     * 去除非活动商品的提示
+     *
+     * @param shoppingCartGoodsResponseVo
+     * @param cartUid
+     */
+    public void clearMsg(ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, String cartUid) {
+        if (StringUtils.isNotBlank(shoppingCartGoodsResponseVo.getToastMsg()) && StringUtils.isNotBlank(shoppingCartGoodsResponseVo.getUid()) && !cartUid.equals(shoppingCartGoodsResponseVo.getUid())) {
+            shoppingCartGoodsResponseVo.setUid("");
+            shoppingCartGoodsResponseVo.setToastMsg("");
+        }
+    }
 }