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); }