Merge branch 'develop' of gitlab.freemud.com:order-group-application/order-group into develop

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.6.1-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>ordercenter-sdk</artifactId>
-            <version>1.3.5-SNAPSHOT</version>
+            <version>1.3.6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

assortment-ordercenter-sdk/readme.md

@@ -50,4 +50,5 @@
 | 1.5.7-SNAPSHOT | 取消订单增加任务 | wuping | 2020-04-28 |
 | 1.5.8-SNAPSHOT | 费用实体添加字段:实际费用 | 胡超 | 2020-04-29 |
 | 1.5.9-SNAPSHOT | oms逆向代码 | 侯书虎 | 2020-05-06 |
-| 1.6.0-SNAPSHOT | 增加订单金额字段返回 | 侯书虎 | 2020-05-06 |
\ No newline at end of file
+| 1.6.0-SNAPSHOT | 增加订单金额字段返回 | 侯书虎 | 2020-05-06 |
+| 1.6.1-SNAPSHOT | 增加售后阶段 | 侯书虎 | 2020-05-07 |
\ No newline at end of file

ordercenter-sdk/pom.xml

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

ordercenter-sdk/readme.md

@@ -24,4 +24,5 @@
 | 1.2.2.RELEASE | 新增真实配送费 | 海波 | 2020-04-27 |
 | 1.3.3-SNAPSHOT | 创建售后单接口增加任务 | wuping | 2020-04-27 |
 | 1.3.4-SNAPSHOT | 取消订单增加任务 | wuping | 2020-04-28 |
-| 1.3.5-SNAPSHOT | 费用实体添加字段:实际费用 | 胡超 | 2020-04-29 |
\ No newline at end of file
+| 1.3.5-SNAPSHOT | 费用实体添加字段:实际费用 | 胡超 | 2020-04-29 |
+| 1.3.6-SNAPSHOT | 增加售后阶段 | 海波 | 2020-05-07 |
\ No newline at end of file

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/QueryAfterSalesOrderConditionsReq.java

@@ -61,5 +61,8 @@ public class QueryAfterSalesOrderConditionsReq {
     // "每页条目数量，默认10条")
     private Integer pageSize;
 
+    //售后单阶段类型 1:售前 2:售中 3:售后
+    private Byte afterSalesStageType;
+
     protected Integer ver;
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/AfterSalesOrderResp.java

@@ -76,5 +76,6 @@ public class AfterSalesOrderResp {
     private String updateTime;
     //重量
     private Integer weight;
-
+    //售后单阶段类型 1:售前 2:售中 3:售后
+    private Byte afterSalesStageType;
 }