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

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

ordercenter-sdk/pom.xml

@@ -8,7 +8,7 @@
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <version>1.1.2.RELEASE</version>
+    <version>1.1.3.RELEASE</version>
     <artifactId>ordercenter-sdk</artifactId>
 
     <dependencies>

ordercenter-sdk/readme.md

@@ -5,4 +5,5 @@
 | 1.0.0-SNAPSHOT | 迁移后包明改为cn.freemud开头第一版 | wuping | 2019-12-16 |
 | 1.1.0.RELEASE| 1.9.8需求打包release版本  | 侯书虎 | 2019-12-26  |
 | 1.1.1.RELEASE| 1.9.9需求打包release版本  | 丁凯 | 2020-01-08  |
-| 1.1.2.RELEASE| 农工商订单submit  | 侯书虎 | 2020-01-13  |
+| 1.1.2.RELEASE| 农工商订单submit  | 侯书虎 | 2020-01-13  |
\ No newline at end of file
+| 1.1.3.RELEASE| 开放平台创建订单  | 姜海波 | 2020-02-24  |
\ No newline at end of file

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderSdkService.java

@@ -61,6 +61,16 @@ public class OrderSdkService {
     }
 
     /**
+     * 创建订单 - 开放平台
+     */
+    public BaseResponse<OrderInfoReqs> createOrderByPlatform(CreateOrderRequest request, String trackingNo) {
+        OrderBaseResp<OrderInfoReqs> responseDTO = RequestThirdPartyUtils.httpJsonReqComplexNew(restTemplate, InterfaceAddressConstant.CREATE_ORDER,
+                createBaseRequest(request, trackingNo), new ParameterizedTypeReference<OrderBaseResp<OrderInfoReqs>>() {
+                });
+        return responseHandleByPlatForm(responseDTO);
+    }
+
+    /**
      * 创建父子订单
      */
     public BaseResponse<List<OrderInfoReqs>> createFatherSonOrder(CreateFatherSonOrderReq request, String trackingNo) {
@@ -522,6 +532,18 @@ public class OrderSdkService {
         return result;
     }
 
+    private <T> BaseResponse<T> responseHandleByPlatForm(OrderBaseResp<T> responseDTO) {
+        if (responseDTO == null) {
+            return ResponseUtil.error(ResponseResultEnum.SYSTEM_BUSINESS_ERROR.getCode(), ResponseResultEnum.SYSTEM_BUSINESS_ERROR.getMessage());
+        }
+        BaseResponse<T> result = new BaseResponse<>();
+        result.setCode(responseDTO.getCode());
+        result.setMessage(responseDTO.getMessage());
+        result.setResult(responseDTO.getResult());
+        result.setVer(responseDTO.getVer());
+        return result;
+    }
+
     /**
      * @param
      * @param trackingNo