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

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

@@ -170,6 +170,12 @@ public class CouponDiscountCalculation {
 
         List<CartGoods> newCartGoodsList = new ArrayList<>();
         boolean haveB3S1Fav = false;
+        Optional<CartGoods> cartGoodsOptional = cartGoodsList.stream().filter(o -> o.getIsB3S1Coupon() == 1).findFirst();
+        String b3S1SeedCode = "";
+        if(cartGoodsOptional.isPresent()) {
+            b3S1SeedCode = cartGoodsOptional.get().getB3S1CouponGoodsInfo().getCardCode();
+        }
+        Integer useTimes = 0;
         for (int i = 0; i < cartGoodsList.size(); i++) {
             CartGoods cartGoods = cartGoodsList.get(i);
             cartGoods.setIsB3S1CouponGoods(0);
@@ -206,6 +212,9 @@ public class CouponDiscountCalculation {
                     .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());
@@ -228,6 +237,9 @@ public class CouponDiscountCalculation {
             }
         }
         cartGoodsList.addAll(newCartGoodsList);
+        if(useTimes != 0) {
+            cartGoodsList.stream().filter(o -> o.getIsB3S1Coupon() == 1).findFirst().get().getB3S1CouponGoodsInfo().setUseTimes(useTimes);
+        }
 
         if(haveB3S1Fav) {
             List<CartGoods> nowCartGoodsList = new ArrayList<>();