sunyu::fix conflicts

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/domain/CartParamDto.java

@@ -24,6 +24,8 @@ public class CartParamDto {
 
     private String sessionId;
 
+    private String couponCode;
+
     private String userId;
 
     private String storeId;
@@ -34,8 +36,6 @@ public class CartParamDto {
 
     private String cartGoodsUid;
 
-    private String couponCode;
-
     private Integer qty;
 
     private MealClearOperationEnum operationType;

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/ShoppingCartBaseService.java

@@ -1027,4 +1027,8 @@ public interface ShoppingCartBaseService {
         }
         return null;
     }
+
+
+
+
 }

shopping-cart-application-service/src/main/java/cn/freemud/controller/MCoffeeShoppingCartController.java

@@ -57,6 +57,7 @@ public class MCoffeeShoppingCartController {
         return shoppingCartMCoffeeService.updateGoodsQty(request);
     }
 
+
     /**
      * 查询购物车信息
      */

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

@@ -187,8 +187,6 @@ public class AssortmentSdkService {
         return JSONArray.parseArray(JSONObject.toJSONString(baseResponse.getResult()), CartGoods.class);
     }
 
-
-
     /**
      * 调用SDK校验购物车
      *
@@ -210,6 +208,34 @@ public class AssortmentSdkService {
         checkCartRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
         checkCartRequest.setMenuType(BusinessTypeEnum.getByType(menuType).getCode());
         BaseResponse<CheckCartRequest> baseResponse ;
+        baseResponse= shoppingCartService.checkAllCartGoodsNew(checkCartRequest);
+        if (baseResponse == null) {
+            return null;
+        }
+        return baseResponse.getResult();
+    }
+
+    /**
+     * 调用SDK校验购物车
+     *
+     * @param oldAllCartGoodsList
+     * @param partnerId
+     * @param storeId
+     * @param shoppingCartGoodsResponseVo
+     * @param orderType
+     */
+    public CheckCartRequest checkShoppingCartSdkForMCoffee(List<CartGoods> oldAllCartGoodsList, String partnerId, String storeId, ShoppingCartGoodsBaseResponseVo shoppingCartGoodsResponseVo
+            , Integer orderType, String tableNumber, String menuType ,ShoppingCartBaseService shoppingCartService) {
+        CheckCartRequest checkCartRequest = new CheckCartRequest();
+        checkCartRequest.setCartGoodsList(JSONArray.parseArray(JSONObject.toJSONString(oldAllCartGoodsList), com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.class));
+        checkCartRequest.setOrderWay(orderType);
+        checkCartRequest.setPartnerId(partnerId);
+        checkCartRequest.setShoppingCartGoodsResponseVo(JSONObject.parseObject(JSONObject.toJSONString(shoppingCartGoodsResponseVo), com.freemud.sdk.api.assortment.shoppingcart.domain.ShoppingCartGoodsResponseVo.class));
+        checkCartRequest.setStoreId(storeId);
+        checkCartRequest.setTableNumber(tableNumber);
+        checkCartRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
+        checkCartRequest.setMenuType(BusinessTypeEnum.getByType(menuType).getCode());
+        BaseResponse<CheckCartRequest> baseResponse ;
         baseResponse= shoppingCartService.checkAllCartGoodsForMCoffee(checkCartRequest);
         if (baseResponse == null) {
             return null;
@@ -255,4 +281,4 @@ public class AssortmentSdkService {
         cartParamDto.setStoreId(storeId);
         return cartParamDto;
     }
-}
+}
\ No newline at end of file

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

 package cn.freemud.service.impl.mcoffee;
 
 import cn.freemud.adapter.ActivityAdapter;
-import cn.freemud.adapter.ShoppingCartConvertAdapter;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.constant.ShoppingCartConstant;
 import cn.freemud.entities.dto.*;
@@ -20,7 +19,6 @@ import cn.freemud.service.impl.mcoffee.calculation.CalculationServiceImpl;
 import cn.freemud.service.impl.mcoffee.calculation.CouponDiscountCalculation;
 import cn.freemud.service.impl.mcoffee.entity.CopyShoppingCartRequestVo;
 import cn.freemud.service.impl.mcoffee.entity.CouponAvailableReq;
-import cn.freemud.service.impl.mcoffee.entity.CouponState;
 import cn.freemud.service.impl.mcoffee.entity.MCoffeeAddGoodsRequestVo;
 import cn.freemud.service.impl.mcoffee.entity.SwitchShoppingCartRequestVo;
 import cn.freemud.service.thirdparty.CustomerApplicationClient;
@@ -354,8 +352,6 @@ public class ShoppingCartMCoffeeServiceImpl {
         return ResponseUtil.success(shoppingCartGoodsResponseVo);
     }
 
