diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFeesStandards.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFeesStandards.java index a1c3c8230..f5334fb9a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFeesStandards.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFeesStandards.java @@ -27,6 +27,8 @@ public class WxFeesStandards extends TenantEntity { private Date createTime; @io.swagger.annotations.ApiModelProperty(value = "名称", name = "createtime") private String name; + @io.swagger.annotations.ApiModelProperty(value = "单价", name = "price") + private String price; @io.swagger.annotations.ApiModelProperty(value = "类型EnumFeesStandardsType", name = "type") private Integer type; @io.swagger.annotations.ApiModelProperty(value = "是否一次性费用EnumYesOrNo", name = "fixedPrice") diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumFeesStandardsCalcuteUnit.java b/mallinkService/src/main/java/com/iformall/enums/EnumFeesStandardsCalcuteUnit.java index 1638b0ae6..4a567d54e 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumFeesStandardsCalcuteUnit.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumFeesStandardsCalcuteUnit.java @@ -8,7 +8,8 @@ package com.iformall.enums; public enum EnumFeesStandardsCalcuteUnit { MM(1, "平米(㎡)"), DIAN_DU(2, "度(KWh)"), - SHUI_DUN(3,"吨(立方米)(m³)"); + SHUI_DUN(3,"吨(立方米)(m³)"), + HU(4,"户"); public static EnumFeesStandardsCalcuteUnit getEnum(Integer code) { for (EnumFeesStandardsCalcuteUnit value : values()) { diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumFeesStandardsType.java b/mallinkService/src/main/java/com/iformall/enums/EnumFeesStandardsType.java index 1deb31503..a045859c9 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumFeesStandardsType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumFeesStandardsType.java @@ -40,6 +40,7 @@ public enum EnumFeesStandardsType { List retList = new ArrayList(); if (type.intValue() == PROPERTY_CONTRACT.getCode().intValue()) { retList.add(EnumFeesStandardsCalcuteUnit.MM); + retList.add(EnumFeesStandardsCalcuteUnit.HU); return retList; }else if (type.intValue() == DAILY_BILL.getCode().intValue()) { retList.add(EnumFeesStandardsCalcuteUnit.DIAN_DU); diff --git a/mallinkService/src/main/resources/mapper/WxFeesStandardsMapper.xml b/mallinkService/src/main/resources/mapper/WxFeesStandardsMapper.xml index 14dcf386e..a16c792a7 100644 --- a/mallinkService/src/main/resources/mapper/WxFeesStandardsMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxFeesStandardsMapper.xml @@ -9,6 +9,7 @@ + @@ -16,7 +17,7 @@ - `id`,`tenant_id`,`parent_tenant_id`,`is_del`,`name`,`update_time`,`create_time`,`type`,`fixed_price`,`calcute_unit`,`time_unit` + `id`,`tenant_id`,`parent_tenant_id`,`is_del`,`name`,`update_time`,`create_time`,`price`,`type`,`fixed_price`,`calcute_unit`,`time_unit`