|
|
|
@@ -532,7 +532,7 @@ public class WxEnergyServiceImpl implements WxEnergyService { |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public List<Map<String,String>> getFeesCalcuteComponentList(WxEnergyFeesShop record) { |
|
|
|
public List<Map<String,String>> getFeesShopComponentList(WxEnergyFeesShop record) { |
|
|
|
List<Map<String,String>> retList = wxEnergyHelper.generateCalcuteComponent(record); |
|
|
|
//公共表,公摊总表,当前楼栋面积,当前楼层面积,总面积,店铺公摊系数 |
|
|
|
WxEnergyMeter mq = new WxEnergyMeter(); |
|
|
|
@@ -568,7 +568,9 @@ public class WxEnergyServiceImpl implements WxEnergyService { |
|
|
|
msf.setIsPublic(fees.getIsPublic()); |
|
|
|
msf.setFeesId(fees.getId()); |
|
|
|
msf.setPrice(fees.getPrice()); |
|
|
|
msf.setFormulaContent(record.getFormulaContent()); |
|
|
|
if (null != record.getFormulaContentList() && record.getFormulaContentList().size() > 0 ) { |
|
|
|
msf.setFormulaContent(JSON.toJSONString(record.getFormulaContentList())); |
|
|
|
} |
|
|
|
msf.setFormula(record.getFormula()); |
|
|
|
wxEnergyHelper.testCalcute(record.getFormula()); |
|
|
|
wxEnergyFeesShopMapper.insert(msf); |
|
|
|
@@ -581,25 +583,23 @@ public class WxEnergyServiceImpl implements WxEnergyService { |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public WxEnergyFeesShop getShopFeesCalcute(Long id,String tenantId) { |
|
|
|
return wxEnergyFeesShopMapper.selectById(id,tenantId); |
|
|
|
public WxEnergyFeesShop getFeesShop(Long id,String tenantId) { |
|
|
|
WxEnergyFeesShop fs = wxEnergyFeesShopMapper.selectById(id,tenantId); |
|
|
|
if (StringUtils.isNotBlank(fs.getFormulaContent())) { |
|
|
|
fs.setFormulaContentList(JSON.parseArray(fs.getFormulaContent(), String.class)); |
|
|
|
} |
|
|
|
return fs; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public void saveOrUpdateShopFeesCalcute(WxEnergyFeesShop record) { |
|
|
|
public void updateFeesShop(WxEnergyFeesShop record) { |
|
|
|
Date date = new Date(); |
|
|
|
final IdWorker idWorker = IdWorker.get(); |
|
|
|
if (record.getId() == null) { |
|
|
|
record.setId(idWorker.nextId()); |
|
|
|
record.setCreateTime(date); |
|
|
|
record.setUpdateTime(date); |
|
|
|
wxEnergyHelper.testCalcute(record.getFormula()); |
|
|
|
wxEnergyFeesShopMapper.insert(record); |
|
|
|
}else { |
|
|
|
record.setUpdateTime(date); |
|
|
|
wxEnergyHelper.testCalcute(record.getFormula()); |
|
|
|
wxEnergyFeesShopMapper.updateById(record); |
|
|
|
} |
|
|
|
record.setUpdateTime(date); |
|
|
|
if (null != record.getFormulaContentList() && record.getFormulaContentList().size() > 0 ) { |
|
|
|
record.setFormulaContent(JSON.toJSONString(record.getFormulaContentList())); |
|
|
|
} |
|
|
|
wxEnergyHelper.testCalcute(record.getFormula()); |
|
|
|
wxEnergyFeesShopMapper.updateById(record); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
|