wanxl 1 год назад
Родитель
Сommit
7db4418365

+ 7 - 6
src/main/java/com/sqx/modules/pay/controller/query/CashOutQueryDTO.java

@@ -76,12 +76,13 @@ public class CashOutQueryDTO extends PageQuery {
                 case 2: stringBuffer.append("状态:已拒绝;");break;
             }
         }
-        if(StringUtils.hasText(type)){
-            switch (type){
-                case "1": stringBuffer.append("状态:用户提现;");break;
-                case "2": stringBuffer.append("状态:退保证金;");break;
-            }
-        }
+        //不展示默认查询条件
+//        if(StringUtils.hasText(type)){
+//            switch (type){
+//                case "1": stringBuffer.append("状态:用户提现;");break;
+//                case "2": stringBuffer.append("状态:退保证金;");break;
+//            }
+//        }
         return stringBuffer.toString();
     }
 }

+ 8 - 7
src/main/java/com/sqx/modules/pay/controller/query/WalletDetailQuery.java

@@ -47,13 +47,14 @@ public class WalletDetailQuery extends PageQuery {
                 case "2": stringBuilder.append("状态:提现;");break;
             }
         }
-        if(StringUtils.hasText(classify)){
-            switch (classify){
-                case "1": stringBuilder.append("明细类别:骑手保证金;");break;
-                case "2": stringBuilder.append("明细类别:商户保证金;");break;
-                case "3": stringBuilder.append("明细类别:钱包明细;");break;
-            }
-        }
+        //不展示默认条件
+//        if(StringUtils.hasText(classify)){
+//            switch (classify){
+//                case "1": stringBuilder.append("明细类别:骑手保证金;");break;
+//                case "2": stringBuilder.append("明细类别:商户保证金;");break;
+//                case "3": stringBuilder.append("明细类别:钱包明细;");break;
+//            }
+//        }
         return stringBuilder.toString();
     }
 

+ 3 - 3
src/main/java/com/sqx/scheduler/export/ExportScheduler.java

@@ -71,11 +71,11 @@ public class ExportScheduler {
      * 每分钟运行一次
      */
     @Async
-//    @Scheduled(cron = "18 */1 * * * ?", zone = "Asia/Shanghai")
-    @GetMapping("excelOrder")
+    @Scheduled(cron = "18 */1 * * * ?", zone = "Asia/Shanghai")
+//    @GetMapping("excelOrder")
     public void orderExport() throws Exception {
         List<ExportJob> exportJobList=exportJobService.list(new QueryWrapper<ExportJob>()
-                .eq("flag",3).last("order by create_time limit 10"));
+                .eq("flag",0).last("order by create_time limit 10"));
         log.info("本次导出数据exportJobList==========="+exportJobList);
         if (null == exportJobList ||exportJobList.isEmpty()){
             return;