From 2696a939847a4c4e29c4866bdae40398da4d6ea5 Mon Sep 17 00:00:00 2001 From: winter Date: Wed, 18 Sep 2024 21:07:58 +0800 Subject: [PATCH 1/2] fix --- .../main/java/com/iformall/domain/po/WxPropertyContract.java | 2 +- .../iformall/service/impl/WxPropertyContractServiceImpl.java | 3 +++ .../com/iformall/service/impl/WxRentContractServiceImpl.java | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) 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 eac24f7cc..ec28edb35 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java @@ -256,7 +256,7 @@ public class WxPropertyContract extends TenantEntity { private Integer createType; @io.swagger.annotations.ApiModelProperty(value = "店铺ids,根据店铺创建", name = "shopIds") private String shopIds; - @io.swagger.annotations.ApiModelProperty(value = "店铺号,根据店铺创建", name = "shopNumbers") + @io.swagger.annotations.ApiModelProperty(value = "店铺号", name = "shopNumbers") private String shopNumbers; @TableField(exist = false) private List shopIdsQuery; 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 3f3a6415f..ea88d291f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -437,6 +437,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService record.setCreateType(wxPropertyContract.getCreateType()); record.setShopIds(wxPropertyContract.getShopIds()); record.setFeeStandards(wxPropertyContract.getFeesStardarsList()); + record.setShopNumbers(wxPropertyContract.getShopNumbers()); List billList = buildProperty(new WxMerchant(),user,record,EnumIsPreview.YES.getCode(),true); record.setPreviewBillRentList(billList); } @@ -572,6 +573,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService //wxBillDeposit.setUpdateByName(user.getName()); wxBillDeposit.setRentShopType(wxPropertyContract.getRentShopType()); wxBillDeposit.setShopInfo(getShopInfoStr(wxPropertyContract)); + wxBillDeposit.setShopNumber(wxPropertyContract.getShopNumbers()); wxBillDeposit.setRentArea(wxPropertyContract.getRentArea()); wxBillDeposit.setEnergyFeesId(EnumBillAllType.PROPERTY_DEPOSIT.getEnergyFeesId()); try { @@ -878,6 +880,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService if (shopInfo != null) { wxBillProperty.setShopInfo(JSONObject.toJSONString(shopInfo)); } + wxBillProperty.setShopNumber(wxPropertyContract.getShopNumbers()); wxBillProperty.setRentArea(wxPropertyContract.getRentArea()); //wxBillProperty.setLatePayRatio(0); wxBillProperty.setTotalFee(new BigDecimal(needpay).add(new BigDecimal(standarsTotal)).toPlainString()); 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 faccd7ce1..cf8422c24 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1682,7 +1682,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { while (true) { BillTimeVo timeVo = new BillTimeVo(); - //账单日 + //账单日 Calendar instance = Calendar.getInstance(); instance.setTime(start); instance.set(Calendar.MILLISECOND, 0); From b099df72c218edcafa3d4ed41a9e2988a20bc0ed Mon Sep 17 00:00:00 2001 From: winter Date: Wed, 18 Sep 2024 22:13:21 +0800 Subject: [PATCH 2/2] fix --- .../java/com/iformall/service/helper/WxEnergyHelper.java | 5 ++++- .../java/com/iformall/service/impl/WxEnergyServiceImpl.java | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/helper/WxEnergyHelper.java b/mallinkService/src/main/java/com/iformall/service/helper/WxEnergyHelper.java index 042c504e0..a04cd423e 100644 --- a/mallinkService/src/main/java/com/iformall/service/helper/WxEnergyHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/helper/WxEnergyHelper.java @@ -65,6 +65,7 @@ public class WxEnergyHelper { } addComponent(retList, "商场总计租面积", "{#totalArea#}"); addComponent(retList, "店铺公摊系数", "{#shopPublicRax#}"); + addComponent(retList, "铺位面积", "{#shopArea#}"); return retList; } @@ -146,10 +147,11 @@ public class WxEnergyHelper { }else { formula = formula.replaceAll("#shopPublicRax#", shop.getPulicRate()); } + formula = formula.replaceAll("#shopArea#", shop.getOperationArea()); return formula; } - public void testCalcute(String formula,String shopPulicRax) { + public void testCalcute(String formula,String shopPulicRax,String shopArea) { if (StringUtils.isBlank(formula)) { return ; } @@ -163,6 +165,7 @@ public class WxEnergyHelper { } } formula = formula.replaceAll("#shopPublicRax#", shopPulicRax); + formula = formula.replaceAll("#shopArea#", shopArea); FormulaParser.evaluate(formula); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java index d9a82f13e..a174e53ba 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java @@ -783,7 +783,7 @@ public class WxEnergyServiceImpl implements WxEnergyService { msf.setFormulaListStr(JSON.toJSONString(record.getFormulaList())); } msf.setFormula(record.getFormula()); - wxEnergyHelper.testCalcute(record.getFormula(),shop.getPulicRate()); + wxEnergyHelper.testCalcute(record.getFormula(),shop.getPulicRate(),shop.getOperationArea()); wxEnergyFeesShopMapper.insert(msf); } } @@ -826,7 +826,7 @@ public class WxEnergyServiceImpl implements WxEnergyService { if (StringUtils.isBlank(shop.getPulicRate())) { throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"店铺未设置公摊系数"); } - wxEnergyHelper.testCalcute(record.getFormula(),shop.getPulicRate()); + wxEnergyHelper.testCalcute(record.getFormula(),shop.getPulicRate(),shop.getOperationArea()); wxEnergyFeesShopMapper.updateById(record); }