Explorar el Código

fix

release_toaliyun_real
winter hace 1 año
padre
commit
7b2a93ada3
Se han modificado 2 ficheros con 17 adiciones y 3 borrados
  1. +2
    -1
      mallinkService/src/main/java/com/iformall/service/helper/WxEnergyHelper.java
  2. +15
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java

+ 2
- 1
mallinkService/src/main/java/com/iformall/service/helper/WxEnergyHelper.java Ver fichero

@@ -140,7 +140,7 @@ public class WxEnergyHelper {
return formula; return formula;
} }
public void testCalcute(String formula) {
public void testCalcute(String formula,String shopPulicRax) {
if (StringUtils.isBlank(formula)) { if (StringUtils.isBlank(formula)) {
return ; return ;
} }
@@ -153,6 +153,7 @@ public class WxEnergyHelper {
formula = formula.replaceAll(relpaceFloorArea, "1"); formula = formula.replaceAll(relpaceFloorArea, "1");
} }
} }
formula = formula.replaceAll("#shopPublicRax#", shopPulicRax);
FormulaParser.evaluate(formula); FormulaParser.evaluate(formula);
} }


+ 15
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java Ver fichero

@@ -551,14 +551,23 @@ public class WxEnergyServiceImpl implements WxEnergyService {
return retList; return retList;
} }
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
@Override @Override
public void createFeesShop(WxEnergyFeesShop record) { public void createFeesShop(WxEnergyFeesShop record) {
//新增关联 //新增关联
final IdWorker idWorker = IdWorker.get(); final IdWorker idWorker = IdWorker.get();
Date date = new Date(); Date date = new Date();
WxEnergyFees fees = this.getFeesById(record.getFeesId(),record.getTenantId()); WxEnergyFees fees = this.getFeesById(record.getFeesId(),record.getTenantId());
WxShop sq = new WxShop();
sq.updateTenantInfo(record);
sq.setIds(record.getShopIds());
Map<Long, WxShop> shopMap = wxShopService.findShopMap(sq);
for (int i = 0 ; i < record.getShopIds().size(); i ++) { for (int i = 0 ; i < record.getShopIds().size(); i ++) {
Long shopId = record.getShopIds().get(i); Long shopId = record.getShopIds().get(i);
WxShop shop = shopMap.get(shopId);
if (StringUtils.isBlank(shop.getPulicRate())) {
throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"店铺未设置公摊系数");
}
WxEnergyFeesShop msf = new WxEnergyFeesShop(); WxEnergyFeesShop msf = new WxEnergyFeesShop();
msf.updateTenantInfo(record); msf.updateTenantInfo(record);
msf.setId(idWorker.nextId()); msf.setId(idWorker.nextId());
@@ -580,7 +589,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());
wxEnergyHelper.testCalcute(record.getFormula(),shop.getPulicRate());
wxEnergyFeesShopMapper.insert(msf); wxEnergyFeesShopMapper.insert(msf);
} }
} }
@@ -617,7 +626,11 @@ public class WxEnergyServiceImpl implements WxEnergyService {
if (null != record.getFormulaList() && record.getFormulaList().size() > 0 ) { if (null != record.getFormulaList() && record.getFormulaList().size() > 0 ) {
record.setFormulaListStr(JSON.toJSONString(record.getFormulaList())); record.setFormulaListStr(JSON.toJSONString(record.getFormulaList()));
} }
wxEnergyHelper.testCalcute(record.getFormula());
WxShop shop = wxShopService.getById(record.getShopId());
if (StringUtils.isBlank(shop.getPulicRate())) {
throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"店铺未设置公摊系数");
}
wxEnergyHelper.testCalcute(record.getFormula(),shop.getPulicRate());
wxEnergyFeesShopMapper.updateById(record); wxEnergyFeesShopMapper.updateById(record);
} }


Cargando…
Cancelar
Guardar