diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java index d30697e96..0aab3e78d 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java @@ -46,6 +46,9 @@ public class WxMerchant implements Serializable { @Transient private List shops; + @Transient + private List bUsers; + /*租户ID**/ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -182,6 +185,14 @@ public class WxMerchant implements Serializable { this.shops = shops; } + public List getbUsers() { + return bUsers; + } + + public void setbUsers(List bUsers) { + this.bUsers = bUsers; + } + public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxShop.java b/mallinkService/src/main/java/com/simple/domain/po/WxShop.java index daf2dd842..fc1588d4c 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxShop.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxShop.java @@ -1,12 +1,12 @@ package com.simple.domain.po; -import javax.persistence.*; -import java.util.*; -import java.math.*; -import javax.persistence.Transient; -import java.util.List; import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; @Table(name = "wx_shop") public class WxShop implements Serializable { @@ -86,6 +86,10 @@ public class WxShop implements Serializable { /*更新时间**/ @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; + + @io.swagger.annotations.ApiModelProperty(value="图片",name="imgUrl") + private String imgUrl; + public String getTenantId() { return tenantId; } @@ -177,7 +181,13 @@ public class WxShop implements Serializable { updateDate = _updateDate; } + public String getImgUrl() { + return imgUrl; + } + public void setImgUrl(String imgUrl) { + this.imgUrl = imgUrl; + } public static enum Field { diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java index 4f4b4bc9a..9151060c2 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java @@ -56,6 +56,11 @@ public class WxMerchantServiceImpl implements WxMerchantService { } wxMerchant.setShops(shops); + + WxMerchantBUser wxMerchantBUser = new WxMerchantBUser(); + wxMerchantBUser.setMerchantId(wxMerchant.getId()); + List bUserList = wxMerchantBUserMapper.findList(wxMerchantBUser); + wxMerchant.setbUsers(bUserList); return wxMerchant; } diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index 6675742eb..498e7c912 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -18,10 +18,12 @@ + + - `id`,`tenant_id`,`shop_number`,`build_area`,`operation_area`,`building`,`floor`,`status`,`x`,`y`,`addr`,`baidu_poi`,`longitude`,`latitude`,`create_date`,`update_date` + `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`