fix:券

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

@@ -8,10 +8,7 @@ import cn.freemud.entities.dto.calculate.CalculationSharingDiscountResponseDto;
 import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
 import cn.freemud.entities.vo.*;
 import cn.freemud.enums.ActivityTypeEnum;
-import cn.freemud.service.impl.calculate.promotion.AdditionSharingService;
-import cn.freemud.service.impl.calculate.promotion.DeliverySharingService;
-import cn.freemud.service.impl.calculate.promotion.GiftSharingService;
-import cn.freemud.service.impl.calculate.promotion.ScoreSharingService;
+import cn.freemud.service.impl.calculate.promotion.*;
 import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -52,6 +49,9 @@ public class CalculationSharingEquallyService {
     @Autowired
     private AdditionSharingService additionSharingService;
 
+    @Autowired
+    private CouponSharingService promotionSharingService;
+
     /**
      * 均摊服务
      * @param discountResult
@@ -80,7 +80,10 @@ public class CalculationSharingEquallyService {
 
 
         calculationCommonService.initShoppingCart(discountResult, cartGoodsList, shoppingCartGoodsResponseVo);
-
+        /**
+         * 商品券\换购券
+         */
+        promotionSharingService.equally(discountResult, cartGoodsList);
         List<ShoppingCartGoodsDto.CartGoodsDetailDto> cartGoodsDetailDtoList = CollectionUtils.isEmpty(shoppingCartGoodsDto.getProducts()) ? new ArrayList<>() : shoppingCartGoodsDto.getProducts();
         shoppingCartGoodsDto.setProducts(cartGoodsDetailDtoList);
 
@@ -108,6 +111,7 @@ public class CalculationSharingEquallyService {
         shoppingCartGoodsDto.setTotalDiscountAmount(shoppingCartGoodsResponseVo.getTotalDiscountAmount());
 
         List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods> goods = discountResult.getGoods();
+
         /**
          * 利用促销赋值totalDiscountAmount
          */
@@ -134,7 +138,6 @@ public class CalculationSharingEquallyService {
         scoreSharingService.equally(shoppingCartGoodsResponseVo, shoppingCartGoodsDto);
         calculationCommonService.getNeedCardAmount(shoppingCartInfoRequestVo, shoppingCartGoodsDto);
 
-
         if (BusinessTypeEnum.SAAS_DELIVERY.getCode().equals(menuType)) {
             deliverySharingService.deliveryResponse(discountResult, activityQueryDto, shoppingCartGoodsResponseVo, deliveryAmount);
         }

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

@@ -116,55 +116,50 @@ public class CouponSharingService {
         }
     }
 
+    public void equally(CalculationSharingDiscountResponseDto.CalculationDiscountResult discountResult
+            , List<CartGoods> cartGoodsList) {
 
-    public void updateShoppingCartGoodsApportion(ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult, ShoppingCartGoodsDto shoppingCartGoodsDto, CreateOrderVo.PremiumExchangeActivity premiumExchangeActivity, ShoppingCartInfoRequestVo shoppingCartInfoRequestVo) {
-        List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.CouponResults> couponDiscounts = calculationDiscountResult == null ? new ArrayList<>() : calculationDiscountResult.getCouponDiscounts();
-        List<ActivityDiscountsDto> activityDiscountsDtos = shoppingCartGoodsDto.getActivityDiscountsDtos() == null ? new ArrayList<>() : shoppingCartGoodsDto.getActivityDiscountsDtos();
-
-        for (ShoppingCartGoodsDto.CartGoodsDetailDto cartGoods : shoppingCartGoodsDto.getProducts()) {
-            if (StringUtils.isNotEmpty(cartGoods.getCouponCode())) {
-                for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.CouponResults couponDiscount : couponDiscounts) {
-                    ActivityDiscountsDto activityDiscountsDto = getActivityDiscountDto(calculationDiscountResult.getApportionGoods(), couponDiscount);
-                    if (activityDiscountsDto != null) {
-                        ActivityDiscountsDto activityDiscountsDto1 = new ActivityDiscountsDto();
-                        BeanUtils.copyProperties(activityDiscountsDto, activityDiscountsDto1);
-                        activityDiscountsDto1.setDiscountAmount(-activityDiscountsDto.getDiscountAmount());
-
-                        cartGoods.setTotalDiscountAmount(-activityDiscountsDto.getDiscountAmount());
-                        cartGoods.setSalePrice(0L);
-                        cartGoods.setActivityDiscountsDtos(Arrays.asList(activityDiscountsDto1));
+        if (CollectionUtils.isEmpty(cartGoodsList)) {
+            return;
+        }
+        //循环购物车商品券
+        for (CartGoods cartGoods : cartGoodsList) {
+            if (cartGoods.getCartGoodsUid().startsWith(CommonsConstant.COUPON_PREFIX)) {
+                String spqId = cartGoods.getCartGoodsUid().substring(CommonsConstant.COUPON_PREFIX.length());
+                // 计算优惠信息时，已将券校验过，放在map中
+                Map<String, CheckSpqInfoResponseDto> validCouponMap = discountResult == null ? new HashMap<>() : discountResult.getValidCouponMap();
+                if (MapUtils.isNotEmpty(validCouponMap)) {
+                    CheckSpqInfoResponseDto checkSpqInfoResponseDto = validCouponMap.get(spqId);
+                    if (checkSpqInfoResponseDto != null) {
+                        cartGoods.setOriginalPrice(checkSpqInfoResponseDto.getPrice());
+                        cartGoods.setSpuId(checkSpqInfoResponseDto.getSpuId());
+                        cartGoods.setSkuId(StringUtils.isEmpty(checkSpqInfoResponseDto.getSkuId()) ? checkSpqInfoResponseDto.getSpuId() : checkSpqInfoResponseDto.getSkuId());
+                        cartGoods.setQty(1);
+                        cartGoods.setCouponCode(checkSpqInfoResponseDto.getCouponCode());
+                        cartGoods.setSpuName(checkSpqInfoResponseDto.getSpuName());
+                        cartGoods.setSpecProductId(checkSpqInfoResponseDto.getDefaultSpecId());
+                        cartGoods.setSubName(checkSpqInfoResponseDto.getDefaultSpecName());
+                        cartGoods.setExtra(checkSpqInfoResponseDto.getExtras());
+                        if (GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
+                            CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods discountGoods = discountResult.getGoods()
+                                    .stream()
+                                    .filter(d -> cartGoods.getCartGoodsUid().equals(d.getCartGoodsUid()))
+                                    .findFirst()
+                                    .orElse(null);
+                            if (discountGoods != null) {
+                                cartGoods.setAmount(discountGoods.getRealAmount());
+                            } else {
+                                cartGoods.setAmount(checkSpqInfoResponseDto.getPrice());
+                            }
+                        }
+                        cartGoods.setOriginalAmount(checkSpqInfoResponseDto.getPrice());
                     }
                 }
             }
         }
 
-        for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.CouponResults couponDiscount : couponDiscounts) {
-            ActivityDiscountsDto activityDiscountsDto = getActivityDiscountDto(calculationDiscountResult.getApportionGoods(), couponDiscount);
-            if (activityDiscountsDto != null) {
-                activityDiscountsDtos.add(activityDiscountsDto);
-            }
-        }
-        shoppingCartGoodsDto.setActivityDiscountsDtos(activityDiscountsDtos);
     }
 
-    private ActivityDiscountsDto getActivityDiscountDto(List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.ApportionGoods> apportionGoods, ActivityCalculationDiscountResponseDto.CalculationDiscountResult.CouponResults couponDiscount) {
-        String couponCode = couponDiscount.getCouponCode();
-        for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.ApportionGoods apportionGood : apportionGoods) {
-            List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.ApportionGoods.ApportionDetails> list = apportionGood.getApportionDetails().stream().filter(detail -> ObjectUtils.equals(couponCode, detail.getActivityCode())).collect(Collectors.toList());
-            if (CollectionUtils.isNotEmpty(list)) {
-                ActivityCalculationDiscountResponseDto.CalculationDiscountResult.ApportionGoods.ApportionDetails apportionDetails = list.get(0);
-                ActivityDiscountsDto activityDiscountsDto = new ActivityDiscountsDto();
-                activityDiscountsDto.setActivityCode(apportionDetails.getActivityCode());
-                activityDiscountsDto.setActivityName(apportionDetails.getActivityName());
-                activityDiscountsDto.setActivityType(apportionDetails.getActivityType());
-                activityDiscountsDto.setDiscountAmount(0 - couponDiscount.getDiscountAmount());
-                return activityDiscountsDto;
-            }
-        }
-        return null;
-    }
-
-
     public ActivityClassifyCouponBean createEmptyActivityCouponBean() {
         ActivityClassifyCouponBean activityClassifyCouponBean = new ActivityClassifyCouponBean();
         activityClassifyCouponBean.setCouponNum(0);