winter 1 год назад
Родитель
Сommit
fc56105b77
3 измененных файлов: 15 добавлений и 2 удалений
  1. +4
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFeesShop.java
  2. +9
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java
  3. +2
    -1
      mallinkService/src/main/resources/mapper/WxEnergyFeesShopMapper.xml

+ 4
- 1
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") @io.swagger.annotations.ApiModelProperty(value = "公摊计算公司", name = "formula")
private String formula; private String formula;
@io.swagger.annotations.ApiModelProperty(value = "公摊计算公式数组字符串", name = "formula")
private String formulaListStr;
@TableField(exist = false)
private List<String> formulaLis;
@io.swagger.annotations.ApiModelProperty(value = "公摊计算公司", name = "formulaContent") @io.swagger.annotations.ApiModelProperty(value = "公摊计算公司", name = "formulaContent")
private String formulaContent; private String formulaContent;
@TableField(exist = false) @TableField(exist = false)


+ 9
- 0
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 ) { if (null != record.getFormulaContentList() && record.getFormulaContentList().size() > 0 ) {
msf.setFormulaContent(JSON.toJSONString(record.getFormulaContentList())); msf.setFormulaContent(JSON.toJSONString(record.getFormulaContentList()));
} }
if (null != record.getFormulaLis() && record.getFormulaLis().size() > 0 ) {
msf.setFormulaListStr(JSON.toJSONString(record.getFormulaLis()));
}
msf.setFormula(record.getFormula()); msf.setFormula(record.getFormula());
wxEnergyHelper.testCalcute(record.getFormula()); wxEnergyHelper.testCalcute(record.getFormula());
wxEnergyFeesShopMapper.insert(msf); wxEnergyFeesShopMapper.insert(msf);
@@ -588,6 +591,9 @@ public class WxEnergyServiceImpl implements WxEnergyService {
if (StringUtils.isNotBlank(fs.getFormulaContent())) { if (StringUtils.isNotBlank(fs.getFormulaContent())) {
fs.setFormulaContentList(JSON.parseArray(fs.getFormulaContent(), String.class)); fs.setFormulaContentList(JSON.parseArray(fs.getFormulaContent(), String.class));
} }
if (StringUtils.isNotBlank(fs.getFormulaListStr())) {
fs.setFormulaLis(JSON.parseArray(fs.getFormulaListStr(), String.class));
}
return fs; return fs;
} }
@@ -598,6 +604,9 @@ public class WxEnergyServiceImpl implements WxEnergyService {
if (null != record.getFormulaContentList() && record.getFormulaContentList().size() > 0 ) { if (null != record.getFormulaContentList() && record.getFormulaContentList().size() > 0 ) {
record.setFormulaContent(JSON.toJSONString(record.getFormulaContentList())); record.setFormulaContent(JSON.toJSONString(record.getFormulaContentList()));
} }
if (null != record.getFormulaLis() && record.getFormulaLis().size() > 0 ) {
record.setFormulaListStr(JSON.toJSONString(record.getFormulaLis()));
}
wxEnergyHelper.testCalcute(record.getFormula()); wxEnergyHelper.testCalcute(record.getFormula());
wxEnergyFeesShopMapper.updateById(record); wxEnergyFeesShopMapper.updateById(record);
} }


+ 2
- 1
mallinkService/src/main/resources/mapper/WxEnergyFeesShopMapper.xml Просмотреть файл

@@ -10,13 +10,14 @@
<result column="price" jdbcType="VARCHAR" property="price"/> <result column="price" jdbcType="VARCHAR" property="price"/>
<result column="is_public" jdbcType="INTEGER" property="isPublic"/> <result column="is_public" jdbcType="INTEGER" property="isPublic"/>
<result column="formula" jdbcType="VARCHAR" property="formula"/> <result column="formula" jdbcType="VARCHAR" property="formula"/>
<result column="formula_list_str" jdbcType="VARCHAR" property="formulaListStr"/>
<result column="formula_content" jdbcType="VARCHAR" property="formulaContent"/> <result column="formula_content" jdbcType="VARCHAR" property="formulaContent"/>
<result column="shop_id" jdbcType="BIGINT" property="shopId"/> <result column="shop_id" jdbcType="BIGINT" property="shopId"/>
<result column="fees_id" jdbcType="BIGINT" property="feesId"/> <result column="fees_id" jdbcType="BIGINT" property="feesId"/>
</resultMap> </resultMap>


<sql id="allColumns"> <sql id="allColumns">
`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`
</sql> </sql>


<sql id="dynamicWhereConditions"> <sql id="dynamicWhereConditions">


Загрузка…
Отмена
Сохранить