From 5380b6f022892eb4f20bfa47a447924b4e63afd9 Mon Sep 17 00:00:00 2001 From: winter Date: Sat, 6 Jul 2024 23:17:44 +0800 Subject: [PATCH] fix --- .../controller/contract/WxPropertyContractController.java | 6 +++--- .../main/java/com/iformall/domain/po/WxBillProperty.java | 2 +- .../service/impl/WxPropertyContractServiceImpl.java | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) 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 7d668b181..4db4758ab 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -190,10 +190,9 @@ public class WxPropertyContractController extends WxContractBaseController { return wxPropertyContractService.saveOrUpdate(wxPropertyContract, user.getId(), user.getName(),false); } - //物业合同-更新租赁开始日期 + //物业合同-最后一步切换 按什么日期生成账单 @PostMapping("updateRentStartTime") public ResultData updateRentStartTime(@RequestBody WxPropertyContract wxPropertyContract) { - logger.debug("[" + getIpAddr() + "] WxPropertyContractController::updateRentStartTime"); WxPropertyContract propertyContract = wxPropertyContractMapper.selectById(wxPropertyContract.getId()); MallUserInfo user = getUser(); propertyContract.updateTenantInfo(user); @@ -211,7 +210,7 @@ public class WxPropertyContractController extends WxContractBaseController { return wxPropertyContractService.saveOrUpdate(propertyContract, user.getId(), user.getName(),false); } - @PostMapping("update-第三步") + @PostMapping("update-第三步提交") public ResultData update(@RequestBody WxPropertyContract wxPropertyContract) { logger.debug("[" + getIpAddr() + "] WxPropertyContractController::update"); MallUserInfo user = getUser(); @@ -222,6 +221,7 @@ public class WxPropertyContractController extends WxContractBaseController { if (null != wxPropertyContract.getFeeStandards() && wxPropertyContract.getFeeStandards().size() > 0 ) { wxPropertyContract.setFeesStandardsInfo(JSON.toJSONString(wxPropertyContract.getFeeStandards())); } + wxPropertyContract.setPreviewBillRentList(null); return wxPropertyContractService.saveOrUpdate(wxPropertyContract, user.getId(), user.getName(),true); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java index 1cd36231b..c6de3dfbe 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java @@ -159,7 +159,7 @@ public class WxBillProperty extends WxBillBaseEntity { @Override public String getBillRemark() { - return ""; + return comments; } @Override 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 ed4c0ab70..48c4b7f51 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -734,7 +734,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService } ++billcount; - WxBillProperty wxBillProperty = generateBillProperty(wxPayAccountBill,wxPropertyContract,isPreview,billTimeVo.getStartDate(),billTimeVo.getEndDate(),billTimeVo.getReceiveDate(),needpay,userId,billcount,shopInfo,standarsTotal); + WxBillProperty wxBillProperty = generateBillProperty(wxPayAccountBill,wxPropertyContract,isPreview,billTimeVo.getStartDate(),billTimeVo.getEndDate(),billTimeVo.getReceiveDate(),needpay,userId,billcount,shopInfo,standarsTotal,""); wxBillProperty.setUnFixedbillFeesStandardsList(unFixedList); resultList.add(wxBillProperty); @@ -773,11 +773,11 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService private WxBillProperty generateBillPropertyByBillStandards(WxPayAccountBill wxPayAccountBill,WxPropertyContract wxPropertyContract,Integer isPreview,Long userId,WxBillFeesStandardsListVo svo, Integer billcount,Map shopInfo) { - return generateBillProperty(wxPayAccountBill,wxPropertyContract,isPreview,svo.getStart(),svo.getEnd(),svo.getReceiveDate(),svo.getTotal(),userId,billcount,shopInfo,"0"); + return generateBillProperty(wxPayAccountBill,wxPropertyContract,isPreview,svo.getStart(),svo.getEnd(),svo.getReceiveDate(),svo.getTotal(),userId,billcount,shopInfo,"0",svo.getBillName()); } private WxBillProperty generateBillProperty(WxPayAccountBill wxPayAccountBill,WxPropertyContract wxPropertyContract,Integer isPreview,Date start,Date end,Date receiveDate,String needpay, - Long userId,Integer billcount,Map shopInfo,String standarsTotal) { + Long userId,Integer billcount,Map shopInfo,String standarsTotal,String remark) { final IdWorker idWorker = IdWorker.get(); WxBillProperty wxBillProperty = new WxBillProperty(); wxBillProperty.setIsPreview(isPreview); @@ -810,7 +810,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService } wxBillProperty.setLatePayRatio(0); wxBillProperty.setTotalFee(new BigDecimal(needpay).add(new BigDecimal(standarsTotal)).toPlainString()); - + wxBillProperty.setComments(remark); //计算手续费 BigDecimal servicePay = new BigDecimal(wxBillProperty.getReceivePay()).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(100), wxPropertyContract.getDecimalSize(), BigDecimal.ROUND_HALF_UP);