From a81081124047132139fab98ddcd78482004bb416 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Sun, 25 Apr 2021 18:35:37 +0800 Subject: [PATCH] fix cashout --- .../main/java/com/iformall/controller/WxCashOutController.java | 2 ++ .../src/main/java/com/iformall/schedule/CashOutSchedule.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java index abd871814..613902e31 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java @@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.*; +import com.iformall.domain.po.base.BaseEntity.SortField; import com.iformall.enums.EnumCashOutStatus; import com.iformall.enums.EnumPayWay; import com.iformall.service.*; @@ -88,6 +89,7 @@ public class WxCashOutController extends BaseController { }else { wxCashOut.setStatus(null); } + wxCashOut.setSortColumns(SortField.CreateDate_DESC); final PageInfo page = wxCashOutService.listAsPage(wxCashOut, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/CashOutSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/CashOutSchedule.java index 09fdccbe6..7cca3ba5f 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/CashOutSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/CashOutSchedule.java @@ -57,7 +57,7 @@ public class CashOutSchedule { } - @Scheduled(cron = "* 5 * * * ?") // 执行一次 + @Scheduled(cron = "0 5 * * * ?") // 执行一次 public void merchantCountSchedule() { List malls = getMalls(); for (WxMall mall : malls) {