Browse Source

[商铺商户][修改]:商铺编辑时返回数据修改,加img_url字段

release_toaliyun_real
gongbiao 7 years ago
parent
commit
9ae2841068
4 changed files with 34 additions and 6 deletions
  1. +11
    -0
      mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java
  2. +15
    -5
      mallinkService/src/main/java/com/simple/domain/po/WxShop.java
  3. +5
    -0
      mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java
  4. +3
    -1
      mallinkService/src/main/resources/mapper/WxShopMapper.xml

+ 11
- 0
mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java View File

@@ -46,6 +46,9 @@ public class WxMerchant implements Serializable {
@Transient
private List<WxShop> shops;

@Transient
private List<WxMerchantBUser> 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<WxMerchantBUser> getbUsers() {
return bUsers;
}

public void setbUsers(List<WxMerchantBUser> bUsers) {
this.bUsers = bUsers;
}

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


+ 15
- 5
mallinkService/src/main/java/com/simple/domain/po/WxShop.java View File

@@ -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
{


+ 5
- 0
mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java View File

@@ -56,6 +56,11 @@ public class WxMerchantServiceImpl implements WxMerchantService {
}

wxMerchant.setShops(shops);

WxMerchantBUser wxMerchantBUser = new WxMerchantBUser();
wxMerchantBUser.setMerchantId(wxMerchant.getId());
List<WxMerchantBUser> bUserList = wxMerchantBUserMapper.findList(wxMerchantBUser);
wxMerchant.setbUsers(bUserList);
return wxMerchant;
}



+ 3
- 1
mallinkService/src/main/resources/mapper/WxShopMapper.xml View File

@@ -18,10 +18,12 @@
<result column="latitude" jdbcType="DECIMAL" property="latitude" />
<result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
<result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
<result column="img_url" jdbcType="VARCHAR" property="imgUrl" />

</resultMap>
<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 id="dynamicWhereConditions">


Loading…
Cancel
Save