Просмотр исходного кода

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

release_toaliyun_real
gongbiao 7 лет назад
Родитель
Сommit
21aaa23dae
2 измененных файлов: 55 добавлений и 2 удалений
  1. +33
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxShop.java
  2. +22
    -2
      mallinkService/src/main/resources/mapper/WxShopMapper.xml

+ 33
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxShop.java Просмотреть файл

@@ -104,6 +104,15 @@ public class WxShop implements Serializable {
@io.swagger.annotations.ApiModelProperty(value="管理人电话",name="managerPhone") @io.swagger.annotations.ApiModelProperty(value="管理人电话",name="managerPhone")
private String managerPhone; private String managerPhone;


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

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

@io.swagger.annotations.ApiModelProperty(value = "备注", name = "comments")
private String comments;

public String getTenantId() { public String getTenantId() {
return tenantId; return tenantId;
} }
@@ -243,6 +252,30 @@ public class WxShop implements Serializable {
this.managerPhone = managerPhone; this.managerPhone = managerPhone;
} }


public Integer getType() {
return type;
}

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

public Integer getPointType() {
return pointType;
}

public void setPointType(Integer pointType) {
this.pointType = pointType;
}

public String getComments() {
return comments;
}

public void setComments(String comments) {
this.comments = comments;
}

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


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

@@ -21,12 +21,16 @@
<result column="img_url" jdbcType="VARCHAR" property="imgUrl"/> <result column="img_url" jdbcType="VARCHAR" property="imgUrl"/>
<result column="manager" jdbcType="VARCHAR" property="manager"/> <result column="manager" jdbcType="VARCHAR" property="manager"/>
<result column="manager_phone" jdbcType="VARCHAR" property="managerPhone"/> <result column="manager_phone" jdbcType="VARCHAR" property="managerPhone"/>
<result column="type" jdbcType="INTEGER" property="type"/>
<result column="point_type" jdbcType="INTEGER" property="pointType"/>
<result column="comments" jdbcType="VARCHAR" property="comments"/>

</resultMap> </resultMap>


<sql id="allColumns"> <sql id="allColumns">
`id`,`tenant_id`,`shop_number`,`build_area`,`operation_area`,`building`, `id`,`tenant_id`,`shop_number`,`build_area`,`operation_area`,`building`,
`floor`,`status`,`x`,`y`,`addr`,`baidu_poi`,`longitude`,`latitude`,`create_date`, `floor`,`status`,`x`,`y`,`addr`,`baidu_poi`,`longitude`,`latitude`,`create_date`,
`update_date`,`img_url`,`manager`,`manager_phone`
`update_date`,`img_url`,`manager`,`manager_phone`,`type`,`point_type`,`comments`
</sql> </sql>


<sql id="dynamicWhereConditions"> <sql id="dynamicWhereConditions">
@@ -117,6 +121,15 @@
<if test=" null != managerPhone "> <if test=" null != managerPhone ">
and `manager_phone` = #{managerPhone} and `manager_phone` = #{managerPhone}
</if> </if>
<if test=" null != type ">
and `type` = #{type}
</if>
<if test=" null != pointType ">
and `point_type` = #{pointType}
</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=")">
@@ -139,6 +152,7 @@
s.img_url imgUrl,s.operation_area operationArea, s.img_url imgUrl,s.operation_area operationArea,
s.status,b.building_name building,f.floor_name floor,m.`name` merchantName,m.id merchantId, s.status,b.building_name building,f.floor_name floor,m.`name` merchantName,m.id merchantId,
m.link_person linkPerson,m.link_phone linkPhone,s.manager,s.manager_phone managerPhone m.link_person linkPerson,m.link_phone linkPhone,s.manager,s.manager_phone managerPhone
s.type,s.point_type pointType
from wx_shop s left join wx_merchant_shop ms on ms.shop_id=s.id and ms.is_del=0 from wx_shop s left join wx_merchant_shop ms on ms.shop_id=s.id and ms.is_del=0
left join wx_merchant m on ms.merchant_id=m.id left join wx_merchant m on ms.merchant_id=m.id
left join wx_mall_building b on s.building=b.id left join wx_mall_building b on s.building=b.id
@@ -230,7 +244,13 @@
<if test=" null != managerPhone "> <if test=" null != managerPhone ">
and s.`manager_phone` = #{managerPhone} and s.`manager_phone` = #{managerPhone}
</if> </if>
<if test=" null != type ">
and s.`type` = #{type}
</if>
<if test=" null != pointType ">
and s.`point_type` = #{pointType}
</if>
<if test=" null != ids "> <if test=" null != ids ">
and s.id in and s.id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")"> <foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">


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