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

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

@@ -835,6 +835,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;