Merge remote-tracking branch 'remotes/origin/feature/1.9.20_异常单查询'

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

@@ -1882,7 +1882,7 @@ public class OrderSdkAdapter {
         return newOrderAfterSalesStatus;
     }
 
-    private String getNewOrderTypeDesc(Integer orderType) {
+    public String getNewOrderTypeDesc(Integer orderType) {
         String name = "";
         //外卖平台订单类型 1=常规堂食，2=预约堂食，3=常规外送，4=预约外送，5=常规自取，6=预约自取
         switch (orderType) {
@@ -1911,7 +1911,7 @@ public class OrderSdkAdapter {
     }
 
 
-    private String getNewOrderStatusDesc(Integer orderStatus) {
+    public String getNewOrderStatusDesc(Integer orderStatus) {
         String name = "";
         //新订单服务 订单状态 1:待支付 2:下单 3:已接单 4:制作完成(待发货) 5:配送中 6:已完 7:已关闭
         switch (orderStatus) {
@@ -2873,4 +2873,31 @@ public class OrderSdkAdapter {
         }
     }
 
+    /**
+     *  异常单转换
+     * @param abnormalState
+     * @return
+     */
+    public String getAbnormalName(Integer abnormalState) {
+        String name = "";
+        switch (abnormalState) {
+            case 0: {
+                name = "正常";
+                break;
+            }
+            case 1: {
+                name ="系统接单异常";
+                break;
+            }
+            case 2: {
+                name="骑手上报异常";
+                break;
+            }
+            case 3: {
+                name ="系统退单异常";
+                break;
+            }
+        }
+        return name;
+    }
 }

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

@@ -110,5 +110,8 @@ public class OrderConditionsReq {
     private List<String> externalObjectIds;
     // 外部对象ID 如:活动类型
     private List<Integer> settlementTypes;
+    //异常单状态
+    private List<Integer> abnormalStatuses;
+
 
 }