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

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

@@ -205,14 +205,19 @@ public class CouponDiscountCalculation {
                     cartGoods.setQty(b3S1DiscountOptional.get().getActualGoodsNumber());
                     cartGoods.setCouponName(b3S1DiscountOptional.get().getActivityName());
                     cartGoods.setCouponCode(b3S1DiscountOptional.get().getActivityCode());
-                    cartGoods.setIsB3S1Coupon(1);
+                    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(0l);
+                    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());
                 }
             }
         }