Sfoglia il codice sorgente

fix

release_toaliyun_real
winter 1 anno fa
parent
commit
b099df72c2
2 ha cambiato i file con 6 aggiunte e 3 eliminazioni
  1. +4
    -1
      mallinkService/src/main/java/com/iformall/service/helper/WxEnergyHelper.java
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java

+ 4
- 1
mallinkService/src/main/java/com/iformall/service/helper/WxEnergyHelper.java Vedi File

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


+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java Vedi File

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


Caricamento…
Annulla
Salva