|
|
|
@@ -571,8 +571,8 @@ public class WxEnergyServiceImpl implements WxEnergyService { |
|
|
|
if (null != record.getFormulaContentList() && record.getFormulaContentList().size() > 0 ) { |
|
|
|
msf.setFormulaContent(JSON.toJSONString(record.getFormulaContentList())); |
|
|
|
} |
|
|
|
if (null != record.getFormulaLis() && record.getFormulaLis().size() > 0 ) { |
|
|
|
msf.setFormulaListStr(JSON.toJSONString(record.getFormulaLis())); |
|
|
|
if (null != record.getFormulaList() && record.getFormulaList().size() > 0 ) { |
|
|
|
msf.setFormulaListStr(JSON.toJSONString(record.getFormulaList())); |
|
|
|
} |
|
|
|
msf.setFormula(record.getFormula()); |
|
|
|
wxEnergyHelper.testCalcute(record.getFormula()); |
|
|
|
@@ -592,7 +592,7 @@ public class WxEnergyServiceImpl implements WxEnergyService { |
|
|
|
fs.setFormulaContentList(JSON.parseArray(fs.getFormulaContent(), String.class)); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(fs.getFormulaListStr())) { |
|
|
|
fs.setFormulaLis(JSON.parseArray(fs.getFormulaListStr(), String.class)); |
|
|
|
fs.setFormulaList(JSON.parseArray(fs.getFormulaListStr(), String.class)); |
|
|
|
} |
|
|
|
return fs; |
|
|
|
} |
|
|
|
@@ -604,8 +604,8 @@ public class WxEnergyServiceImpl implements WxEnergyService { |
|
|
|
if (null != record.getFormulaContentList() && record.getFormulaContentList().size() > 0 ) { |
|
|
|
record.setFormulaContent(JSON.toJSONString(record.getFormulaContentList())); |
|
|
|
} |
|
|
|
if (null != record.getFormulaLis() && record.getFormulaLis().size() > 0 ) { |
|
|
|
record.setFormulaListStr(JSON.toJSONString(record.getFormulaLis())); |
|
|
|
if (null != record.getFormulaList() && record.getFormulaList().size() > 0 ) { |
|
|
|
record.setFormulaListStr(JSON.toJSONString(record.getFormulaList())); |
|
|
|
} |
|
|
|
wxEnergyHelper.testCalcute(record.getFormula()); |
|
|
|
wxEnergyFeesShopMapper.updateById(record); |
|
|
|
|