-
-
     /**
      * 券码用-查询购物车最新信息，计算优惠
      * @param requestVo
@@ -371,9 +367,10 @@ public class ShoppingCartMCoffeeServiceImpl {
         List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = getCoupon(null, null, cartGoodsList);
         // 促销活动的优惠金额计算
         calculationService.updateShoppingCartGoodsDiscount(requestVo.getPartnerId(), requestVo.getStoreId(), requestVo.getUserId(), requestVo.getAppId(), requestVo.getOrderType(), assortmentCustomerInfoVo.isMemberPaid(), requestVo.getMenuType(), requestVo.getReceiveId(), null,
-                cartGoodsList, coupons, new ArrayList<>(), shoppingCartGoodsResponseVo);
-         List<CouponAvailableReq> resList = couponDiscountCalculation.buildAvailableCoupons(requestVo,cartGoodsList);
-         return ResponseUtil.success(resList);
+        cartGoodsList, coupons, new ArrayList<>(), shoppingCartGoodsResponseVo);
+        String moneyCoupon = assortmentSdkService.getShoppingCartCoupon(requestVo.getPartnerId(), requestVo.getStoreId(), requestVo.getUserId(), shoppingCartBaseService);
+        List<CouponAvailableReq> resList = couponDiscountCalculation.buildAvailableCoupons(requestVo,cartGoodsList,moneyCoupon);
+        return ResponseUtil.success(resList);
     }
 
 
@@ -1072,7 +1069,7 @@ public class ShoppingCartMCoffeeServiceImpl {
         List<CartGoods> allCartGoodsList = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(checkGoods)) {
             //当商品全部添加完毕,校验购物车商品(是否合法,上下架,点餐方式,是否在当前菜单中...),并移除非法商品
-            CheckCartRequest checkCartRequest = assortmentSdkService.checkShoppingCartSdk(checkGoods, partnerId,
+            CheckCartRequest checkCartRequest = assortmentSdkService.checkShoppingCartSdkForMCoffee(checkGoods, partnerId,
                     storeId, shoppingCartGoodsResponseVo, orderType, "", menuType, shoppingCartBaseService);
             if (checkCartRequest.getShoppingCartGoodsResponseVo() != null) {
                 shoppingCartGoodsResponseVo.setToastMsg(checkCartRequest.getShoppingCartGoodsResponseVo().getToastMsg());
@@ -1108,7 +1105,7 @@ public class ShoppingCartMCoffeeServiceImpl {
         CheckCartRequest checkCartRequest = null;
         if (CollectionUtils.isNotEmpty(checkGoods)) {
             //当商品全部添加完毕,校验购物车商品(是否合法,上下架,点餐方式,是否在当前菜单中...),并移除非法商品
-            checkCartRequest = assortmentSdkService.checkShoppingCartSdk(checkGoods, partnerId,
+            checkCartRequest = assortmentSdkService.checkShoppingCartSdkForMCoffee(checkGoods, partnerId,
                     storeId, shoppingCartGoodsResponseVo, orderType, "", menuType, shoppingCartBaseService);
         }
         return checkCartRequest;

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

@@ -321,7 +321,7 @@ public class CouponDiscountCalculation {
     }
 
 
-    public List<CouponAvailableReq> buildAvailableCoupons(QueryCartInfoRequestVo requestVo,List<CartGoods> cartGoods){
+    public List<CouponAvailableReq> buildAvailableCoupons(QueryCartInfoRequestVo requestVo,List<CartGoods> cartGoods,String moneyCoupon){
         List<CouponAvailableReq> resList = new ArrayList<>();
         CouponAvailableReq res = new CouponAvailableReq();
         res.setProviderId(requestVo.getPartnerId());
@@ -330,12 +330,20 @@ public class CouponDiscountCalculation {
         List<String> couponList = new ArrayList<>();
         res.setChannelIdList(commonService.getOrgCodes(requestVo.getPartnerId(), requestVo.getStoreId()));
         List<CouponProductVo> productList = new ArrayList<>();
+        res.setCouponCodes(StringUtils.isNotEmpty(moneyCoupon) ? Arrays.asList(moneyCoupon) :null);
         if (CollectionUtils.isNotEmpty(cartGoods)) {
             cartGoods.forEach(cartGood -> {
                 if (StringUtils.isNotEmpty(cartGood.getCouponCode())) {
-                    couponList.add(cartGood.getCouponCode());
-                    res.setCouponCodes(couponList);
+                    CouponProductVo couponProductVo = new CouponProductVo();
+                    couponProductVo.setAmount(cartGood.getAmount().intValue());
+                    couponProductVo.setKeyProductCode(cartGood.getCustomerCode());
+                    couponProductVo.setQuantity(cartGood.getQty());
+                    couponProductVo.setProductId(cartGood.getGoodsId());
+                    couponProductVo.setCouponCode(cartGood.getCouponCode());
+                    couponProductVo.setCategoryCode(null);
+                    productList.add(couponProductVo);
                 }
+
                 if (CollectionUtils.isNotEmpty(cartGood.getProductComboList())) {
                     cartGood.getProductComboList().forEach(comboxGoods -> {
                         CouponProductVo couponProductVo = new CouponProductVo();
@@ -343,7 +351,6 @@ 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);
                     });
@@ -355,7 +362,6 @@ 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);
                     });