diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java index bc468d92a..4895549e0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java @@ -56,17 +56,14 @@ public class WxMerchantTradeDailyController extends BaseController { public ResultData list(@ModelAttribute WxMerchantTradeDailyVo wxMerchantTradeDaily, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxMerchantTradeDailyController::listYesterday"); - if (wxMerchantTradeDaily == null) wxMerchantTradeDaily = new WxMerchantTradeDailyVo(); + if (wxMerchantTradeDaily == null) + wxMerchantTradeDaily = new WxMerchantTradeDailyVo(); wxMerchantTradeDaily.setTenantId(getTenantId()); if (wxMerchantTradeDaily.getReportDate() == null) { - Calendar cal = Calendar.getInstance(); - cal.setTime(new Date()); - cal.add(Calendar.DAY_OF_YEAR, -1); SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd"); - wxMerchantTradeDaily.setReportDate(fmt.format(cal.getTime())); + wxMerchantTradeDaily.setReportDate(fmt.format(new Date())); } - wxMerchantTradeDaily.setSortColumns(WxMerchantTradeDailyVo.Field.MerchantId_DESC); PageInfo page = wxMerchantTradeDailyService.listAsPageVo(wxMerchantTradeDaily, pageNum, pageSize); @@ -100,11 +97,8 @@ public class WxMerchantTradeDailyController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); wxMerchantTradeDaily.setTenantId(getTenantId()); if (wxMerchantTradeDaily.getReportDate() == null) { - Calendar cal = Calendar.getInstance(); - cal.setTime(new Date()); - cal.add(Calendar.DAY_OF_YEAR, -1); SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd"); - wxMerchantTradeDaily.setReportDate(fmt.format(cal.getTime())); + wxMerchantTradeDaily.setReportDate(fmt.format(new Date())); } return wxMerchantTradeDailyService.update(wxMerchantTradeDaily); }