Merge branches 'feature/20210831_购物车新算价校验加购数量限制_wuping' and 'master' of…

Merge branches 'feature/20210831_购物车新算价校验加购数量限制_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

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

@@ -75,32 +75,31 @@ public class MemberDiscountServiceImpl implements IPromotionService {
 
 
     public void updateShoppingCartGoodsDiscountNew(CouponPromotionVO couponPromotionVO, ActivityQueryDto activityQueryDto, ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult, List<CartGoods> cartGoodsList, ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, UserLoginInfoDto userLoginInfoDto, ShoppingCartInfoRequestVo shoppingCartInfoRequestVo) {
-        //获取每个商品的会员价优惠单价
-        if (calculationDiscountResult == null || CollectionUtils.isEmpty(calculationDiscountResult.getApportionGoods())) {
-            return ;
+        if (calculationDiscountResult == null || CollectionUtils.isEmpty(calculationDiscountResult.getDiscounts())) {
+            return;
         }
-        Map<String,Long> result=new HashMap<>();
-        for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.ApportionGoods apportionGood : calculationDiscountResult.getApportionGoods()) {
-            if (!CollectionUtils.isEmpty(apportionGood.getApportionDetails())) {
-                for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.ApportionGoods.ApportionDetails apportionDetail : apportionGood.getApportionDetails()) {
-                    if (apportionDetail.getActivityType().equals(ActivityTypeEnum.TYPE_27.getCode())) {
-                        result.putIfAbsent(apportionGood.getGoodsId(),apportionDetail.getActivityApportionAmount());
+        Map<String, Long> result = new HashMap<>();
+        for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods goods : calculationDiscountResult.getGoods()) {
+            if (!CollectionUtils.isEmpty(goods.getDiscounts())) {
+                for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount goodsDiscount : goods.getDiscounts()) {
+                    if (ActivityTypeEnum.TYPE_27.getCode().equals(goodsDiscount.getType())) {
+                        result.putIfAbsent(goods.getCartGoodsUid(), goodsDiscount.getDiscount());
                     }
                 }
             }
         }
 
-        if (result.size()==0){
+        if (result.size() == 0) {
             return;
         }
 
         for (CartGoods cartGoods : cartGoodsList) {
-            //优惠单价
-            Long discountPrice = result.get(cartGoods.getGoodsId());
+            //优惠总价
+            Long discountPrice = result.get(cartGoods.getCartGoodsUid());
             //老促销计算价格接口套餐价购物车内部计算价格，已在套餐实现类计算好价格，这里无需再扣减
-            if (discountPrice!=null && discountPrice>0 && CollectionUtils.isEmpty(cartGoods.getProductComboList())
-                    && CollectionUtils.isEmpty(cartGoods.getProductGroupList())){
-                cartGoods.setAmount(cartGoods.getAmount()-discountPrice*cartGoods.getQty());
+            if (discountPrice != null && discountPrice > 0 && CollectionUtils.isEmpty(cartGoods.getProductComboList())
+                    && CollectionUtils.isEmpty(cartGoods.getProductGroupList())) {
+                cartGoods.setAmount(cartGoods.getAmount() - discountPrice);
             }
         }
     }