|
|
|
@@ -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},'%') |
|
|
|
|