sunyu::update::fix bug for conflicts

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

@@ -343,6 +343,7 @@ public class CouponDiscountCalculation {
                         couponProductVo.setKeyProductCode(comboxGoods.getCustomerCode());
                         couponProductVo.setQuantity(comboxGoods.getQty());
                         couponProductVo.setProductId(comboxGoods.getGoodsId());
+                        couponProductVo.setCouponCode(cartGood.getCouponCode());
                         couponProductVo.setCategoryCode(null);
                         productList.add(couponProductVo);
                     });
@@ -354,6 +355,7 @@ public class CouponDiscountCalculation {
                         couponProductVo.setKeyProductCode(comboxGoods.getCustomerCode());
                         couponProductVo.setQuantity(comboxGoods.getQty());
                         couponProductVo.setProductId(comboxGoods.getGoodsId());
+                        couponProductVo.setCouponCode(cartGood.getCouponCode());
                         couponProductVo.setCategoryCode(null);
                         productList.add(couponProductVo);
                     });
@@ -365,9 +367,7 @@ public class CouponDiscountCalculation {
             resList.add(res);
         }
         return resList;
-        }
-
-
+    }
 
 
 //    public String getAppSecret(String partnerId) {

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

@@ -22,6 +22,6 @@ public class CouponProductVo {
     private String productId;
     private Integer amount;
     private Integer quantity;
-
+    private String couponCode;
     private String categoryCode;
 }