diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxPropertyContractController.java index ccf377651..0faf5f065 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxPropertyContractController.java @@ -85,9 +85,9 @@ public class WxPropertyContractController extends BaseController { */ @ApiOperation("生成预览账单") @GetMapping(value = "/buildBill") - public ResultData buildBill(@ModelAttribute WxRentContract wxRentContract) { + public ResultData buildBill(@ModelAttribute WxPropertyContract wxPropertyContract) { logger.debug("[" + getIpAddr() + "] WxPropertyContractController::buildBill"); - return new ResultData(wxPropertyContractService.buildBill(wxRentContract)); + return new ResultData(wxPropertyContractService.buildBill(wxPropertyContract)); } @RequestMapping("/download") diff --git a/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java b/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java index f812decc2..2c5ab64a2 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java @@ -64,5 +64,5 @@ public interface WxPropertyContractService { ResultData updatePropertyContractStatus(Long id); - List buildBill(WxRentContract wxRentContract); + List buildBill(WxPropertyContract wxPropertyContract); } 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 e8857d90b..fc439d49c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -735,15 +735,20 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService } @Override - public List buildBill(WxRentContract wxRentContract) { + public List buildBill(WxPropertyContract wxPropertyContract) { //生成预览账单 //根据租赁合同找到对应的物业合同,生成物业账单 - WxPropertyContract propertyContract = wxPropertyContractMapper.findOneByRentId(wxRentContract); + WxPropertyContract propertyContract = wxPropertyContractMapper.selectByPrimaryKey(wxPropertyContract.getId()); if(propertyContract != null) { - if(!wxRentContract.getLease().equals(propertyContract.getLease()) - ||!wxRentContract.getPrice().equals(propertyContract.getPrice())){ + if(!wxPropertyContract.getReceivePeriod().equals(propertyContract.getReceivePeriod()) + ||!wxPropertyContract.getPrice().equals(propertyContract.getPrice()) + ||!wxPropertyContract.getDeposit().equals(propertyContract.getDeposit())){ wxBillPropertyMapper.deletePreviewBill(propertyContract); //重新生成 + propertyContract.setPrice(wxPropertyContract.getPrice()); + propertyContract.setDeposit(wxPropertyContract.getDeposit()); + propertyContract.setReceivePeriod(wxPropertyContract.getReceivePeriod()); + propertyContract.setPayAccount(wxPropertyContract.getPayAccount()); List billList = buildProperty(new WxMerchant(),propertyContract,EnumIsPreview.YES.getCode()); return billList; }