订单列表查询新增美业订单查询

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

@@ -3877,7 +3877,9 @@ public class OrderAdapter {
         } else if(OrderChannelType.APP.getCode().equals(channelType)){
             orderClients.add(OrderClientType.APP.getIndex());
             //queryOrdersDto.setSource(new String[]{"app"});
-        } else {
+        } else if(OrderChannelType.BEAUTIFUL.getCode().equals(channelType)){// 美业新加
+            orderClients.add(OrderClientType.BEAUTIFUL.getIndex());
+        }else {
             orderClients.add(OrderClientType.SAAS.getIndex());
             //queryOrdersDto.setSource(new String[]{"saas"});
         }
@@ -3911,6 +3913,9 @@ public class OrderAdapter {
                 //queryOrdersDto.setStatus(new Integer[]{OrderStatus.COMPLETE.getCode()});
             }
             if (QueryOrderStatus.REFUND_BILL.getCode().equals(queryOrderStatus)) {
+                // 目前只有美业在用
+                payStatus = Arrays.asList(PayStatus.HAVE_REFUND.getCode());
+                queryOrdersDto.setPayStatuses(payStatus);
                 //Integer[] statuses = new Integer[]{RefundStatus.APPLY_REFUND.getCode(), RefundStatus.AGREE_REFUND.getCode(), RefundStatus.COMPLETE_REFUND.getCode()};
                 //queryOrdersDto.setRefundStatus(statuses);
             }
@@ -3938,6 +3943,11 @@ public class OrderAdapter {
                 //queryOrdersDto.setPayStatus(new Integer[]{PayStatus.NOT_PAY.getCode()});
             }
 
+            if(QueryOrderStatus.WAIT_USE.getCode().equals(queryOrderStatus)){
+                List<Integer> orderStatuses = Arrays.asList(OrderStatus.RECEIPT.getCode(), OrderStatus.TAKE_ORDER.getCode());
+                queryOrdersDto.setOrderStatuses(orderStatuses);
+            }
+
         }
 
         // 兼容历史版本，如果传参是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.退款,5 待支付 ,6 已取消  7未支付取消
+     * 订单状态 enum queryOrderStatus   全部订单 1 待取餐 2 已完成 3 全部   4.退款,5 待支付 ,6 已取消  7未支付取消 8待使用（美业）
      */
     private Integer queryOrderStatus;
     /**

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

@@ -22,6 +22,8 @@ public enum OrderChannelType {
 
     SAASMALL("saasmall", "微商城"),
 
+    BEAUTIFUL("beautiful", "美业"),
+
     APP("app", "APP");
 
     private String code;

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

@@ -22,7 +22,10 @@ public enum QueryOrderStatus {
     NO_PAY(5, "待支付"),
     ORDER_CANCEL(6, "已取消"),
     //密雪
-    ORDER_CANCEL_MIXUE(7, "未支付已取消");
+    ORDER_CANCEL_MIXUE(7, "未支付已取消"),
+
+    // 美业专用
+    WAIT_USE(8, "待使用");
 
 
     private Integer code;

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -3982,8 +3982,7 @@ public class OrderServiceImpl implements Orderservice {
 
     private Boolean isQueryEs(Integer queryOrderStatus) {
 
-        if(ObjectUtils.equals(QueryOrderStatus.TAKE_MEAL.getCode(),queryOrderStatus) || ObjectUtils.equals(QueryOrderStatus.NO_PAY.getCode(),queryOrderStatus)
-        || ObjectUtils.equals(QueryOrderStatus.REFUND_BILL.getCode(),queryOrderStatus)){
+        if(ObjectUtils.equals(QueryOrderStatus.TAKE_MEAL.getCode(),queryOrderStatus) || ObjectUtils.equals(QueryOrderStatus.NO_PAY.getCode(),queryOrderStatus)){
             return Boolean.FALSE;
         }
 

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

@@ -37,6 +37,7 @@ public enum OrderClientType {
     DPZHCT(24, "美团点评智慧餐厅"),
     FMWD(25, "非码微店"),
     TIKTOKPAY(27, "抖音小程序"),
+    BEAUTIFUL(28, "美业"),
     PARKING(99 , "农工商停车"),
     ;