From e5ecf8d90314f45da2f7e1543845bfa41a10de70 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 16 May 2019 11:37:04 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=A7=A3=E5=8D=95][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=AE=8C=E5=96=84istoday]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/rent/WxBillRentController.java | 7 +++++++ .../WxMerchantTradeDailyController.java | 2 +- .../com/iformall/service/WxBillRentService.java | 17 ++++++++++++----- .../service/impl/WxBillRentServiceImpl.java | 4 ++++ 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java index 7114b39af..5adc787f5 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java @@ -58,6 +58,13 @@ public class WxBillRentController extends BaseController { return wxBillRentService.saveOrUpdate(wxBillRent, getUser()); } + @PostMapping("updateReceiveDatePatch") + @SystemControllerLog(description = "租赁押金账单-更新") + public ResultData updateReceiveDatePatch(@RequestBody WxBillRent wxBillRent) { + logger.debug("[" + getIpAddr() + "] WxBillRentController::updateReceiveDatePatch"); + return wxBillRentService.saveOrUpdate(wxBillRent, getUser()); + } + @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) @SystemControllerLog(description = "租赁押金账单-删除") diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java index 058249b59..16732491d 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java @@ -142,7 +142,7 @@ public class WxMerchantTradeDailyController extends BaseController { List resultList = pageInfo.getList(); // 判断第1条是否是当天 if(CollectionUtils.isNotEmpty(resultList)){ - if(sd.parse(resultList.get(0).getReportDate()).equals(sd.format(new Date()))){ + if(resultList.get(0).getReportDate().equals(sd.format(new Date()))){ resultList.get(0).setIsToday(1); } } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java b/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java index 8075e7921..a0c6cb3b3 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java @@ -31,13 +31,20 @@ public interface WxBillRentService { */ Map getById(Long id); - /** + /** * 保存或更新实体 * - * @param record - * @param user - */ - ResultData saveOrUpdate(WxBillRent record, MallUserInfo user); + * @param record + * @param user + */ + ResultData saveOrUpdate(WxBillRent record, MallUserInfo user); + + /** + * 批量修改到账日期 + * @param record + * @return + */ + ResultData updateReceiveDatePatch(WxBillRent record); /** * 根据Id删除实体 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java index cbfcc284a..2b1abf2b7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -272,4 +272,8 @@ public class WxBillRentServiceImpl implements WxBillRentService { return new ResultData(Result.SUCCESS, "滞纳金结单成功", record); } + @Override + public ResultData updateReceiveDatePatch(WxBillRent record) { + return null; + } }