| @@ -46,6 +46,9 @@ public class WxMerchant implements Serializable { | |||||
| @Transient | @Transient | ||||
| private List<WxShop> shops; | private List<WxShop> shops; | ||||
| @Transient | |||||
| private List<WxMerchantBUser> bUsers; | |||||
| /*租户ID**/ | /*租户ID**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| @@ -182,6 +185,14 @@ public class WxMerchant implements Serializable { | |||||
| this.shops = shops; | this.shops = shops; | ||||
| } | } | ||||
| public List<WxMerchantBUser> getbUsers() { | |||||
| return bUsers; | |||||
| } | |||||
| public void setbUsers(List<WxMerchantBUser> bUsers) { | |||||
| this.bUsers = bUsers; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | ||||
| @@ -1,12 +1,12 @@ | |||||
| package com.simple.domain.po; | 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.Id; | ||||
| import javax.persistence.Table; | |||||
| import javax.persistence.Transient; | |||||
| import java.io.Serializable; | import java.io.Serializable; | ||||
| import java.math.BigDecimal; | |||||
| import java.util.Date; | |||||
| import java.util.List; | |||||
| @Table(name = "wx_shop") | @Table(name = "wx_shop") | ||||
| public class WxShop implements Serializable { | public class WxShop implements Serializable { | ||||
| @@ -86,6 +86,10 @@ public class WxShop implements Serializable { | |||||
| /*更新时间**/ | /*更新时间**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | ||||
| private Date updateDate; | private Date updateDate; | ||||
| @io.swagger.annotations.ApiModelProperty(value="图片",name="imgUrl") | |||||
| private String imgUrl; | |||||
| public String getTenantId() { | public String getTenantId() { | ||||
| return tenantId; | return tenantId; | ||||
| } | } | ||||
| @@ -177,7 +181,13 @@ public class WxShop implements Serializable { | |||||
| updateDate = _updateDate; | updateDate = _updateDate; | ||||
| } | } | ||||
| public String getImgUrl() { | |||||
| return imgUrl; | |||||
| } | |||||
| public void setImgUrl(String imgUrl) { | |||||
| this.imgUrl = imgUrl; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| @@ -56,6 +56,11 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| } | } | ||||
| wxMerchant.setShops(shops); | wxMerchant.setShops(shops); | ||||
| WxMerchantBUser wxMerchantBUser = new WxMerchantBUser(); | |||||
| wxMerchantBUser.setMerchantId(wxMerchant.getId()); | |||||
| List<WxMerchantBUser> bUserList = wxMerchantBUserMapper.findList(wxMerchantBUser); | |||||
| wxMerchant.setbUsers(bUserList); | |||||
| return wxMerchant; | return wxMerchant; | ||||
| } | } | ||||
| @@ -18,10 +18,12 @@ | |||||
| <result column="latitude" jdbcType="DECIMAL" property="latitude" /> | <result column="latitude" jdbcType="DECIMAL" property="latitude" /> | ||||
| <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" /> | |||||
| </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` | |||||
| `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` | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||