Przeglądaj źródła

[商户][添加][是否显示在C端]

release_toaliyun_real
gongbiao 7 lat temu
rodzic
commit
6d75e67717
3 zmienionych plików z 28 dodań i 4 usunięć
  1. +11
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java
  2. +10
    -2
      mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java
  3. +7
    -2
      mallinkService/src/main/resources/mapper/WxMerchantMapper.xml

+ 11
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java Wyświetl plik

@@ -140,6 +140,9 @@ public class WxMerchant implements Serializable {
@io.swagger.annotations.ApiModelProperty(value = "类型", name = "type")
private Integer type;

@io.swagger.annotations.ApiModelProperty(value = "是否显示在C端", name = "show")
private Integer show;

public List<WxLevelConfig> getLevelConfigList() {
return levelConfigList;
}
@@ -377,6 +380,14 @@ public class WxMerchant implements Serializable {
this.type = type;
}

public Integer getShow() {
return show;
}

public void setShow(Integer show) {
this.show = show;
}

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


+ 10
- 2
mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java Wyświetl plik

@@ -1,7 +1,5 @@
package com.iformall.domain.vo;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

import javax.persistence.Id;
public class WxMerchantVo {
private static final long serialVersionUID = 6687964942922444531L;
@@ -52,6 +50,16 @@ public class WxMerchantVo {
@io.swagger.annotations.ApiModelProperty(value="楼层",name="floorName")
private String floorName;

@io.swagger.annotations.ApiModelProperty(value = "是否显示在C端", name = "show")
private String show;

public String getShow() {
return show;
}

public void setShow(String show) {
this.show = show;
}

public String getBuildingName() {return buildingName; }
public void setBuildingName(String _building) {


+ 7
- 2
mallinkService/src/main/resources/mapper/WxMerchantMapper.xml Wyświetl plik

@@ -17,12 +17,13 @@
<result column="shop_type" jdbcType="INTEGER" property="shopType"/>
<result column="brand" jdbcType="VARCHAR" property="brand"/>
<result column="type" jdbcType="SMALLINT" property="type"/>
<result column="show" jdbcType="SMALLINT" property="show"/>

</resultMap>

<sql id="allColumns">
`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`,`type`
`business_id`,`shop_type`,`brand`,`type`,`show`
</sql>

<sql id="dynamicWhereConditions">
@@ -76,6 +77,9 @@
<if test=" null != type ">
and `type` = #{type}
</if>
<if test=" null != show ">
and `show` = #{show}
</if>
<if test=" null != ids ">
and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">
@@ -96,7 +100,7 @@
m.id,
m.img_url,m.name,m.link_phone,m.status,m.business_id,
s.addr,s.shop_number,s.baidu_poi,
mb.building_name,mf.floor_name
mb.building_name,mf.floor_name,m.show
</sql>

<resultMap id="MerchantVoResultMap" type="com.iformall.domain.vo.WxMerchantVo">
@@ -111,6 +115,7 @@
<result column="building_name" jdbcType="VARCHAR" property="buildingName"/>
<result column="floor_name" jdbcType="VARCHAR" property="floorName"/>
<result column="baidu_poi" jdbcType="VARCHAR" property="baiduPoi"/>
<result column="show" jdbcType="VARCHAR" property="show"/>

</resultMap>



Ładowanie…
Anuluj
Zapisz