sunyu::update::add new field couponCode for getCartInfoByUser api

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

@@ -326,6 +326,53 @@ public class CouponDiscountCalculation {
     }
 
 
+    public List<CouponAvailableReq> buildAvailableCoupons(QueryCartInfoRequestVo requestVo,List<CartGoods> cartGoods){
+        List<CouponAvailableReq> resList = new ArrayList<>();
+        CouponAvailableReq res = new CouponAvailableReq();
+        res.setProviderId(requestVo.getPartnerId());
+        res.setMerchantId(requestVo.getPartnerId());
+        res.setStoreId(requestVo.getStoreId());
+//        List<String> couponList = new ArrayList<>();
+        res.setChannelIdList(commonService.getOrgCodes(requestVo.getPartnerId(), requestVo.getStoreId()));
+        List<CouponProductVo> productList = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(cartGoods)) {
+            cartGoods.forEach(cartGood -> {
+//                if (StringUtils.isNotEmpty(cartGood.getCouponCode())) {
+//                    couponList.add(cartGood.getCouponCode());
+//                    res.setCouponCodes(couponList);
+//                }
+                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.setCouponCode(cartGood.getCouponCode());
+                        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.setCouponCode(cartGood.getCouponCode());
+                        couponProductVo.setCategoryCode(null);
+                        productList.add(couponProductVo);
+                    });
+                }
+            });
+            res.setProductList(productList);
+            Long totalAmount = createProductRequest(cartGoods, productList);
+            res.setTotalAmount(Integer.valueOf(totalAmount.toString()));
+            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;
 }