diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java index 1ef70021a..1d23ffa52 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java @@ -113,16 +113,4 @@ public class WxBillPropertyController extends BaseController { return wxBillPropertyService.updateLatePayStatus(wxBillProperty); } - /** - * 批量修改到账日期 - * @param wxBillProperty - * @return - */ - @PostMapping("updateReceiveDatePatch") - @SystemControllerLog(description = "批量修改到账日期") - public ResultData updateReceiveDatePatch(@RequestBody WxBillProperty wxBillProperty) { - logger.debug("[" + getIpAddr() + "] WxBillRentController::updateReceiveDatePatch"); - wxBillPropertyService.updateReceiveDatePatch(wxBillProperty); - return new ResultData(); - } } 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 56cc82241..7fe9430ba 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java @@ -103,7 +103,6 @@ public class WxBillRentController extends BaseController { return new ResultData(Result.SUCCESS, "查询成功", wxBillRentService.detail(id)); } - @PostMapping("updateRevenue") @SystemControllerLog(description = "租赁押金账单-更新营业额") public ResultData updateRevenue(@RequestBody WxBillRent wxBillRent) { @@ -119,16 +118,4 @@ public class WxBillRentController extends BaseController { return wxBillRentService.updateLatePayStatus(wxBillRent); } - - /** - * 批量修改到账日期 - * @param wxBillRent - * @return - */ - @PostMapping("updateReceiveDatePatch") - @SystemControllerLog(description = "批量修改到账日期") - public ResultData updateReceiveDatePatch(@RequestBody WxBillRent wxBillRent) { - logger.debug("[" + getIpAddr() + "] WxBillRentController::updateReceiveDatePatch"); - return wxBillRentService.updateReceiveDatePatch(wxBillRent); - } } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java index 0620af788..a9cf66e7c 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java @@ -38,5 +38,4 @@ public interface WxBillPropertyMapper extends CommonMapper Long oweBillCount(Long contractId); - void updateReceiveDatePatch(WxBillProperty record); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java index 86405768b..da71820f0 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java @@ -36,5 +36,4 @@ public interface WxBillRentMapper extends CommonMapper { Long oweBillCount(Long contractId); - void updateReceiveDatePatch(WxBillRent record); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java b/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java index a7334a589..bd2640c70 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java @@ -58,10 +58,4 @@ public interface WxBillPropertyService { ResultData updateLatePayStatus(WxBillProperty wxBillProperty); - /** - * 批量修改到账日期 - * @param record - * @return - */ - void updateReceiveDatePatch(WxBillProperty record); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java b/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java index 6ac575848..1961f7970 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java @@ -57,11 +57,4 @@ public interface WxBillRentService { ResultData updateLatePayStatus(WxBillRent wxBillRent); - - /** - * 批量修改到账日期 - * @param record - * @return - */ - ResultData updateReceiveDatePatch(WxBillRent record); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java index 858e2caa3..17e150daa 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java @@ -235,9 +235,4 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { return new ResultData(Result.SUCCESS, "滞纳金结单成功", record); } - - @Override - public void updateReceiveDatePatch(WxBillProperty record) { - wxBillPropertyMapper.updateReceiveDatePatch(record); - } } 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 788ff13b7..5bf365bd2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -271,10 +271,4 @@ public class WxBillRentServiceImpl implements WxBillRentService { } return new ResultData(Result.SUCCESS, "滞纳金结单成功", record); } - - @Override - public ResultData updateReceiveDatePatch(WxBillRent record) { - wxBillRentMapper.updateReceiveDatePatch(record); - return new ResultData(Result.SUCCESS, "修改成功", record); - } } diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendEmailServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendEmailServiceImpl.java index 61b58bee1..a38ba2ea0 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendEmailServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendEmailServiceImpl.java @@ -48,6 +48,7 @@ public class SendEmailServiceImpl implements MsgSendService { WxMsgValidationcodeModel msgModel = new WxMsgValidationcodeModel(); msgModel.setTenantId(mailMsg.getTenantId()); msgModel.setType(mailMsg.getModelId()); + msgModel.setModelId(mailMsg.getModelId()); List modelList = wxMsgValidationcodeModelMapper.findList(msgModel); if(CollectionUtils.isEmpty(modelList)){ throw new Exception("模板id:"+mailMsg.getModelId()+"不存在"); diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index 0eb39f928..33a715bc1 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -495,7 +495,7 @@ - - - update wx_bill_property set receive_date =#{receiveDate} where property_contract_id = #{propertyContractId} - diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index eaa9cb579..dc30b2dee 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -179,9 +179,6 @@ and br.status = 1 and c.id = #{contractId} - - update wx_bill_rent set receive_date =#{receiveDate} where rent_contract_id = #{rentContractId} -