From 3c938f5cde46be283eaf9a6cc7da1e799c35e177 Mon Sep 17 00:00:00 2001 From: winter Date: Sun, 1 Sep 2024 16:41:10 +0800 Subject: [PATCH] fix --- .../controller/market/WxEnergyController.java | 13 +++++++++---- .../iformall/controller/WxMallAdminController.java | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java index 80034f9a5..42475c08c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java @@ -463,7 +463,7 @@ public class WxEnergyController extends BaseController { @ApiOperation("费用区间自动时间") @PostMapping("periodAutoTimes") - public ResultData periodAutoTimes(@ModelAttribute WxEnergyFeesTime record) { + public ResultData periodAutoTimes(@RequestBody WxEnergyFeesTime record) { List dateList = wxEnergyService.findLastTimeEndGroup(record); if (null != dateList && dateList.size() > 1 ) { return new ResultData(Result.ERROR,"所选店铺表类型最近一次结束时间不相同,不能一起增加"); @@ -473,9 +473,14 @@ public class WxEnergyController extends BaseController { //之前没有的话,就从年月第一天开始 start = DateUtils.stringToDate(record.getPeriod()+"01", DateUtils.DATE_PATTERN_NOSPACE); }else { - //开始时间取接受时间后的一天 - start = DateUtils.getTimeAfterDays(1, dateList.get(0)); - start = DateUtils.getDayBegin(start); + Date _d = dateList.get(0); + if (null != _d) { + //开始时间取接受时间后的一天 + start = DateUtils.getTimeAfterDays(1, _d); + start = DateUtils.getDayBegin(start); + }else { + start = DateUtils.stringToDate(record.getPeriod()+"01", DateUtils.DATE_PATTERN_NOSPACE); + } } Date end = DateUtils.getTimeAfterMonths(1, start); Map retMap = new HashMap(); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java index 1318313af..a9f0fe97f 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java @@ -433,7 +433,7 @@ public class WxMallAdminController extends BaseController { @ApiOperation("费用区间自动时间") @PostMapping("periodAutoTimes") - public ResultData periodAutoTimes(@ModelAttribute WxEnergyFeesTime record) { + public ResultData periodAutoTimes(@RequestBody WxEnergyFeesTime record) { // List dateList = wxEnergyService.findLastTimeEndGroup(record); if (null != dateList && dateList.size() > 1 ) {