Merge remote-tracking branch 'remotes/origin/feature/1.9.23_待支付' into qa

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

assortment-ordercenter-sdk/pom.xml

@@ -26,7 +26,7 @@
         <dependency>
             <artifactId>couponcenter-sdk</artifactId>
             <groupId>com.freemud.application.service.sdk</groupId>
-            <version>1.9.16-SNAPSHOT</version>
+            <version>1.8.RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>ordercenter-sdk</artifactId>
-            <version>1.4.3-SNAPSHOT</version>
+            <version>1.2.5.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
@@ -101,11 +101,6 @@
             <version>1.2-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>com.freemud.application.service.sdk</groupId>
-            <artifactId>takeawaycenter-sdk</artifactId>
-            <version>1.2.3-SNAPSHOT</version>
-        </dependency>
     </dependencies>
     <build>
         <plugins>

assortment-ordercenter-sdk/readme.md

@@ -40,4 +40,5 @@
 | 1.3.9.RELEASE | 发送pos消息中心新增字段 | 侯书虎 | 2020-05-11 |
 | 1.4.0.RELEASE | ES查询优化预约单提醒优化 | 海波 | 2020-05-11 |
 | 1.4.1.RELEASE | 返回储值卡支付订单支付金额 | 李小二 | 2020-05-11 |
-| 1.4.2.RELEASE | 申请退款切取消接口新增超时时间字段 | 伍平 | 2020-05-12 |
\ No newline at end of file
+| 1.4.2.RELEASE | 申请退款切取消接口新增超时时间字段 | 伍平 | 2020-05-12 |
+| 1.4.3.RELEASE | 增加售后阶段 | 海波 | 2020-05-14 |
\ No newline at end of file

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -834,6 +834,9 @@ public class OrderAdapter {
                 Integer[] statuses = new Integer[]{RefundStatus.APPLY_REFUND.getCode(), RefundStatus.AGREE_REFUND.getCode(), RefundStatus.COMPLETE_REFUND.getCode()};
                 queryOrdersDto.setRefundStatus(statuses);
             }
+            if (QueryOrderStatus.NO_PAY.getCode().equals(queryOrderDto.getQueryOrderStatus())) {
+                queryOrdersDto.setPayStatus(new Integer[]{PayStatus.NOT_PAY.getCode()});
+            }
         }
 
         // 兼容历史版本，如果传参是4 查询拆程4和5

order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderVo.java

@@ -34,7 +34,7 @@ public class QueryOrderVo {
      */
     private String oid;
     /**
-     * 订单状态 enum queryOrderStatus   全部订单 1 待取餐 2 已完成 3 全部   4.退款
+     * 订单状态 enum queryOrderStatus   全部订单 1 待取餐 2 已完成 3 全部   4.退款,5 待支付
      */
     private Integer queryOrderStatus;
     /**

order-application-service/src/main/java/cn/freemud/enums/QueryOrderStatus.java

@@ -18,7 +18,8 @@ public enum QueryOrderStatus {
     TAKE_MEAL(1, "待取餐"),
     FINISH(2, "已完成"),
     ALL_BILL(3, "全部"),
-    REFUND_BILL(4, "退款");
+    REFUND_BILL(4, "退款"),
+    NO_PAY(5, "待支付");
 
     private Integer code;
 

ordercenter-sdk/pom.xml

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

ordercenter-sdk/readme.md

@@ -22,4 +22,5 @@
 | 1.2.2.RELEASE | ES查询增加异常单状态 | 李小二 | 2020-04-27 |
 | 1.2.3.RELEASE | 配送费实际金额 | 胡超 | 2020-05-11 |
 | 1.2.4.RELEASE | 发送pos消息中心新增字段 | 侯书虎 | 2020-05-11 |
-| 1.2.5.RELEASE | 取消接口新增超时时间字段 | wuping | 2020-05-12 |
\ No newline at end of file
+| 1.2.5.RELEASE | 取消接口新增超时时间字段 | wuping | 2020-05-12 |
+| 1.2.6.RELEASE | 增加售后阶段 | 海波 | 2020-05-14 |
\ 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;
 }