Merge branch 'feature/xukang_20210609_麦咖啡p7v2' into qa

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CouponDiscountCalculation.java

@@ -205,36 +205,44 @@ public class CouponDiscountCalculation {
                         //普通商品券 和月享卡1.0的 商品最终售价更新为促销返回价格
                         cartGoods.setAmount(goodsMap.get(cartGoods.getCartGoodsUid()).getRealAmount());
                     }
-                }
-            }
 
-            Optional<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount> b3S1DiscountOptional =  discountsNew.stream()
-                    .filter(t -> ActivityTypeEnum.TYPE_35.getCode().equals(t.getType())).findFirst();
-            if(b3S1DiscountOptional.isPresent()) {
-                haveB3S1Fav = true;
-                if(b3S1DiscountOptional.get().getActivityCode().equals(b3S1SeedCode)) {
-                    useTimes += b3S1DiscountOptional.get().getActualGoodsNumber();
-                }
-                if(cartGoods.getQty() > b3S1DiscountOptional.get().getActualGoodsNumber()) {
-                    int newNum = cartGoods.getQty() - b3S1DiscountOptional.get().getActualGoodsNumber();
-                    cartGoods.setQty(b3S1DiscountOptional.get().getActualGoodsNumber());
-                    cartGoods.setCouponName(b3S1DiscountOptional.get().getActivityName());
-                    cartGoods.setCouponCode(b3S1DiscountOptional.get().getActivityCode());
-                    cartGoods.setIsB3S1CouponGoods(1);
-                    CartGoods cartGoodsNew = new CartGoods();
-                    BeanUtils.copyProperties(cartGoods, cartGoodsNew);
-                    cartGoodsNew.setCartGoodsUid(UUID.randomUUID().toString());
-                    cartGoodsNew.setQty(newNum);
-                    cartGoodsNew.setAmount(cartGoods.getAmount());
-                    cartGoods.setAmount(goodsMap.get(cartGoods.getCartGoodsUid()).getRealAmount());
-                    newCartGoodsList.add(cartGoodsNew);
-                } else if(cartGoods.getQty() == b3S1DiscountOptional.get().getActualGoodsNumber()) {
-                    cartGoods.setCouponName(b3S1DiscountOptional.get().getActivityName());
-                    cartGoods.setCouponCode(b3S1DiscountOptional.get().getActivityCode());
-                    cartGoods.setIsB3S1CouponGoods(1);
-                    cartGoods.setAmount(goodsMap.get(cartGoods.getCartGoodsUid()).getRealAmount());
+                    Optional<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount> b3S1DiscountOptional =  discountsNew.stream()
+                            .filter(t -> ActivityTypeEnum.TYPE_35.getCode().equals(t.getType())).findFirst();
+                    if(b3S1DiscountOptional.isPresent()) {
+                        haveB3S1Fav = true;
+                        if(b3S1DiscountOptional.get().getActivityCode().equals(b3S1SeedCode)) {
+                            useTimes += b3S1DiscountOptional.get().getActualGoodsNumber();
+                        }
+                        if(cartGoods.getQty() > b3S1DiscountOptional.get().getActualGoodsNumber()) {
+                            int newNum = cartGoods.getQty() - b3S1DiscountOptional.get().getActualGoodsNumber();
+                            CartGoods cartGoodsNew = new CartGoods();
+                            BeanUtils.copyProperties(cartGoods, cartGoodsNew);
+                            cartGoods.setQty(b3S1DiscountOptional.get().getActualGoodsNumber());
+                            cartGoods.setCouponCode(b3S1DiscountOptional.get().getActivityCode());
+                            cartGoods.setCouponName(b3S1DiscountOptional.get().getActivityName());
+                            cartGoods.setIsB3S1CouponGoods(1);
+                            cartGoodsNew.setCartGoodsUid(UUID.randomUUID().toString());
+                            cartGoodsNew.setQty(newNum);
+                            cartGoodsNew.setCouponCode(null);
+                            cartGoodsNew.setCouponName(null);
+                            cartGoodsNew.setAmount(cartGoods.getOriginalPrice() * cartGoods.getQty());
+                            cartGoods.setAmount(goodsMap.get(cartGoods.getCartGoodsUid()).getRealAmount());
+                            newCartGoodsList.add(cartGoodsNew);
+                        } else if(cartGoods.getQty() == b3S1DiscountOptional.get().getActualGoodsNumber()) {
+                            cartGoods.setCouponCode(b3S1DiscountOptional.get().getActivityCode());
+                            cartGoods.setCouponName(b3S1DiscountOptional.get().getActivityName());
+                            cartGoods.setIsB3S1CouponGoods(1);
+                            cartGoods.setAmount(goodsMap.get(cartGoods.getCartGoodsUid()).getRealAmount());
+                        }
+                    } else {
+                        if(!targetDiscount.isPresent()) {
+                            cartGoods.setCouponCode(null);
+                            cartGoods.setCouponName(null);
+                        }
+                    }
                 }
             }
+
         }
         cartGoodsList.addAll(newCartGoodsList);
         if(useTimes != 0) {