x减

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

@@ -76,6 +76,7 @@ import com.freemud.sdk.api.assortment.shoppingcart.request.CheckCartRequest;
 import com.freemud.sdk.api.assortment.shoppingcart.service.ShoppingCartBaseService;
 import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl;
 import com.google.common.collect.Lists;
+import javafx.util.Pair;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.ObjectUtils;
@@ -1253,7 +1254,17 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                 ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount discountDTO = result.getDiscounts().stream().filter(d -> 221 == d.getType()).findFirst().get();
                 convert2SendPoint(result, discountDTO);
             }
-            giftSharingService.xPiecesYFoldAdapter(activityCalculationDiscountResponseDto);
+            Pair<String, Integer> pair = giftSharingService.xPiecesYFoldAdapter(activityCalculationDiscountResponseDto);
+
+            if (pair != null){
+                CartGoods cartGoods = cartGoodsList.stream().filter(p -> p.getCartGoodsUid().equals(pair.getKey())).findFirst().orElseGet(null);
+                if (cartGoods != null){
+                    cartGoods.setActivityType(ActivityTypeEnum.TYPE_104.getCode());
+                    cartGoods.setActualQty(cartGoods.getQty());
+                    cartGoods.setQty(pair.getValue());
+                }
+            }
+
             result.setValidCouponMap(validCouponMap);
             result.setDeliveryAmount(distributionFee);
             result.setDistributionFee(result.getDistributionFee());

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

@@ -216,7 +216,6 @@ public class CalculationSharingDiscountService {
                     cartGoods.setQty(pair.getValue());
                 }
             }
-
             result.setValidCouponMap(validCouponMap);
             result.setDeliveryAmount(deliveryAmount);
             result.setDistributionFee(result.getDistributionFee());

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

@@ -103,7 +103,7 @@ public class GiftSharingService {
                 sendGoods.setSendGoods(sendGoodsList);
                 sendGoods.setActivityCode(discount.getActivityCode());
                 sendGoods.setActivityName(discount.getActivityName());
-                sendGoods.setActivityType(ActivityTypeEnum.TYPE_104.getCode());
+                sendGoods.setActivityType(ActivityTypeEnum.TYPE_1040.getCode());
                 goodsList.add(sendGoods);
             }
             Pair<String, Integer> pair = new Pair<>(goods.getCartGoodsUid(), goods.getGoodsQuantity() - sendQty);
@@ -327,7 +327,8 @@ public class GiftSharingService {
     public CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount discountInfo(CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods goods) {
         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()))
+                .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()))
                 .findFirst()
                 .get();
         return discount;