x减

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

@@ -130,6 +130,10 @@ public class CartGoods {
      * 购物车一行商品的数量
      */
     private Integer qty;
+    /**
+     * 购物车一行商品的数量(X件y折时才显示)
+     */
+    private Integer actualQty;
 
     /**
      * 参与活动商品数量 前端展示参数

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

@@ -90,7 +90,7 @@ public class PlatformActiveServiceImpl implements ActiveService {
             CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount discount = goods.getDiscounts()
                     .stream()
                     .filter(g -> ActivityTypeEnum.TYPE_63.getCode().equals(g.getType()) || ActivityTypeEnum.TYPE_62.getCode().equals(g.getType())
-                            || ActivityTypeEnum.TYPE_61.getCode().equals(g.getType()) || (ActivityTypeEnum.TYPE_104.getCode().equals(g.getType()) && finalActivityCodeList.contains(g.getActivityCode())))
+                            || ActivityTypeEnum.TYPE_61.getCode().equals(g.getType()) || (ActivityTypeEnum.TYPE_1040.getCode().equals(g.getType()) && finalActivityCodeList.contains(g.getActivityCode())))
                     .findFirst()
                     .get();
             CartGoods cartGood = new CartGoods();

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

@@ -211,6 +211,7 @@ public class CalculationSharingDiscountService {
             if (pair != null){
                 CartGoods cartGoods = cartGoodsList.stream().filter(p -> p.getCartGoodsUid().equals(pair.getKey())).findFirst().orElseGet(null);
                 if (cartGoods != null){
+                    cartGoods.setActualQty(cartGoods.getQty());
                     cartGoods.setQty(pair.getValue());
                 }
             }