sunyu::reslove conflicts about getShoppingCartCoupon

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;

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

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

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

@@ -19,6 +19,7 @@ import com.freemud.sdk.api.assortment.shoppingcart.request.CheckCartRequest;
 import com.freemud.sdk.api.assortment.shoppingcart.request.GetProductInfoRequest;
 import com.freemud.sdk.api.assortment.shoppingcart.service.ShoppingCartBaseService;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -108,59 +109,67 @@ public class AssortmentSdkService {
     }
 
     /**
-     * 调用聚合sdk设置缓存中购物车信息
+     * 调用聚合sdk获取缓存中购物车信息
      *
      * @param partnerId
      * @param storeId
      * @param useId
      * @return
      */
-    public List<CartGoods> setShoppingCart(String partnerId, String storeId, String useId, List<CartGoods> cartGoodsList, String sessionId, String tableNumber, ShoppingCartBaseService shoppingCartService) {
+    public List<CartGoods> getShoppingCartForCoupon(String partnerId, String storeId, String useId, String tableNumber, ShoppingCartBaseService shoppingCartService) {
         com.freemud.sdk.api.assortment.shoppingcart.domain.CartParamDto cartParamDto = getCartParamDto(partnerId, storeId, useId);
-        cartParamDto.setSessionId(sessionId);
         cartParamDto.setTableNumber(tableNumber);
-        cartParamDto.setCartGoodsList(JSONArray.parseArray(JSONObject.toJSONString(cartGoodsList), com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.class));
-        BaseResponse<List<com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods>> baseResponse = shoppingCartService.setCartGoodsList(cartParamDto, LogThreadLocal.getTrackingNo());
-        if (baseResponse == null || !ResponseResult.SUCCESS.getCode().equals(baseResponse.getCode())) {
-            return null;
+        // 根据不同点餐类型获取不同购物车实例
+        BaseResponse<List<com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods>> baseResponse = shoppingCartService.getCartGoodsList(cartParamDto, LogThreadLocal.getTrackingNo());
+        if (baseResponse == null || !ResponseResult.SUCCESS.getCode().equals(baseResponse.getCode()) || CollectionUtils.isEmpty(baseResponse.getResult())) {
+            return new ArrayList<>();
         }
 
         return JSONArray.parseArray(JSONObject.toJSONString(baseResponse.getResult()), CartGoods.class);
     }
 
+    /**
+     * 调用聚合sdk获取缓存中购物车代金券信息
+     *
+     * @param partnerId
+     * @param storeId
+     * @param useId
+     * @return
+     */
+    public String getShoppingCartCoupon(String partnerId, String storeId, String useId, ShoppingCartBaseService shoppingCartService) {
+        com.freemud.sdk.api.assortment.shoppingcart.domain.CartParamDto cartParamDto = getCartParamDto(partnerId, storeId, useId);
+
+        BaseResponse<String> baseResponse = shoppingCartService.getCartCouponCode(cartParamDto, LogThreadLocal.getTrackingNo());
+        if (baseResponse == null || !ResponseResult.SUCCESS.getCode().equals(baseResponse.getCode()) || StringUtils.isEmpty(baseResponse.getResult())) {
+            return "";
+        }
 
+        return baseResponse.getResult();
+    }
 
     /**
-     * 调用SDK校验购物车
+     * 调用聚合sdk设置缓存中购物车信息
      *
-     * @param oldAllCartGoodsList
      * @param partnerId
      * @param storeId
-     * @param shoppingCartGoodsResponseVo
-     * @param orderType
+     * @param useId
+     * @return
      */
-    public CheckCartRequest checkShoppingCartSdk(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.checkAllCartGoodsNew(checkCartRequest);
-        if (baseResponse == null) {
+    public List<CartGoods> setShoppingCart(String partnerId, String storeId, String useId, List<CartGoods> cartGoodsList, String sessionId, String tableNumber, ShoppingCartBaseService shoppingCartService) {
+        com.freemud.sdk.api.assortment.shoppingcart.domain.CartParamDto cartParamDto = getCartParamDto(partnerId, storeId, useId);
+        cartParamDto.setSessionId(sessionId);
+        cartParamDto.setTableNumber(tableNumber);
+        cartParamDto.setCartGoodsList(JSONArray.parseArray(JSONObject.toJSONString(cartGoodsList), com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.class));
+        BaseResponse<List<com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods>> baseResponse = shoppingCartService.setCartGoodsList(cartParamDto, LogThreadLocal.getTrackingNo());
+        if (baseResponse == null || !ResponseResult.SUCCESS.getCode().equals(baseResponse.getCode())) {
             return null;
         }
-        return baseResponse.getResult();
-    }
 
+        return JSONArray.parseArray(JSONObject.toJSONString(baseResponse.getResult()), CartGoods.class);
+    }
 
     /**
-     * 【麦咖啡】调用SDK校验购物车
+     * 调用SDK校验购物车
      *
      * @param oldAllCartGoodsList
      * @param partnerId
@@ -168,7 +177,7 @@ public class AssortmentSdkService {
      * @param shoppingCartGoodsResponseVo
      * @param orderType
      */
-    public CheckCartRequest checkShoppingCartSdkForMCoffee(List<CartGoods> oldAllCartGoodsList, String partnerId, String storeId, ShoppingCartGoodsBaseResponseVo shoppingCartGoodsResponseVo
+    public CheckCartRequest checkShoppingCartSdk(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));