| @@ -256,7 +256,7 @@ public class WxPropertyContract extends TenantEntity { | |||||
| private Integer createType; | private Integer createType; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "店铺ids,根据店铺创建", name = "shopIds") | @io.swagger.annotations.ApiModelProperty(value = "店铺ids,根据店铺创建", name = "shopIds") | ||||
| private String shopIds; | private String shopIds; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "店铺号,根据店铺创建", name = "shopNumbers") | |||||
| @io.swagger.annotations.ApiModelProperty(value = "店铺号", name = "shopNumbers") | |||||
| private String shopNumbers; | private String shopNumbers; | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private List<Long> shopIdsQuery; | private List<Long> shopIdsQuery; | ||||
| @@ -65,6 +65,7 @@ public class WxEnergyHelper { | |||||
| } | } | ||||
| addComponent(retList, "商场总计租面积", "{#totalArea#}"); | addComponent(retList, "商场总计租面积", "{#totalArea#}"); | ||||
| addComponent(retList, "店铺公摊系数", "{#shopPublicRax#}"); | addComponent(retList, "店铺公摊系数", "{#shopPublicRax#}"); | ||||
| addComponent(retList, "铺位面积", "{#shopArea#}"); | |||||
| return retList; | return retList; | ||||
| } | } | ||||
| @@ -146,10 +147,11 @@ public class WxEnergyHelper { | |||||
| }else { | }else { | ||||
| formula = formula.replaceAll("#shopPublicRax#", shop.getPulicRate()); | formula = formula.replaceAll("#shopPublicRax#", shop.getPulicRate()); | ||||
| } | } | ||||
| formula = formula.replaceAll("#shopArea#", shop.getOperationArea()); | |||||
| return formula; | return formula; | ||||
| } | } | ||||
| public void testCalcute(String formula,String shopPulicRax) { | |||||
| public void testCalcute(String formula,String shopPulicRax,String shopArea) { | |||||
| if (StringUtils.isBlank(formula)) { | if (StringUtils.isBlank(formula)) { | ||||
| return ; | return ; | ||||
| } | } | ||||
| @@ -163,6 +165,7 @@ public class WxEnergyHelper { | |||||
| } | } | ||||
| } | } | ||||
| formula = formula.replaceAll("#shopPublicRax#", shopPulicRax); | formula = formula.replaceAll("#shopPublicRax#", shopPulicRax); | ||||
| formula = formula.replaceAll("#shopArea#", shopArea); | |||||
| FormulaParser.evaluate(formula); | FormulaParser.evaluate(formula); | ||||
| } | } | ||||
| @@ -783,7 +783,7 @@ public class WxEnergyServiceImpl implements WxEnergyService { | |||||
| msf.setFormulaListStr(JSON.toJSONString(record.getFormulaList())); | msf.setFormulaListStr(JSON.toJSONString(record.getFormulaList())); | ||||
| } | } | ||||
| msf.setFormula(record.getFormula()); | msf.setFormula(record.getFormula()); | ||||
| wxEnergyHelper.testCalcute(record.getFormula(),shop.getPulicRate()); | |||||
| wxEnergyHelper.testCalcute(record.getFormula(),shop.getPulicRate(),shop.getOperationArea()); | |||||
| wxEnergyFeesShopMapper.insert(msf); | wxEnergyFeesShopMapper.insert(msf); | ||||
| } | } | ||||
| } | } | ||||
| @@ -826,7 +826,7 @@ public class WxEnergyServiceImpl implements WxEnergyService { | |||||
| if (StringUtils.isBlank(shop.getPulicRate())) { | if (StringUtils.isBlank(shop.getPulicRate())) { | ||||
| throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"店铺未设置公摊系数"); | 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); | wxEnergyFeesShopMapper.updateById(record); | ||||
| } | } | ||||
| @@ -437,6 +437,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||||
| record.setCreateType(wxPropertyContract.getCreateType()); | record.setCreateType(wxPropertyContract.getCreateType()); | ||||
| record.setShopIds(wxPropertyContract.getShopIds()); | record.setShopIds(wxPropertyContract.getShopIds()); | ||||
| record.setFeeStandards(wxPropertyContract.getFeesStardarsList()); | record.setFeeStandards(wxPropertyContract.getFeesStardarsList()); | ||||
| record.setShopNumbers(wxPropertyContract.getShopNumbers()); | |||||
| List<WxAllBill> billList = buildProperty(new WxMerchant(),user,record,EnumIsPreview.YES.getCode(),true); | List<WxAllBill> billList = buildProperty(new WxMerchant(),user,record,EnumIsPreview.YES.getCode(),true); | ||||
| record.setPreviewBillRentList(billList); | record.setPreviewBillRentList(billList); | ||||
| } | } | ||||
| @@ -572,6 +573,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||||
| //wxBillDeposit.setUpdateByName(user.getName()); | //wxBillDeposit.setUpdateByName(user.getName()); | ||||
| wxBillDeposit.setRentShopType(wxPropertyContract.getRentShopType()); | wxBillDeposit.setRentShopType(wxPropertyContract.getRentShopType()); | ||||
| wxBillDeposit.setShopInfo(getShopInfoStr(wxPropertyContract)); | wxBillDeposit.setShopInfo(getShopInfoStr(wxPropertyContract)); | ||||
| wxBillDeposit.setShopNumber(wxPropertyContract.getShopNumbers()); | |||||
| wxBillDeposit.setRentArea(wxPropertyContract.getRentArea()); | wxBillDeposit.setRentArea(wxPropertyContract.getRentArea()); | ||||
| wxBillDeposit.setEnergyFeesId(EnumBillAllType.PROPERTY_DEPOSIT.getEnergyFeesId()); | wxBillDeposit.setEnergyFeesId(EnumBillAllType.PROPERTY_DEPOSIT.getEnergyFeesId()); | ||||
| try { | try { | ||||
| @@ -878,6 +880,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||||
| if (shopInfo != null) { | if (shopInfo != null) { | ||||
| wxBillProperty.setShopInfo(JSONObject.toJSONString(shopInfo)); | wxBillProperty.setShopInfo(JSONObject.toJSONString(shopInfo)); | ||||
| } | } | ||||
| wxBillProperty.setShopNumber(wxPropertyContract.getShopNumbers()); | |||||
| wxBillProperty.setRentArea(wxPropertyContract.getRentArea()); | wxBillProperty.setRentArea(wxPropertyContract.getRentArea()); | ||||
| //wxBillProperty.setLatePayRatio(0); | //wxBillProperty.setLatePayRatio(0); | ||||
| wxBillProperty.setTotalFee(new BigDecimal(needpay).add(new BigDecimal(standarsTotal)).toPlainString()); | wxBillProperty.setTotalFee(new BigDecimal(needpay).add(new BigDecimal(standarsTotal)).toPlainString()); | ||||
| @@ -1682,7 +1682,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| while (true) { | while (true) { | ||||
| BillTimeVo timeVo = new BillTimeVo(); | BillTimeVo timeVo = new BillTimeVo(); | ||||
| //账单日 | |||||
| //账单日 | |||||
| Calendar instance = Calendar.getInstance(); | Calendar instance = Calendar.getInstance(); | ||||
| instance.setTime(start); | instance.setTime(start); | ||||
| instance.set(Calendar.MILLISECOND, 0); | instance.set(Calendar.MILLISECOND, 0); | ||||