购物车支持多张券进行选择========== qa环境代码修改- 基于购物车重构

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>

shopping-cart-application-service/src/main/java/cn/freemud/adapter/CouponAdapter.java

@@ -14,6 +14,7 @@ package cn.freemud.adapter;
 
 import cn.freemud.base.constant.Version;
 import cn.freemud.base.util.DateUtil;
+import cn.freemud.demo.entities.bo.CouponCode;
 import cn.freemud.demo.entities.bo.goods.ShoppingCartGoodsApportionBO;
 import cn.freemud.demo.entities.bo.goods.list.ListCartGoodsBO;
 import cn.freemud.entities.dto.*;
@@ -591,7 +592,7 @@ public class CouponAdapter {
      */
     public CouponPromotionVO getCouponPromotionVO(ListCartGoodsBO baseRequestDTO) {
         CouponPromotionVO couponPromotionVO = new CouponPromotionVO();
-        List<ListCartGoodsBO.couponCode> couponCodes = baseRequestDTO.getCouponCodes();
+        List<CouponCode> couponCodes = baseRequestDTO.getCouponCodes();
         if (CollectionUtils.isNotEmpty(couponCodes)) {
             Set<String> setCoupons = new HashSet<>();
             couponCodes.forEach(c -> setCoupons.add(c.getCouponCode()));

shopping-cart-application-service/src/main/java/cn/freemud/demo/adapter/service/DistributeAdapter.java

 package cn.freemud.demo.adapter.service;
 
-import cn.freemud.adapter.CouponAdapter;
 import cn.freemud.demo.entities.bo.DistributeAdapterBO;
 import cn.freemud.demo.entities.bo.goods.CalculationDiscountBO;
 import cn.freemud.demo.entities.bo.goods.DistributeBO;
@@ -68,7 +67,7 @@ public class DistributeAdapter {
                         , couponPromotionVO.getPartnerId()
                         , couponPromotionVO.getUserId()
                         , couponPromotionVO.getStoreId()
-                        , couponPromotionVO.getCouponCode()
+                        , couponPromotionVO
                         , hasGoodssCoupon
                         , couponPromotionVO.getOrderType()
                         , 1

shopping-cart-application-service/src/main/java/cn/freemud/demo/entities/bo/CouponCode.java

@@ -19,4 +19,8 @@ public class CouponCode {
      */
     private Integer index;
 
+    /**
+     * 优惠券类型
+     */
+    private Integer couponType;
 }