merge

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>2.1.9-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>ordercenter-sdk</artifactId>
-            <version>1.6.4-SNAPSHOT</version>
+            <version>1.6.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

assortment-ordercenter-sdk/readme.md

@@ -94,4 +94,5 @@
 | 2.1.6-SNAPSHOT| 升级ordercenter-sdk   | lixixoaer | 2020-11-10 |
 | 2.1.7-SNAPSHOT|  混合支付退款   | lixixoaer | 2020-11-11 |
 | 2.1.8-SNAPSHOT|  退款增加自动退款配置的null判断   | 刘鹏飞 | 2020-11-12 |
-| 2.1.9-SNAPSHOT|  麦咖啡买三赠一   | 徐康 | 2020-11-16 |
\ No newline at end of file
+| 2.1.9-SNAPSHOT|  麦咖啡买三赠一   | 徐康 | 2020-11-16 |
+| 2.2.0-SNAPSHOT|  混合支付   | 徐康 | 2020-11-16 |
\ No newline at end of file

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -263,12 +263,10 @@ public class OrderSdkAdapter {
         //订单重量
         Double orderWeight = sumOrderWeight(requestVO.getProducts());
         request.setWeight(orderWeight);
-        request.setOrderPayItemCreateReqList(requestVO.getOrderPayItemCreateReqList());
         // 扩展字段（第三方商品分类编号）
         if (null != requestVO && null != requestVO.getOtherInfo()) {
             request.setExtInfo(JSONObject.toJSONString(requestVO.getOtherInfo()));
         }
-        request.setOrderPayItemCreateReqList(requestVO.getOrderPayItemCreateReqList());
         return request;
     }
 

ordercenter-sdk/pom.xml

@@ -8,7 +8,7 @@
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <version>1.6.4-SNAPSHOT</version>
+    <version>1.6.5-SNAPSHOT</version>
     <artifactId>ordercenter-sdk</artifactId>
 
     <dependencies>

ordercenter-sdk/readme.md

@@ -33,5 +33,6 @@
 | 1.3.18.RELEASE | 麦咖啡加料 | 徐康 | 2020-10-30 |
 | 1.6.3-SNAPSHOT | Add#PayChannelType | lixiaoer | 2020-11-09 |
 | 1.6.4-SNAPSHOT | 麦咖啡买三赠一 | 徐康 | 2020-11-16 |
+| 1.6.5-SNAPSHOT | 混合支付 | 徐康 | 2020-11-16 |