Merge branch 'feature/1.9.25-查询非码微店订单，下载' into qa

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md

assortment-ordercenter-sdk/pom.xml

@@ -55,7 +55,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>storecenter-sdk</artifactId>
-            <version>2.6.4-SNAPSHOT</version>
+            <version>2.8.RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

assortment-ordercenter-sdk/readme.md

@@ -61,4 +61,7 @@
 | 1.5.2-RELEASE| 新增订单完成时间时间戳 | 雷后领 | 2020-05-26 |
 | 1.8.9-SNAPSHOT | 用户订单和es综合查询接口新增订单业务类型集合 | wuping | 2020-06-01 |
 | 1.5.3-RELEASE| 增加下游订单号 | 海波 | 2020-06-01 |
+| 1.5.4-RELEASE| 客如云增加字段 | 茹祥 | 2020-06-01 |
+| 1.5.5-RELEASE| 会员价优惠新增类型 | 侯书虎 | 2020-06-02 |
+| 1.5.6-RELEASE| 更新客如云方法名 | 海波 | 2020-06-05 |
 | 1.3.8-SNAPSHOT | 客如云订单信息 | 茹祥 | 2020-04-29 |
\ No newline at end of file

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

@@ -309,6 +309,6 @@ public interface OrderCenterSdkService {
      * @param assortmentSdkUpdateDownstreamThirdOrderCodeRequest
      * @return
      */
-    BaseOrderResponse updateThirdOrderCode(AssortmentSdkUpdateDownstreamThirdOrderCodeRequest assortmentSdkUpdateDownstreamThirdOrderCodeRequest);
+    BaseOrderResponse updateDownstreamThirdOrderCode(AssortmentSdkUpdateDownstreamThirdOrderCodeRequest assortmentSdkUpdateDownstreamThirdOrderCodeRequest);
 
 }

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

@@ -1372,7 +1372,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
     }
 
     @Override
-    public BaseOrderResponse updateThirdOrderCode(AssortmentSdkUpdateDownstreamThirdOrderCodeRequest assortmentSdkUpdateDownstreamThirdOrderCodeRequest) {
+    public BaseOrderResponse updateDownstreamThirdOrderCode(AssortmentSdkUpdateDownstreamThirdOrderCodeRequest assortmentSdkUpdateDownstreamThirdOrderCodeRequest) {
         UpdateDownstreamOrderCodeReq updateDownstreamOrderCodeReq = orderSdkAdapter.convert2NewOrderUpdateDownstreamThirdOrderCodeReq(assortmentSdkUpdateDownstreamThirdOrderCodeRequest);
         return orderSdkAdapter.convent2NewOrderUpdateThirdOrderCode(orderSdkService.updateDownstreamThirdOrderCode(updateDownstreamOrderCodeReq, assortmentSdkUpdateDownstreamThirdOrderCodeRequest.getTrackingNo()));
     }

ordercenter-sdk/readme.md

@@ -34,4 +34,5 @@
 | 1.4.12-SNAPSHOT | 增加新接口：新增结算信息 | wuping | 2020-05-28 |
 | 1.4.13-SNAPSHOT | 用户订单和es综合查询接口新增订单业务类型集合 | wuping | 2020-06-01 |
 | 1.2.11.RELEASE | 增加订单支付方式 | 海波 | 2020-05-25 |
-| 1.3.1.RELEASE | 增加下游订单号 | 海波 | 2020-06-01 |
\ No newline at end of file
+| 1.3.1.RELEASE | 增加下游订单号 | 海波 | 2020-06-01 |
+| 1.4.14-SNAPSHOT | 增加非码微店类型 | 梁崇福 | 2020-06-05 |
\ No newline at end of file

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/OrderClientType.java

@@ -34,6 +34,7 @@ public enum OrderClientType {
     DIANPING(21, "美团点评"),
     KOUBEI(22, "口碑"),
     SAASMALL(23, "微商城"),
+    FMWD(25, "非码微店"),
     ;