Просмотр исходного кода

[C端商户][修改][显示品牌等信息]

release_toaliyun_real
gongbiao 7 лет назад
Родитель
Сommit
d4492f8801
2 измененных файлов: 27 добавлений и 1 удалений
  1. +22
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java
  2. +5
    -1
      mallinkService/src/main/resources/mapper/WxMerchantMapper.xml

+ 22
- 0
mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java Просмотреть файл

@@ -63,6 +63,28 @@ public class WxMerchantVo {
@io.swagger.annotations.ApiModelProperty(value = "店铺列表", name = "shopVoList")
private List<WxShopVo> shopVoList;

@io.swagger.annotations.ApiModelProperty(value = "品牌名称", name = "brandName")
private String brandName;

@io.swagger.annotations.ApiModelProperty(value = "品牌图", name = "brandImg")
private String brandImg;

public String getBrandName() {
return brandName;
}

public void setBrandName(String brandName) {
this.brandName = brandName;
}

public String getBrandImg() {
return brandImg;
}

public void setBrandImg(String brandImg) {
this.brandImg = brandImg;
}

public List<WxShopVo> getShopVoList() {
return shopVoList;
}


+ 5
- 1
mallinkService/src/main/resources/mapper/WxMerchantMapper.xml Просмотреть файл

@@ -116,7 +116,7 @@
<sql id="allMerchantVoColumns">
m.id,
m.img_url,m.name,m.link_phone,m.status,m.business_id,m.sub_business_id,
m.is_public,m.email,m.title,m.cover_picture
m.is_public,m.email,m.title,m.cover_picture,b.name as brand_name,b.logo as brand_img
</sql>
<select id="getMerchantByCode" parameterType="java.util.Map" resultMap="MerchantVoResultMap">
@@ -124,6 +124,7 @@
<include refid="allMerchantVoColumns"/>
FROM wx_merchant m
left join wx_merchant_shop ms on ms.merchant_id = m.id
left join wx_brand b on b.id = m.brand
where ms.is_del = 0
<where>
<if test=" null != tenantId ">
@@ -151,6 +152,8 @@
<result column="title" jdbcType="VARCHAR" property="title"/>
<result column="cover_picture" jdbcType="VARCHAR" property="coverPicture"/>
<result column="brand_name" jdbcType="VARCHAR" property="brandName"/>
<result column="brand_img" jdbcType="VARCHAR" property="brandImg"/>
<collection column="{merchantId=id}" property="shopVoList"
ofType="com.iformall.domain.vo.WxShopVo"
@@ -165,6 +168,7 @@
<include refid="allMerchantVoColumns"/>
FROM wx_merchant m
left join wx_merchant_shop ms on ms.merchant_id = m.id
left join wx_brand b on b.id = m.brand
where ms.is_del = 0
<if test=" null != merchantName and ''!=merchantName ">
and m.`name` like concat('%', #{merchantName},'%')


Загрузка…
Отмена
Сохранить