From a86db5b5d66fcfa664a96b51bcb10c5c320183f3 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 16 May 2019 14:52:04 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BC=98=E5=8C=96=E5=90=88=E5=90=8C][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E5=BC=80=E5=8F=91=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=90=88=E5=90=8C=E9=9C=80=E6=B1=82]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WxPropertyContractController.java | 14 ++++++++++++++ .../controller/rent/WxBillRentController.java | 19 ++++++++++++------- .../migration/V201905161420__L_ALTER_BILL.sql | 19 +++++++++++++++++++ .../iformall/mapper/WxBillPropertyMapper.java | 4 ++-- .../com/iformall/mapper/WxBillRentMapper.java | 2 ++ .../iformall/service/WxBillRentService.java | 13 ++++++------- .../service/WxPropertyContractService.java | 8 ++++++++ .../service/impl/WxBillRentServiceImpl.java | 3 ++- .../impl/WxPropertyContractServiceImpl.java | 4 ++++ .../resources/mapper/WxBillPropertyMapper.xml | 4 ++++ .../resources/mapper/WxBillRentMapper.xml | 3 +++ 11 files changed, 76 insertions(+), 17 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905161420__L_ALTER_BILL.sql diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java index 59084f645..b96868424 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -1,10 +1,12 @@ package com.iformall.controller.contract; +import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxBillProperty; +import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.WxPropertyContract; import com.iformall.service.WxBillPropertyService; import com.iformall.service.WxPropertyContractService; @@ -128,4 +130,16 @@ public class WxPropertyContractController extends BaseController { return wxPropertyContractService.updatePropertyContractStatus(id); } + /** + * 批量修改到账日期 + * @param wxBillProperty + * @return + */ + @PostMapping("updateReceiveDatePatch") + @SystemControllerLog(description = "批量修改到账日期") + public ResultData updateReceiveDatePatch(@RequestBody WxBillProperty wxBillProperty) { + logger.debug("[" + getIpAddr() + "] WxBillRentController::updateReceiveDatePatch"); + wxPropertyContractService.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 5adc787f5..56cc82241 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java @@ -58,13 +58,6 @@ 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 = "租赁押金账单-删除") @@ -126,4 +119,16 @@ 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/mallinkAdmin/src/main/resources/db/migration/V201905161420__L_ALTER_BILL.sql b/mallinkAdmin/src/main/resources/db/migration/V201905161420__L_ALTER_BILL.sql new file mode 100644 index 000000000..c02c036a0 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201905161420__L_ALTER_BILL.sql @@ -0,0 +1,19 @@ +ALTER TABLE wx_rent_contract + ADD COLUMN total_period_month int(11) DEFAULT 0 COMMENT '总租期(月)'; + +ALTER TABLE wx_rent_contract + ADD COLUMN total_period_day int(11) DEFAULT 0 COMMENT '总租期(天)'; + +ALTER TABLE wx_property_contract + ADD COLUMN total_period_month int(11) DEFAULT 0 COMMENT '总租期(月)'; + +ALTER TABLE wx_property_contract + ADD COLUMN total_period_day int(11) DEFAULT 0 COMMENT '总租期(天)'; + + + +ALTER TABLE wx_rent_contract + ADD COLUMN rent_price BIGINT(12) DEFAULT 0 COMMENT '租赁单价'; + +ALTER TABLE wx_property_contract + ADD COLUMN rent_price BIGINT(12) DEFAULT 0 COMMENT '租赁单价'; \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java index a26dd95cd..0620af788 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java @@ -2,10 +2,8 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxBillProperty; -import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.WxPropertyContract; import com.iformall.domain.po.WxRentContract; - import java.util.List; import java.util.Map; @@ -39,4 +37,6 @@ public interface WxBillPropertyMapper extends CommonMapper void updatePreviewStatus(WxBillProperty record); 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 27dfd7120..86405768b 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java @@ -35,4 +35,6 @@ public interface WxBillRentMapper extends CommonMapper { void updatePreviewStatus(WxBillRent record); Long oweBillCount(Long contractId); + + void updateReceiveDatePatch(WxBillRent record); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java b/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java index a0c6cb3b3..6ac575848 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java @@ -39,13 +39,6 @@ public interface WxBillRentService { */ ResultData saveOrUpdate(WxBillRent record, MallUserInfo user); - /** - * 批量修改到账日期 - * @param record - * @return - */ - ResultData updateReceiveDatePatch(WxBillRent record); - /** * 根据Id删除实体 * @@ -65,4 +58,10 @@ public interface WxBillRentService { ResultData updateLatePayStatus(WxBillRent wxBillRent); + /** + * 批量修改到账日期 + * @param record + * @return + */ + ResultData updateReceiveDatePatch(WxBillRent record); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java b/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java index 81c8289b2..6ce5ff641 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java @@ -2,6 +2,7 @@ package com.iformall.service; import com.iformall.common.ResultData; import com.iformall.domain.po.WxBillProperty; +import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.WxPropertyContract; import com.iformall.domain.po.WxRentContract; @@ -63,4 +64,11 @@ public interface WxPropertyContractService { ResultData hasRentContract(Long rentContractId); ResultData updatePropertyContractStatus(Long id); + + /** + * 批量修改到账日期 + * @param record + * @return + */ + void updateReceiveDatePatch(WxBillProperty 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 2b1abf2b7..788ff13b7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -274,6 +274,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { @Override public ResultData updateReceiveDatePatch(WxBillRent record) { - return null; + wxBillRentMapper.updateReceiveDatePatch(record); + return new ResultData(Result.SUCCESS, "修改成功", record); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 7098c319a..30c538c49 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -1020,6 +1020,10 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService } } + @Override + public void updateReceiveDatePatch(WxBillProperty record) { + wxBillPropertyMapper.updateReceiveDatePatch(record); + } } diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml index 90e37f8c3..59318dc5c 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml @@ -176,5 +176,9 @@ select count(br.id) from wx_bill_property br,wx_property_contract c where c.id = br.property_contract_id and br.status = 1 and c.id = #{contractId} + + + 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 7ac4fd29e..61d092c0b 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -176,6 +176,9 @@ and br.status = 1 and c.id = #{contractId} + + update wx_bill_rent set receive_date =#{receiveDate} where rent_contract_id = #{rentContractId} +