sunyu::fix bug

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

@@ -495,6 +495,7 @@ public class ShoppingCartMCoffeeServiceImpl {
         for (CartGoods cartGoods : cartGoodsList) {
             if (StringUtils.equals(cartGoods.getCouponCode(),requestVo.getRedundancyCouponCode())){
                 cartGoods.setCouponCode(null);
+                cartGoods.setIsMonthCardGoods(0);
             }
 
             /**
@@ -2343,6 +2344,7 @@ public class ShoppingCartMCoffeeServiceImpl {
         for (CartGoods cartGood : cartGoods) {
             if (StringUtils.equals(cartGood.getCouponCode(),couponCode)){
                 cartGood.setCouponCode(null);
+                cartGood.setIsMonthCardGoods(0);
             }
         }
         return cartGoods.stream().filter(t-> !StringUtils.equals("9999",t.getSkuId())).collect(Collectors.toList());

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

@@ -20,6 +20,7 @@ import cn.freemud.service.CommonService;
 import cn.freemud.service.impl.ItemServiceImpl;
 import cn.freemud.service.thirdparty.ActivityClient;
 import cn.freemud.utils.PropertyConvertUtil;
+import com.alibaba.fastjson.JSON;
 import com.freemud.application.sdk.api.log.ErrorLog;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.membercenter.request.QueryReceiveAddressRequest;

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

@@ -453,7 +453,7 @@ public class CouponDiscountCalculation {
         List<CouponProductVo> calculAmountProductList = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(cartGoods)) {
             cartGoods.forEach(cartGood -> {
-                if (StringUtils.isNotEmpty(cartGood.getCouponCode())) {
+                if (!StringUtils.equals(cartGood.getSkuId(),"9999") && StringUtils.isNotEmpty(cartGood.getCouponCode())) {
                     CouponProductVo couponProductVo = new CouponProductVo();
                     couponProductVo.setAmount(cartGood.getAmount().intValue());
                     couponProductVo.setKeyProductCode(cartGood.getCustomerCode());
@@ -463,29 +463,6 @@ public class CouponDiscountCalculation {
                     couponProductVo.setCategoryCode(null);
                     calculAmountProductList.add(couponProductVo);
                 }
-
-//                if (CollectionUtils.isNotEmpty(cartGood.getProductComboList())) {
-//                    cartGood.getProductComboList().forEach(comboxGoods -> {
-//                        CouponProductVo couponProductVo = new CouponProductVo();
-//                        couponProductVo.setAmount(Integer.valueOf(comboxGoods.getAmount().toString()));
-//                        couponProductVo.setKeyProductCode(comboxGoods.getCustomerCode());
-//                        couponProductVo.setQuantity(comboxGoods.getQty());
-//                        couponProductVo.setProductId(comboxGoods.getGoodsId());
-//                        couponProductVo.setCategoryCode(null);
-//                        productList.add(couponProductVo);
-//                    });
-//                }
-//                if (CollectionUtils.isNotEmpty(cartGood.getProductGroupList())) {
-//                    cartGood.getProductGroupList().forEach(comboxGoods -> {
-//                        CouponProductVo couponProductVo = new CouponProductVo();
-//                        couponProductVo.setAmount(Integer.valueOf(comboxGoods.getAmount().toString()));
-//                        couponProductVo.setKeyProductCode(comboxGoods.getCustomerCode());
-//                        couponProductVo.setQuantity(comboxGoods.getQty());
-//                        couponProductVo.setProductId(comboxGoods.getGoodsId());
-//                        couponProductVo.setCategoryCode(null);
-//                        productList.add(couponProductVo);
-//                    });
-//                }
             });
             res.setProductList(cartGoods);
             Long totalAmount = createProductRequest(cartGoods, calculAmountProductList);