|
|
@@ -24,13 +24,13 @@ |
|
|
<result column="cover_picture" jdbcType="VARCHAR" property="coverPicture"/> |
|
|
<result column="cover_picture" jdbcType="VARCHAR" property="coverPicture"/> |
|
|
<result column="is_admin" jdbcType="INTEGER" property="isAdmin"/> |
|
|
<result column="is_admin" jdbcType="INTEGER" property="isAdmin"/> |
|
|
<result column="bill_setting" jdbcType="INTEGER" property="billSetting"/> |
|
|
<result column="bill_setting" jdbcType="INTEGER" property="billSetting"/> |
|
|
<result column="qr_code" property="qrCode"/> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<result column="qr_code" jdbcType="VARCHAR" property="qrCode"/> |
|
|
|
|
|
<result column="introduction" jdbcType="VARCHAR" property="introduction"/> |
|
|
</resultMap> |
|
|
</resultMap> |
|
|
|
|
|
|
|
|
<sql id="allColumns"> |
|
|
<sql id="allColumns"> |
|
|
`id`,`tenant_id`,`img_url`,`name`,`link_phone`,`create_date`,`update_date`,`car_vendor_type`,`car_params`,`status`,`link_person`, |
|
|
`id`,`tenant_id`,`img_url`,`name`,`link_phone`,`create_date`,`update_date`,`car_vendor_type`,`car_params`,`status`,`link_person`, |
|
|
`business_id`,`sub_business_id`,`shop_type`,`brand`,`type`,`is_public`,email,`title`,`cover_picture`,`is_admin`,`bill_setting`,qr_code |
|
|
|
|
|
|
|
|
`business_id`,`sub_business_id`,`shop_type`,`brand`,`type`,`is_public`,email,`title`,`cover_picture`,`is_admin`,`bill_setting`,`qr_code`,`introduction` |
|
|
</sql> |
|
|
</sql> |
|
|
|
|
|
|
|
|
<sql id="dynamicWhereConditions"> |
|
|
<sql id="dynamicWhereConditions"> |
|
|
@@ -120,16 +120,15 @@ |
|
|
</select> |
|
|
</select> |
|
|
|
|
|
|
|
|
<sql id="allMerchantVoColumns"> |
|
|
<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,b.name as brand_name,b.logo as brand_img, |
|
|
|
|
|
m.shop_type,bu.title as business_name,b.summary |
|
|
|
|
|
|
|
|
m.id,m.img_url,m.name,m.link_phone,m.status,m.business_id, |
|
|
|
|
|
m.is_public,m.email,m.title,m.cover_picture,m.sub_business_id, |
|
|
|
|
|
m.shop_type,m.introduction,bu.title as business_name |
|
|
</sql> |
|
|
</sql> |
|
|
|
|
|
|
|
|
<select id="getMerchantByCode" parameterType="java.util.Map" resultMap="MerchantVoResultMap"> |
|
|
<select id="getMerchantByCode" parameterType="java.util.Map" resultMap="MerchantVoResultMap"> |
|
|
select |
|
|
select |
|
|
<include refid="allMerchantVoColumns"/> |
|
|
<include refid="allMerchantVoColumns"/> |
|
|
FROM wx_merchant m |
|
|
FROM wx_merchant m |
|
|
left join wx_brand b on b.id = m.brand |
|
|
|
|
|
left join wx_business bu on bu.id = m.business_id |
|
|
left join wx_business bu on bu.id = m.business_id |
|
|
<where> |
|
|
<where> |
|
|
<if test=" null != tenantId "> |
|
|
<if test=" null != tenantId "> |
|
|
@@ -176,7 +175,6 @@ |
|
|
select |
|
|
select |
|
|
<include refid="allMerchantVoColumns"/> |
|
|
<include refid="allMerchantVoColumns"/> |
|
|
FROM wx_merchant m |
|
|
FROM wx_merchant m |
|
|
left join wx_brand b on b.id = m.brand |
|
|
|
|
|
left join wx_business bu on bu.id = m.business_id |
|
|
left join wx_business bu on bu.id = m.business_id |
|
|
where 1=1 |
|
|
where 1=1 |
|
|
<if test=" null != merchantName and ''!=merchantName "> |
|
|
<if test=" null != merchantName and ''!=merchantName "> |
|
|
|