订单查询

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/order/GicOrderController.java

@@ -47,14 +47,18 @@ public class GicOrderController {
     @Autowired
     private WebOrderManageApiService webOrderManageApiService;
 
-    // 发货订单列表 (待发货2+待收货3,部分发货7)
+    // 发货订单列表 (0全部,待发货2+待收货3,部分发货7)
     @RequestMapping("list-order")
     public RestResponse<Object> orderList(String enterpriseId, String storeId, String clerkId, String search,
-            @RequestParam(defaultValue = "1") int status, BasePageInfo pageInfo) {
+            @RequestParam(defaultValue = "0") int status, BasePageInfo pageInfo) {
+        String strStatus = "" + status;
+        if (status == 0) {
+            strStatus = "2,3,7";
+        }
         // 查询门店
         ListOrderManageQDTO qdto = new ListOrderManageQDTO();
         qdto.setEnterpriseId(enterpriseId);
-        qdto.setOrderStep("" + status);
+        qdto.setOrderStep(strStatus);
         qdto.setBusinessType(OrderEnum.BusinessTypeEnum.MICRO_MALL.getType());
         qdto.setSearchOrderParam(search);
         // 配送方式 -1：所有 0：门店自提 1：快递发货