问题修复

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

@@ -179,6 +179,7 @@ public class CouponDiscountCalculation {
         for (int i = 0; i < cartGoodsList.size(); i++) {
             CartGoods cartGoods = cartGoodsList.get(i);
             cartGoods.setIsB3S1CouponGoods(0);
+            boolean useCoupon = false;
             if("9998".equals(cartGoods.getSkuId())) {
                 continue;
             }
@@ -199,12 +200,15 @@ public class CouponDiscountCalculation {
                             .filter(t -> ActivityTypeEnum.TYPE_32.getCode().equals(t.getType())
                                     || ActivityTypeEnum.TYPE_37.getCode().equals(t.getType())
                                     || ActivityTypeEnum.TYPE_39.getCode().equals(t.getType())).findFirst();
+                    useCoupon = targetDiscount.isPresent();
                     if (null != targetDiscount && targetDiscount.isPresent()) {
                         ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount goodsDiscount = targetDiscount.get();
                         cartGoods.setCouponName(goodsDiscount.getActivityName());
                         //普通商品券 和月享卡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();
@@ -235,13 +239,11 @@ public class CouponDiscountCalculation {
                     cartGoods.setAmount(goodsMap.get(cartGoods.getCartGoodsUid()).getRealAmount());
                 }
             } else {
-                        if(!targetDiscount.isPresent()) {
+                if(!useCoupon) {
                     cartGoods.setCouponCode(null);
                     cartGoods.setCouponName(null);
                 }
             }
-                }
-            }
 
         }
         cartGoodsList.addAll(newCartGoodsList);