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

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

@@ -13,9 +13,11 @@
 package cn.freemud.entities.vo;
 
 import cn.freemud.entities.dto.ActivityCalculationDiscountResponseDto;
+import cn.freemud.entities.dto.calculate.CalculationSharingDiscountResponseDto;
 import lombok.Builder;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 @Data
@@ -154,5 +156,12 @@ public class ShoppingCartGoodsResponseVo  extends ShoppingCartGoodsBaseResponseV
     /**
      * 总的优惠信息集合
      */
-    private List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount> discounts;
+    private List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Discount> discounts;
+
+    /**
+     * 商品优惠信息
+     */
+    private List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods> goods;
+
+
 }

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

@@ -332,6 +332,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     , menuType
                     , deliveryAmount
                     , ShoppingCartConstant.ADD_AND_UPDATE);
+
+            buildDiscounts(shoppingCartGoodsResponseVo,discountResult);
         }
         else {
             // 获取优惠信息
@@ -350,8 +352,6 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             //设置更新响应信息
             setAddAndUpdateResponse(shoppingCartGoodsResponseVo, calculationDiscountResult, allCartGoodsList, null, partnerId, storeId, userId, ShoppingCartConstant.ADD_AND_UPDATE, null);
 
-            // 将促销返回的总的活动信息返回给前端
-            shoppingCartGoodsResponseVo.setDiscounts(calculationDiscountResult == null ? null : calculationDiscountResult.getDiscounts());
         }
         //埋点添加购物车行为
         this.buriedPointShoppingCart(addShoppingCartGoodsRequestVo, spuId, productName);
@@ -455,6 +455,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     , menuType
                     , deliveryAmount
                     , ShoppingCartConstant.ADD_AND_UPDATE);
+
+            buildDiscounts(shoppingCartGoodsResponseVo,discountResult);
         }
         else {
             // 获取优惠信息
@@ -472,8 +474,6 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             //设置更新响应信息
             setAddAndUpdateResponse(shoppingCartGoodsResponseVo, calculationDiscountResult, cartGoodsList, shoppingCartGoodsResponseVo.getToastMsg(), partnerId, storeId, userId, ShoppingCartConstant.ADD_AND_UPDATE, null);
 
-            // 将促销返回的总的活动信息返回给前端
-            shoppingCartGoodsResponseVo.setDiscounts(calculationDiscountResult == null ? null : calculationDiscountResult.getDiscounts());
         }
 
         return ResponseUtil.success(shoppingCartGoodsResponseVo);
@@ -609,6 +609,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     , menuType
                     , deliveryAmount
                     , ShoppingCartConstant.QUERY_INFO);
+
+            buildDiscounts(shoppingCartGoodsResponseVo,calculationSharingDiscountResult);
         }
         else {
             List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = new ArrayList<>();
@@ -631,9 +633,6 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             // 在原价、现价、折扣价上增加第一次使用会员卡的费用
             this.addNeedCardAmount(shoppingCartInfoRequestVo, shoppingCartGoodsResponseVo);
 
-            // 将促销返回的总的活动信息返回给前端
-            shoppingCartGoodsResponseVo.setDiscounts(calculationDiscountResult == null ? null : calculationDiscountResult.getDiscounts());
-
         }
         return ResponseUtil.success(shoppingCartGoodsResponseVo);
     }
@@ -2068,4 +2067,17 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
 
     }
 
+    /**
+     * 设置总的优惠信息和商品优惠信息
+     * @param shoppingCartGoodsResponseVo
+     * @param discountResult
+     */
+    private void buildDiscounts(ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo,CalculationSharingDiscountResponseDto.CalculationDiscountResult discountResult) {
+        if(discountResult != null){
+            shoppingCartGoodsResponseVo.setDiscounts(discountResult.getDiscounts());
+            shoppingCartGoodsResponseVo.setGoods(discountResult.getGoods());
+        }
+
+    }
+
 }