Pārlūkot izejas kodu

[商铺][添加][负责人与电话字段]

release_toaliyun_real
gongbiao pirms 7 gadiem
vecāks
revīzija
55ecb7b723
2 mainītis faili ar 43 papildinājumiem un 4 dzēšanām
  1. +22
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxShop.java
  2. +21
    -4
      mallinkService/src/main/resources/mapper/WxShopMapper.xml

+ 22
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxShop.java Parādīt failu

@@ -98,6 +98,12 @@ public class WxShop implements Serializable {
@io.swagger.annotations.ApiModelProperty(value="图片",name="imgUrl") @io.swagger.annotations.ApiModelProperty(value="图片",name="imgUrl")
private String imgUrl; private String imgUrl;


@io.swagger.annotations.ApiModelProperty(value="管理人",name="manager")
private String manager;

@io.swagger.annotations.ApiModelProperty(value="管理人电话",name="managerPhone")
private String managerPhone;

public String getTenantId() { public String getTenantId() {
return tenantId; return tenantId;
} }
@@ -221,6 +227,22 @@ public class WxShop implements Serializable {
this.linkPhone = linkPhone; this.linkPhone = linkPhone;
} }


public String getManager() {
return manager;
}

public void setManager(String manager) {
this.manager = manager;
}

public String getManagerPhone() {
return managerPhone;
}

public void setManagerPhone(String managerPhone) {
this.managerPhone = managerPhone;
}

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


+ 21
- 4
mallinkService/src/main/resources/mapper/WxShopMapper.xml Parādīt failu

@@ -19,10 +19,14 @@
<result column="create_date" jdbcType="TIMESTAMP" property="createDate"/> <result column="create_date" jdbcType="TIMESTAMP" property="createDate"/>
<result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/> <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/>
<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_phone" jdbcType="VARCHAR" property="managerPhone"/>
</resultMap> </resultMap>


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


<sql id="dynamicWhereConditions"> <sql id="dynamicWhereConditions">
@@ -107,6 +111,12 @@
and `update_date` = #{updateDate} and `update_date` = #{updateDate}


</if> </if>
<if test=" null != manager ">
and `manager` = #{manager}
</if>
<if test=" null != managerPhone ">
and `manager_phone` = #{managerPhone}
</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=")">
@@ -128,7 +138,7 @@
select s.id,s.shop_number shopNumber,s.build_area buildArea, select s.id,s.shop_number shopNumber,s.build_area buildArea,
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
m.link_person linkPerson,m.link_phone linkPhone,s.manager,s.manager_phone managerPhone
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
@@ -212,8 +222,15 @@


<if test=" null != updateDate "> <if test=" null != updateDate ">
and s.`update_date` = #{updateDate} and s.`update_date` = #{updateDate}

</if> </if>
<if test=" null != manager ">
and s.`manager` = #{manager}
</if>
<if test=" null != managerPhone ">
and s.`manager_phone` = #{managerPhone}
</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=")">
@@ -250,7 +267,7 @@
select s.id,s.shop_number shopNumber,s.build_area buildArea, select s.id,s.shop_number shopNumber,s.build_area buildArea,
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
m.link_person linkPerson,m.link_phone linkPhone,s.manager,s.manager_phone managerPhone
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


Notiek ielāde…
Atcelt
Saglabāt