From fc56105b7702e45bb736751f891f646ffb1efcda Mon Sep 17 00:00:00 2001 From: winter Date: Wed, 28 Aug 2024 11:33:49 +0800 Subject: [PATCH] fix --- .../java/com/iformall/domain/po/WxEnergyFeesShop.java | 5 ++++- .../com/iformall/service/impl/WxEnergyServiceImpl.java | 9 +++++++++ .../src/main/resources/mapper/WxEnergyFeesShopMapper.xml | 3 ++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFeesShop.java b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFeesShop.java index 8b9590d1f..1346f1e43 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFeesShop.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFeesShop.java @@ -46,7 +46,10 @@ public class WxEnergyFeesShop extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "公摊计算公司", name = "formula") private String formula; - + @io.swagger.annotations.ApiModelProperty(value = "公摊计算公式数组字符串", name = "formula") + private String formulaListStr; + @TableField(exist = false) + private List formulaLis; @io.swagger.annotations.ApiModelProperty(value = "公摊计算公司", name = "formulaContent") private String formulaContent; @TableField(exist = false) 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 e4d5d3de1..802ee33e3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java @@ -571,6 +571,9 @@ 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())); + } msf.setFormula(record.getFormula()); wxEnergyHelper.testCalcute(record.getFormula()); wxEnergyFeesShopMapper.insert(msf); @@ -588,6 +591,9 @@ public class WxEnergyServiceImpl implements WxEnergyService { if (StringUtils.isNotBlank(fs.getFormulaContent())) { fs.setFormulaContentList(JSON.parseArray(fs.getFormulaContent(), String.class)); } + if (StringUtils.isNotBlank(fs.getFormulaListStr())) { + fs.setFormulaLis(JSON.parseArray(fs.getFormulaListStr(), String.class)); + } return fs; } @@ -598,6 +604,9 @@ 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())); + } wxEnergyHelper.testCalcute(record.getFormula()); wxEnergyFeesShopMapper.updateById(record); } diff --git a/mallinkService/src/main/resources/mapper/WxEnergyFeesShopMapper.xml b/mallinkService/src/main/resources/mapper/WxEnergyFeesShopMapper.xml index e4b097e81..c30a2cabb 100644 --- a/mallinkService/src/main/resources/mapper/WxEnergyFeesShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxEnergyFeesShopMapper.xml @@ -10,13 +10,14 @@ + - `id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`price`,`is_public`,`formula`,`formula_content`,`shop_id`,`fees_id` + `id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`price`,`is_public`,`formula`,`formula_list_str`,`formula_content`,`shop_id`,`fees_id`