Merge branch 'master' of http://gitlab.freemud.com/order-group-application/order-group

# Conflicts:
#	order-management/order-management.iml

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>1.1.9.RELEASE</version>
+    <version>1.2.0.RELEASE</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>ordercenter-sdk</artifactId>
-            <version>1.1.2.RELEASE</version>
+            <version>1.1.3.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

assortment-ordercenter-sdk/readme.md

@@ -11,4 +11,5 @@
 | 1.1.5.RELEASE| 农工商submit接口(del thirdCateId)  | 胡超 | 2020-01-13 |
 | 1.1.6-SNAPSHOT| 1.9.11商品组  | 胡超 | 2020-02-05 |
 | 1.1.7.RELEASE| 1.9.11商品组  | 胡超 | 2020-02-13 |
-| 1.1.9.RELEASE| pos渠道  | 丁凯 | 2020-02-22 |
+| 1.1.9.RELEASE| pos渠道  | 丁凯 | 2020-02-22 |
\ No newline at end of file
+| 1.2.0.RELEASE| 开放平台创建订单  | 姜海波 | 2020-02-24 |
\ No newline at end of file

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

@@ -464,7 +464,7 @@ public class OrderSdkAdapter {
         CreateOrderResponse response = new CreateOrderResponse();
         response.setErrcode(Integer.parseInt(result.getCode()));
         response.setErrmsg(result.getMessage());
-        if (result.getResult() == null) {
+        if (result.getResult().equals(new OrderInfoReqs())) {
             return response;
         }
 

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -170,7 +170,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
     @Override
     public CreateOrderResponse createOrder(BaseCreateOrderRequest baseCreateOrderRequest) {
         com.freemud.application.sdk.api.ordercenter.request.create.CreateOrderRequest request = orderSdkAdapter.convent2NEWCreateOrderRequest(baseCreateOrderRequest);
-        com.freemud.application.sdk.api.ordercenter.response.BaseResponse<OrderInfoReqs> order = orderSdkService.createOrder(request, baseCreateOrderRequest.getTrackingNo());
+        com.freemud.application.sdk.api.ordercenter.response.BaseResponse<OrderInfoReqs> order = orderSdkService.createOrderByPlatform(request, baseCreateOrderRequest.getTrackingNo());
         return orderSdkAdapter.convent2NEWOrderInfoReqs(order);
     }