From fcb5de38a6061ec3f7796ae6bfc7fa04d58d3995 Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 25 Feb 2019 14:27:28 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=93=9C=E9=94=A3=E6=B9=BE][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][=E9=A2=84=E8=B4=A6=E5=8D=95]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WxPropertyContractController.java | 10 ----- .../domain/po/WxPropertyContract.java | 4 +- .../service/WxPropertyContractService.java | 2 - .../impl/WxPropertyContractServiceImpl.java | 42 +++++++++---------- .../impl/WxRentContractServiceImpl.java | 5 +++ .../resources/mapper/WxBillPropertyMapper.xml | 4 +- 6 files changed, 30 insertions(+), 37 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxPropertyContractController.java index 0faf5f065..277adcca4 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxPropertyContractController.java @@ -80,16 +80,6 @@ public class WxPropertyContractController extends BaseController { return wxPropertyContractService.getById(id); } - /** - * 生成预览账单 - */ - @ApiOperation("生成预览账单") - @GetMapping(value = "/buildBill") - public ResultData buildBill(@ModelAttribute WxPropertyContract wxPropertyContract) { - logger.debug("[" + getIpAddr() + "] WxPropertyContractController::buildBill"); - return new ResultData(wxPropertyContractService.buildBill(wxPropertyContract)); - } - @RequestMapping("/download") public void download(HttpServletRequest request, HttpServletResponse response){ logger.debug("[" + getIpAddr() + "] WxPropertyContractController::download"); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java index 343c25c5b..5850fd7f0 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java @@ -166,9 +166,9 @@ public class WxPropertyContract implements Serializable { @io.swagger.annotations.ApiModelProperty(value = "审批流参数", name = "flowParams") private Map flowParams; - // 预账单列表 + // 物业预账单列表 @Transient - @io.swagger.annotations.ApiModelProperty(value = "预账单列表", name = "previewBillRentList") + @io.swagger.annotations.ApiModelProperty(value = "物业预账单列表", name = "previewBillRentList") private List previewBillRentList; public List getPreviewBillRentList() { diff --git a/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java b/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java index 2c5ab64a2..81c8289b2 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java @@ -63,6 +63,4 @@ public interface WxPropertyContractService { ResultData hasRentContract(Long rentContractId); ResultData updatePropertyContractStatus(Long id); - - 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 fc439d49c..3c3b28709 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -223,6 +223,13 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService logger.error("保存物业合同信息失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); } + + //生成预览账单 + wxBillPropertyMapper.deletePreviewBill(record); + //重新生成 + List billList = buildProperty(new WxMerchant(),record,EnumIsPreview.YES.getCode()); + propertyContract.setPreviewBillRentList(billList); + message = "保存物业合同信息成功"; } else {//更新物业合同信息 WxPropertyContract wxPropertyContract = wxPropertyContractMapper.selectByPrimaryKey(record.getId()); @@ -253,6 +260,20 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService logger.error("更新物业合同信息失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); } + + //生成预览账单 + if(!wxPropertyContract.getReceivePeriod().equals(record.getReceivePeriod()) + ||!wxPropertyContract.getPrice().equals(record.getPrice()) + ||!wxPropertyContract.getDeposit().equals(record.getDeposit())){ + wxBillPropertyMapper.deletePreviewBill(record); + //重新生成 + wxPropertyContract.setPrice(record.getPrice()); + wxPropertyContract.setDeposit(record.getDeposit()); + wxPropertyContract.setReceivePeriod(record.getReceivePeriod()); + wxPropertyContract.setPayAccount(record.getPayAccount()); + List billList = buildProperty(new WxMerchant(),wxPropertyContract,EnumIsPreview.YES.getCode()); + record.setPreviewBillRentList(billList); + } message = "更新物业合同信息成功"; } @@ -734,25 +755,4 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService } } - @Override - public List buildBill(WxPropertyContract wxPropertyContract) { - //生成预览账单 - //根据租赁合同找到对应的物业合同,生成物业账单 - WxPropertyContract propertyContract = wxPropertyContractMapper.selectByPrimaryKey(wxPropertyContract.getId()); - if(propertyContract != null) { - 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; - } - } - return new ArrayList<>(); - } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 0c2db6484..4b74938d2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -238,6 +238,11 @@ public class WxRentContractServiceImpl implements WxRentContractService { throw new MallinkException(ErrorCode.FLOW_FAIL.getCode(), "FLOW FAILD " + e.getMessage()); } + //生成预览账单(补录第二步,第三步走编辑) + wxBillRentMapper.deletePreviewBill(record); + //重新生成 + List resultList = buildRent(new WxMerchant(), null, record, EnumIsPreview.YES.getCode()); + record.setPreviewBillRentList(resultList); return new ResultData(Result.SUCCESS, "保存租赁合同信息成功", record); } diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml index fcbc87668..183bd99e5 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml @@ -141,7 +141,7 @@ update wx_bill_property set receive_pay = #{receivePay} where id = #{id} - - update wx_bill_rent set is_preview = #{isPreview} where rent_contract_id = #{rentContractId} + + update wx_bill_property set is_preview = #{isPreview} where property_contract_id = #{propertyContractId}