sunyu::update::resolve conflicts and update SDK version

assortment-shoppingcart-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-shoppingcart-sdk</artifactId>
-    <version>1.1.9.RELEASE</version>
+    <version>1.2.2.RELEASE</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>

order-management/src/main/java/cn/freemud/management/service/handle/DeliveryHandle.java

@@ -26,7 +26,6 @@ import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
 import com.freemud.sdk.api.assortment.order.adapter.OrderSdkAdapter;
 import com.freemud.sdk.api.assortment.order.enums.OrderSourceType;
 import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
-import javafx.util.Pair;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

order-management/src/main/java/cn/freemud/management/service/impl/OrderDeliveryService.java

@@ -2,32 +2,17 @@ package cn.freemud.management.service.impl;
 
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.base.log.LogTreadLocal;
-import cn.freemud.management.adapter.DeliverySdkAdapter;
 import cn.freemud.management.entities.dto.request.delivery.DeliveryOrderRequest;
-import cn.freemud.management.entities.dto.request.order.OrderManagerRequest;
-import cn.freemud.management.enums.DeliveryStatus;
 import cn.freemud.management.enums.ResponseResult;
 import cn.freemud.management.service.OrderBaseService;
 import cn.freemud.management.service.handle.DeliveryHandle;
-import cn.freemud.management.util.CommonResp;
 import cn.freemud.management.util.ResponseUtil;
-import com.freemud.application.sdk.api.deliverycenter.dto.CancelDeliveryOrderRequestDto;
-import com.freemud.application.sdk.api.deliverycenter.dto.CreateDeliveryOrderRequestDto;
-import com.freemud.application.sdk.api.deliverycenter.response.CreateDeliveryOrderResponseDto;
-import com.freemud.application.sdk.api.deliverycenter.response.DeliveryResponseDto;
-import com.freemud.application.sdk.api.deliverycenter.service.DeliveryService;
-import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.storecenter.request.StoreInfoRequest;
 import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
 import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
-import com.freemud.sdk.api.assortment.order.enums.OrderSourceType;
 import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
-import javafx.util.Pair;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.ObjectUtils;
-import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 @Slf4j

shopping-cart-application-service/pom.xml

@@ -45,7 +45,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-shoppingcart-sdk</artifactId>
-            <version>1.1.9.RELEASE</version>
+            <version>1.2.2.RELEASE</version>
         </dependency>
         <!--   再来一单查询订单信息  -->
         <dependency>

shopping-cart-application-service/src/test/java/cn.freemud/service/CartTest.java

@@ -80,7 +80,7 @@ public class CartTest {
         /**
          * 用促销价格初始化购物车行记录成交价
          */
-        calculationCommonService.initShoppingCart(discountResult, cartGoodsList, shoppingCartGoodsResponseVo);
+        calculationCommonService.initShoppingCart(discountResult, cartGoodsList, shoppingCartGoodsResponseVo,null);
         /**
          * 满减处理
          */
@@ -117,7 +117,7 @@ public class CartTest {
         ///**
         // * 用促销价格初始化购物车行记录成交价
         // */
-        calculationCommonService.initShoppingCart(discountResult, cartGoodsList, shoppingCartGoodsResponseVo);
+        calculationCommonService.initShoppingCart(discountResult, cartGoodsList, shoppingCartGoodsResponseVo,null);
         /**
          * 满减处理
          */
@@ -159,7 +159,7 @@ public class CartTest {
         /**
          * 用促销价格初始化购物车行记录成交价
          */
-        calculationCommonService.initShoppingCart(discountResult, cartGoodsList, shoppingCartGoodsResponseVo);
+        calculationCommonService.initShoppingCart(discountResult, cartGoodsList, shoppingCartGoodsResponseVo,null);
         /**
          * 利用促销赋值totalDiscountAmount
          */

shopping-cart-application-service/src/test/java/cn.freemud/service/CouponTest.java

@@ -269,7 +269,7 @@ public class CouponTest {
         /**
          * 用促销价格初始化购物车行记录成交价
          */
-        calculationCommonService.initShoppingCart(discountResult, cartGoodsList, shoppingCartGoodsResponseVo);
+        calculationCommonService.initShoppingCart(discountResult, cartGoodsList, shoppingCartGoodsResponseVo,null);
         /**
          * 满减处理
          */
@@ -304,7 +304,7 @@ public class CouponTest {
         /**
          * 用促销价格初始化购物车行记录成交价
          */
-        calculationCommonService.initShoppingCart(discountResult, cartGoodsList, shoppingCartGoodsResponseVo);
+        calculationCommonService.initShoppingCart(discountResult, cartGoodsList, shoppingCartGoodsResponseVo,null);
         /**
          * 满减处理
          */