diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java b/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java
index 6de701c94..83dfa4812 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java
+++ b/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")
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() {
return tenantId;
}
@@ -243,6 +252,30 @@ public class WxShop implements Serializable {
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
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml
index 09c389ca2..62cd24b25 100644
--- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml
@@ -21,12 +21,16 @@
+
+
+
+
`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`
+ `update_date`,`img_url`,`manager`,`manager_phone`,`type`,`point_type`,`comments`
@@ -117,6 +121,15 @@
and `manager_phone` = #{managerPhone}
+
+
+ and `type` = #{type}
+
+
+
+ and `point_type` = #{pointType}
+
+
and id in
@@ -139,6 +152,7 @@
s.img_url imgUrl,s.operation_area operationArea,
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
+ 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
left join wx_merchant m on ms.merchant_id=m.id
left join wx_mall_building b on s.building=b.id
@@ -230,7 +244,13 @@
and s.`manager_phone` = #{managerPhone}
-
+
+ and s.`type` = #{type}
+
+
+
+ and s.`point_type` = #{pointType}
+
and s.id in