Merge branches 'develop' and 'feature-yu.sun-autoSelect-20201025' of…

Merge branches 'develop' and 'feature-yu.sun-autoSelect-20201025' of http://gitlab.freemud.com/order-group-application/order-group into develop

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

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

@@ -463,7 +463,7 @@ public class ShoppingCartMCoffeeServiceImpl {
         List<String> couponCodes = new ArrayList<>();
         couponCodes.add(deliveryFeeCoupon);
         couponCodes.add(moneyCoupon);
-        List<CouponAvailableReq> resList = couponDiscountCalculation.buildAvailableCoupons(requestVo,cartGoodsList,couponCodes);
+        List<CouponAvailableReqByCart> resList = couponDiscountCalculation.buildAvailableCoupons(requestVo,cartGoodsList,couponCodes);
         return ResponseUtil.success(resList);
     }
 

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

@@ -11,10 +11,7 @@ import cn.freemud.enums.*;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.service.CommonService;
 import cn.freemud.service.impl.ItemServiceImpl;
-import cn.freemud.service.impl.mcoffee.entity.CouponAvailableReq;
-import cn.freemud.service.impl.mcoffee.entity.CouponAvailableResp;
-import cn.freemud.service.impl.mcoffee.entity.CouponProductVo;
-import cn.freemud.service.impl.mcoffee.entity.CouponState;
+import cn.freemud.service.impl.mcoffee.entity.*;
 import cn.freemud.service.thirdparty.CouponClient;
 import cn.freemud.service.thirdparty.CustomerExtendClient;
 import cn.freemud.utils.BarcodeUtil;
@@ -341,10 +338,10 @@ public class CouponDiscountCalculation {
     }
 
 
-    public List<CouponAvailableReq> buildAvailableCoupons(QueryCartInfoRequestVo requestVo,List<CartGoods> cartGoods,
+    public List<CouponAvailableReqByCart> buildAvailableCoupons(QueryCartInfoRequestVo requestVo,List<CartGoods> cartGoods,
                                                           List<String> couponCodes){
-        List<CouponAvailableReq> resList = new ArrayList<>();
-        CouponAvailableReq res = new CouponAvailableReq();
+        List<CouponAvailableReqByCart> resList = new ArrayList<>();
+        CouponAvailableReqByCart res = new CouponAvailableReqByCart();
         res.setProviderId(requestVo.getPartnerId());
         res.setMerchantId(requestVo.getPartnerId());
         res.setStoreId(requestVo.getStoreId());
@@ -352,6 +349,7 @@ public class CouponDiscountCalculation {
         res.setCouponCodes(couponCodes);
         List<CouponProductVo> productList = new ArrayList<>();
         res.setCouponCodes(couponCodes);
+        List<CouponProductVo> calculAmountProductList = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(cartGoods)) {
             cartGoods.forEach(cartGood -> {
                 if (StringUtils.isNotEmpty(cartGood.getCouponCode())) {
@@ -362,7 +360,7 @@ public class CouponDiscountCalculation {
                     couponProductVo.setProductId(cartGood.getGoodsId());
                     couponProductVo.setCouponCode(cartGood.getCouponCode());
                     couponProductVo.setCategoryCode(null);
-                    productList.add(couponProductVo);
+                    calculAmountProductList.add(couponProductVo);
                 }
 
 //                if (CollectionUtils.isNotEmpty(cartGood.getProductComboList())) {
@@ -388,8 +386,8 @@ public class CouponDiscountCalculation {
 //                    });
 //                }
             });
-            res.setProductList(productList);
-            Long totalAmount = createProductRequest(cartGoods, productList);
+            res.setProductList(cartGoods);
+            Long totalAmount = createProductRequest(cartGoods, calculAmountProductList);
             res.setTotalAmount(Integer.valueOf(totalAmount.toString()));
             resList.add(res);
         }

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

+package cn.freemud.service.impl.mcoffee.entity;
+
+import cn.freemud.entities.vo.CartGoods;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * All rights Reserved, Designed By sunary.site
+ *
+ * @version v1.0
+ * @Title: IntelliJ IDEA
+ * @Package cn.freemud.service.impl.mcoffee.entity
+ * @Description: 请简单描述下这个类是做什么用的
+ * @author: yu.sun
+ * @date: 2020-10-26 13:59:32
+ * @Copyright: 2019 www.freemud.cn Inc. All rights reserved.
+ */
+@Data
+public class CouponAvailableReqByCart {
+    /**
+     * 渠道id
+     */
+    private String providerId;
+    /**
+     * 商户号
+     */
+    private String merchantId;
+    private String city;
+    private String storeId;
+
+    /**
+     * 组织机构id列表（校验渠道限制）
+     */
+    private List<String> channelIdList;
+
+    /**
+     * 组织机构code列表（校验渠道限制）
+     */
+    private List<String> channelCodeList;
+
+    /**
+     * 券码列表
+     */
+    private List<String> couponCodes;
+    private Integer totalAmount;
+
+    /**
+     * 核销渠道 枚举: mocoffee_wx : 麦咖啡微信小程序 mocoffee_zfb : 麦咖啡支付宝小程序
+     */
+    private String redeemChannel;
+
+    /**
+     * 购物车商品列表
+     */
+    private List<CartGoods> productList;
+
+    private String stationId;
+    private String operatorId;
+}