Procházet zdrojové kódy

[商户][修改][字段调整]

release_toaliyun_real
gongbiao před 7 roky
rodič
revize
81e572932f
2 změnil soubory, kde provedl 18 přidání a 1 odebrání
  1. +12
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java
  2. +6
    -1
      mallinkService/src/main/resources/mapper/WxMerchantMapper.xml

+ 12
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java Zobrazit soubor

@@ -144,6 +144,10 @@ public class WxMerchant implements Serializable {
@io.swagger.annotations.ApiModelProperty(value="VIP折扣率3",name="vipDiscountRate3") @io.swagger.annotations.ApiModelProperty(value="VIP折扣率3",name="vipDiscountRate3")
private Integer vipDiscountRate3; private Integer vipDiscountRate3;


@io.swagger.annotations.ApiModelProperty(value = "类型", name = "type")
private Integer type;


public List<Map<String, Object>> getShoplist() { public List<Map<String, Object>> getShoplist() {
return shoplist; return shoplist;
} }
@@ -388,6 +392,14 @@ public class WxMerchant implements Serializable {
this.accountParameter = accountParameter; this.accountParameter = accountParameter;
} }


public Integer getType() {
return type;
}

public void setType(Integer type) {
this.type = type;
}

public static enum Field public static enum Field
{ {
Id_ASC("`id` ASC"),Id_DESC("`id` DESC") Id_ASC("`id` ASC"),Id_DESC("`id` DESC")


+ 6
- 1
mallinkService/src/main/resources/mapper/WxMerchantMapper.xml Zobrazit soubor

@@ -19,11 +19,13 @@
<result column="vip_discount_rate1" jdbcType="SMALLINT" property="vipDiscountRate1"/> <result column="vip_discount_rate1" jdbcType="SMALLINT" property="vipDiscountRate1"/>
<result column="vip_discount_rate2" jdbcType="SMALLINT" property="vipDiscountRate2"/> <result column="vip_discount_rate2" jdbcType="SMALLINT" property="vipDiscountRate2"/>
<result column="vip_discount_rate3" jdbcType="SMALLINT" property="vipDiscountRate3"/> <result column="vip_discount_rate3" jdbcType="SMALLINT" property="vipDiscountRate3"/>
<result column="type" jdbcType="SMALLINT" property="type"/>

</resultMap> </resultMap>


<sql id="allColumns"> <sql id="allColumns">
`id`,`tenant_id`,`img_url`,`name`,`link_phone`,`create_date`,`update_date`,`car_vendor_type`,`car_params`,`status`,`link_person`, `id`,`tenant_id`,`img_url`,`name`,`link_phone`,`create_date`,`update_date`,`car_vendor_type`,`car_params`,`status`,`link_person`,
`business_id`,`shop_type`,`brand`,`vip_discount_rate1`,`vip_discount_rate2`,`vip_discount_rate3`
`business_id`,`shop_type`,`brand`,`vip_discount_rate1`,`vip_discount_rate2`,`vip_discount_rate3`,`type`
</sql> </sql>


<sql id="dynamicWhereConditions"> <sql id="dynamicWhereConditions">
@@ -74,6 +76,9 @@
<if test=" null != linkPerson "> <if test=" null != linkPerson ">
and `link_person` = #{linkPerson} and `link_person` = #{linkPerson}
</if> </if>
<if test=" null != type ">
and `type` = #{type}
</if>
<if test=" null != ids "> <if test=" null != ids ">
and id in and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")"> <foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">


Načítá se…
Zrušit
Uložit