| @@ -0,0 +1,6 @@ | |||||
| ALTER TABLE `wx_coupon` | |||||
| ADD COLUMN `sub_business` INT(11) NULL DEFAULT NULL AFTER `business`; | |||||
| ALTER TABLE `wx_coupon_channel` | |||||
| ADD COLUMN `sub_business` INT(11) NULL DEFAULT NULL AFTER `business`; | |||||
| ALTER TABLE `wx_merchant` | |||||
| ADD COLUMN `sub_business_id` INT(11) NULL DEFAULT NULL AFTER `business_id`; | |||||
| @@ -136,6 +136,9 @@ public class WxCoupon implements Serializable { | |||||
| /**业态**/ | /**业态**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="业态",name="business") | @io.swagger.annotations.ApiModelProperty(value="业态",name="business") | ||||
| private Integer business; | private Integer business; | ||||
| /**子业态**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="子业态",name="subBusiness") | |||||
| private Integer subBusiness; | |||||
| /**是否支持转送(0:不支持,1支持)**/ | /**是否支持转送(0:不支持,1支持)**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="是否支持转送(0:不支持,1支持)",name="supportTransfer") | @io.swagger.annotations.ApiModelProperty(value="是否支持转送(0:不支持,1支持)",name="supportTransfer") | ||||
| private Integer supportTransfer; | private Integer supportTransfer; | ||||
| @@ -327,6 +330,12 @@ public class WxCoupon implements Serializable { | |||||
| public void setBusiness(Integer _business) { | public void setBusiness(Integer _business) { | ||||
| business = _business; | business = _business; | ||||
| } | } | ||||
| public Integer getSubBusiness() { | |||||
| return subBusiness; | |||||
| } | |||||
| public void setSubBusiness(Integer _subBusiness) { | |||||
| subBusiness = _subBusiness; | |||||
| } | |||||
| public Integer getSupportTransfer() { | public Integer getSupportTransfer() { | ||||
| return supportTransfer; | return supportTransfer; | ||||
| @@ -78,6 +78,9 @@ public class WxCouponChannel implements Serializable { | |||||
| /***/ | /***/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="",name="business") | @io.swagger.annotations.ApiModelProperty(value="",name="business") | ||||
| private Integer business; | private Integer business; | ||||
| /**子业态**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="子业态",name="subBusiness") | |||||
| private Integer subBusiness; | |||||
| /*开始时间**/ | /*开始时间**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="开始时间",name="beginTime") | @io.swagger.annotations.ApiModelProperty(value="开始时间",name="beginTime") | ||||
| private Date beginTime; | private Date beginTime; | ||||
| @@ -134,6 +137,15 @@ public class WxCouponChannel implements Serializable { | |||||
| public void setBusiness(Integer _business) { | public void setBusiness(Integer _business) { | ||||
| business = _business; | business = _business; | ||||
| } | } | ||||
| public Integer getSubBusiness() { | |||||
| return subBusiness; | |||||
| } | |||||
| public void setSubBusiness(Integer subBusiness) { | |||||
| this.subBusiness = subBusiness; | |||||
| } | |||||
| public Date getBeginTime() { | public Date getBeginTime() { | ||||
| return beginTime; | return beginTime; | ||||
| } | } | ||||
| @@ -134,6 +134,9 @@ public class WxMerchant implements Serializable { | |||||
| @io.swagger.annotations.ApiModelProperty(value="经营业态ID:参照wx_business表",name="businessId") | @io.swagger.annotations.ApiModelProperty(value="经营业态ID:参照wx_business表",name="businessId") | ||||
| private Integer businessId; | private Integer businessId; | ||||
| @io.swagger.annotations.ApiModelProperty(value="子业态",name="subBusinessId") | |||||
| private Integer subBusinessId; | |||||
| @io.swagger.annotations.ApiModelProperty(value="店铺类型:1直营店2加盟店3个体店4旗舰店",name="shopType") | @io.swagger.annotations.ApiModelProperty(value="店铺类型:1直营店2加盟店3个体店4旗舰店",name="shopType") | ||||
| private Integer shopType; | private Integer shopType; | ||||
| @@ -345,6 +348,14 @@ public class WxMerchant implements Serializable { | |||||
| this.businessId = businessId; | this.businessId = businessId; | ||||
| } | } | ||||
| public Integer getSubBusinessId() { | |||||
| return subBusinessId; | |||||
| } | |||||
| public void setSubBusinessId(Integer subBusinessId) { | |||||
| this.subBusinessId = subBusinessId; | |||||
| } | |||||
| public Integer getShopType() { | public Integer getShopType() { | ||||
| return shopType; | return shopType; | ||||
| } | } | ||||
| @@ -30,6 +30,9 @@ public class WxMerchantVo { | |||||
| /**商户业态**/ | /**商户业态**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="商户业态",name="businessId") | @io.swagger.annotations.ApiModelProperty(value="商户业态",name="businessId") | ||||
| private Integer businessId; | private Integer businessId; | ||||
| /**商户子业态**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="商户子业态",name="subBusinessId") | |||||
| private Integer subBusinessId; | |||||
| /**商户业态**/ | /**商户业态**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="商户业态",name="parameter") | @io.swagger.annotations.ApiModelProperty(value="商户业态",name="parameter") | ||||
| private String parameter; | private String parameter; | ||||
| @@ -98,6 +101,14 @@ public class WxMerchantVo { | |||||
| this.businessId = businessId; | this.businessId = businessId; | ||||
| } | } | ||||
| public Integer getSubBusinessId() { | |||||
| return subBusinessId; | |||||
| } | |||||
| public void setSubBusinessId(Integer subBusinessId) { | |||||
| this.subBusinessId = subBusinessId; | |||||
| } | |||||
| public String getMerchantImgUrl() { | public String getMerchantImgUrl() { | ||||
| return merchantImgUrl; | return merchantImgUrl; | ||||
| } | } | ||||
| @@ -9,6 +9,7 @@ | |||||
| <result column="title" jdbcType="VARCHAR" property="title" /> | <result column="title" jdbcType="VARCHAR" property="title" /> | ||||
| <result column="target_ad" jdbcType="INTEGER" property="targetAd" /> | <result column="target_ad" jdbcType="INTEGER" property="targetAd" /> | ||||
| <result column="business" jdbcType="INTEGER" property="business" /> | <result column="business" jdbcType="INTEGER" property="business" /> | ||||
| <result column="sub_business" jdbcType="INTEGER" property="subBusiness" /> | |||||
| <result column="begin_time" jdbcType="TIMESTAMP" property="beginTime" /> | <result column="begin_time" jdbcType="TIMESTAMP" property="beginTime" /> | ||||
| <result column="end_time" jdbcType="TIMESTAMP" property="endTime" /> | <result column="end_time" jdbcType="TIMESTAMP" property="endTime" /> | ||||
| <result column="status" jdbcType="INTEGER" property="status" /> | <result column="status" jdbcType="INTEGER" property="status" /> | ||||
| @@ -18,7 +19,7 @@ | |||||
| </resultMap> | </resultMap> | ||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| cc.`id`,cc.`tenant_id`,cc.`coupon_id`,cc.`coupon_status`,cc.`type`,cc.`title`,cc.`target_ad`,cc.`business`,cc.`begin_time`,cc.`end_time`,cc.`status`,cc.`create_date`,cc.`update_date`,cc.`sub_target_id` | |||||
| cc.`id`,cc.`tenant_id`,cc.`coupon_id`,cc.`coupon_status`,cc.`type`,cc.`title`,cc.`target_ad`,cc.`business`,cc.`sub_business`,cc.`begin_time`,cc.`end_time`,cc.`status`,cc.`create_date`,cc.`update_date`,cc.`sub_target_id` | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||
| @@ -52,6 +53,10 @@ | |||||
| and cc.`business` = #{business} | and cc.`business` = #{business} | ||||
| </if> | </if> | ||||
| <if test=" null != subBusiness "> | |||||
| and cc.`sub_business` = #{subBusiness} | |||||
| </if> | |||||
| <if test=" null != startdate and null!=enddate"> | <if test=" null != startdate and null!=enddate"> | ||||
| and cc.`create_date` between #{startdate} and #{enddate} | and cc.`create_date` between #{startdate} and #{enddate} | ||||
| </if> | </if> | ||||
| @@ -120,6 +125,7 @@ | |||||
| <result column="title" jdbcType="VARCHAR" property="title" /> | <result column="title" jdbcType="VARCHAR" property="title" /> | ||||
| <result column="target_ad" jdbcType="INTEGER" property="targetAd" /> | <result column="target_ad" jdbcType="INTEGER" property="targetAd" /> | ||||
| <result column="business" jdbcType="VARCHAR" property="business" /> | <result column="business" jdbcType="VARCHAR" property="business" /> | ||||
| <result column="sub_business" jdbcType="VARCHAR" property="subBusiness" /> | |||||
| <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="sub_target_id" jdbcType="BIGINT" property="subTargetId" /> | <result column="sub_target_id" jdbcType="BIGINT" property="subTargetId" /> | ||||
| @@ -162,7 +168,7 @@ | |||||
| c.tenant_id,c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price, | c.tenant_id,c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price, | ||||
| c.use_limit_quantity,c.send_type,c.valid_type,c.valid_start_date,c.valid_end_date, | c.use_limit_quantity,c.send_type,c.valid_type,c.valid_start_date,c.valid_end_date, | ||||
| c.valid_days,c.detail,c.price,c.unit,c.remain_inventory,c.inventory,c.remark,c.status, | c.valid_days,c.detail,c.price,c.unit,c.remain_inventory,c.inventory,c.remark,c.status, | ||||
| c.create_date,c.update_date,c.business,c.support_transfer,c.press_limit_num, c.auto_refund | |||||
| c.create_date,c.update_date,c.business,c.subBusiness,c.support_transfer,c.press_limit_num, c.auto_refund | |||||
| </sql> | </sql> | ||||
| <resultMap id="WxCouponCVoMap" type="com.iformall.domain.vo.WxCouponCVo"> | <resultMap id="WxCouponCVoMap" type="com.iformall.domain.vo.WxCouponCVo"> | ||||
| @@ -195,6 +201,7 @@ | |||||
| <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="business" jdbcType="INTEGER" property="business"/> | <result column="business" jdbcType="INTEGER" property="business"/> | ||||
| <result column="subBusiness" jdbcType="INTEGER" property="subBusiness"/> | |||||
| <result column="support_transfer" jdbcType="INTEGER" property="supportTransfer"/> | <result column="support_transfer" jdbcType="INTEGER" property="supportTransfer"/> | ||||
| <result column="press_limit_num" jdbcType="INTEGER" property="pressLimitNum"/> | <result column="press_limit_num" jdbcType="INTEGER" property="pressLimitNum"/> | ||||
| <result column="auto_refund" jdbcType="INTEGER" property="autoRefund"/> | <result column="auto_refund" jdbcType="INTEGER" property="autoRefund"/> | ||||
| @@ -26,6 +26,7 @@ | |||||
| <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="business" jdbcType="INTEGER" property="business"/> | <result column="business" jdbcType="INTEGER" property="business"/> | ||||
| <result column="sub_business" jdbcType="INTEGER" property="subBusiness"/> | |||||
| <result column="support_transfer" jdbcType="INTEGER" property="supportTransfer"/> | <result column="support_transfer" jdbcType="INTEGER" property="supportTransfer"/> | ||||
| <result column="subsidy_type" jdbcType="INTEGER" property="subsidyType"/> | <result column="subsidy_type" jdbcType="INTEGER" property="subsidyType"/> | ||||
| <result column="subsidy_num" jdbcType="INTEGER" property="subsidyNum"/> | <result column="subsidy_num" jdbcType="INTEGER" property="subsidyNum"/> | ||||
| @@ -61,6 +62,7 @@ | |||||
| <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="business" jdbcType="INTEGER" property="business"/> | <result column="business" jdbcType="INTEGER" property="business"/> | ||||
| <result column="sub_business" jdbcType="INTEGER" property="subBusiness"/> | |||||
| <result column="support_transfer" jdbcType="INTEGER" property="supportTransfer"/> | <result column="support_transfer" jdbcType="INTEGER" property="supportTransfer"/> | ||||
| <result column="subsidy_type" jdbcType="INTEGER" property="subsidyType"/> | <result column="subsidy_type" jdbcType="INTEGER" property="subsidyType"/> | ||||
| <result column="subsidy_num" jdbcType="INTEGER" property="subsidyNum"/> | <result column="subsidy_num" jdbcType="INTEGER" property="subsidyNum"/> | ||||
| @@ -82,7 +84,7 @@ | |||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `id`,`tenant_id`,`type`,`cover_img`,`title`,`sub_title`,`sale_price`,`use_price`,`use_limit_quantity`,`send_type`, | `id`,`tenant_id`,`type`,`cover_img`,`title`,`sub_title`,`sale_price`,`use_price`,`use_limit_quantity`,`send_type`, | ||||
| `valid_type`,`valid_start_date`,`valid_end_date`,`valid_days`,`detail`,`price`,`unit`,`remain_inventory`,`inventory`, | `valid_type`,`valid_start_date`,`valid_end_date`,`valid_days`,`detail`,`price`,`unit`,`remain_inventory`,`inventory`, | ||||
| `remark`,`status`,`create_date`,`update_date`,`business`,`support_transfer`,`subsidy_num`,`subsidy_type`, | |||||
| `remark`,`status`,`create_date`,`update_date`,`business`,`sub_business`,`support_transfer`,`subsidy_num`,`subsidy_type`, | |||||
| `press_limit_num`, `press_limit_hours`, `auto_refund`,`credit_price`,`credit_refund` | `press_limit_num`, `press_limit_hours`, `auto_refund`,`credit_price`,`credit_refund` | ||||
| </sql> | </sql> | ||||
| @@ -185,6 +187,10 @@ | |||||
| and `business` = #{business} | and `business` = #{business} | ||||
| </if> | </if> | ||||
| <if test=" null != subBusiness "> | |||||
| and `sub_business` = #{subBusiness} | |||||
| </if> | |||||
| <if test=" null != supportTransfer "> | <if test=" null != supportTransfer "> | ||||
| and `support_transfer` = #{supportTransfer} | and `support_transfer` = #{supportTransfer} | ||||
| </if> | </if> | ||||
| @@ -352,6 +358,10 @@ | |||||
| and c.`business` = #{business} | and c.`business` = #{business} | ||||
| </if> | </if> | ||||
| <if test=" null != subBusiness "> | |||||
| and `sub_business` = #{subBusiness} | |||||
| </if> | |||||
| <if test=" null != supportTransfer "> | <if test=" null != supportTransfer "> | ||||
| and c.`support_transfer` = #{supportTransfer} | and c.`support_transfer` = #{supportTransfer} | ||||
| </if> | </if> | ||||
| @@ -419,6 +429,7 @@ | |||||
| <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="business" jdbcType="INTEGER" property="business"/> | <result column="business" jdbcType="INTEGER" property="business"/> | ||||
| <result column="sub_business" jdbcType="INTEGER" property="subBusiness"/> | |||||
| <result column="support_transfer" jdbcType="INTEGER" property="supportTransfer"/> | <result column="support_transfer" jdbcType="INTEGER" property="supportTransfer"/> | ||||
| <result column="subsidy_type" jdbcType="INTEGER" property="subsidyType"/> | <result column="subsidy_type" jdbcType="INTEGER" property="subsidyType"/> | ||||
| <result column="subsidy_num" jdbcType="INTEGER" property="subsidyNum"/> | <result column="subsidy_num" jdbcType="INTEGER" property="subsidyNum"/> | ||||
| @@ -64,7 +64,7 @@ | |||||
| <sql id="allMerchantVoColumns"> | <sql id="allMerchantVoColumns"> | ||||
| m.id, | m.id, | ||||
| m.img_url,m.name,m.link_phone,m.status,m.business_id, | |||||
| m.img_url,m.name,m.link_phone,m.status,m.business_id,m.sub_business_id, | |||||
| s.addr,s.shop_number,s.baidu_poi, | s.addr,s.shop_number,s.baidu_poi, | ||||
| mb.building_name,mf.floor_name, | mb.building_name,mf.floor_name, | ||||
| cm.parameter | cm.parameter | ||||
| @@ -77,6 +77,7 @@ | |||||
| <result column="link_phone" jdbcType="VARCHAR" property="merchantLinkPhone"/> | <result column="link_phone" jdbcType="VARCHAR" property="merchantLinkPhone"/> | ||||
| <result column="status" jdbcType="VARCHAR" property="merchantStatus"/> | <result column="status" jdbcType="VARCHAR" property="merchantStatus"/> | ||||
| <result column="business_id" jdbcType="INTEGER" property="businessId"/> | <result column="business_id" jdbcType="INTEGER" property="businessId"/> | ||||
| <result column="sub_business_id" jdbcType="INTEGER" property="subBusinessId"/> | |||||
| <result column="parameter" jdbcType="VARCHAR" property="parameter"/> | <result column="parameter" jdbcType="VARCHAR" property="parameter"/> | ||||
| <result column="addr" jdbcType="VARCHAR" property="addr"/> | <result column="addr" jdbcType="VARCHAR" property="addr"/> | ||||
| @@ -105,7 +106,7 @@ | |||||
| <sql id="allMerchantBaseColumns"> | <sql id="allMerchantBaseColumns"> | ||||
| m.id, | m.id, | ||||
| m.img_url,m.name,m.link_phone,m.status,m.business_id, | |||||
| m.img_url,m.name,m.link_phone,m.status,m.business_id,m.sub_business_id, | |||||
| cm.parameter | cm.parameter | ||||
| </sql> | </sql> | ||||
| @@ -14,6 +14,7 @@ | |||||
| <result column="status" jdbcType="INTEGER" property="status"/> | <result column="status" jdbcType="INTEGER" property="status"/> | ||||
| <result column="link_person" jdbcType="VARCHAR" property="linkPerson"/> | <result column="link_person" jdbcType="VARCHAR" property="linkPerson"/> | ||||
| <result column="business_id" jdbcType="INTEGER" property="businessId"/> | <result column="business_id" jdbcType="INTEGER" property="businessId"/> | ||||
| <result column="sub_business_id" jdbcType="INTEGER" property="subBusinessId"/> | |||||
| <result column="shop_type" jdbcType="INTEGER" property="shopType"/> | <result column="shop_type" jdbcType="INTEGER" property="shopType"/> | ||||
| <result column="brand" jdbcType="VARCHAR" property="brand"/> | <result column="brand" jdbcType="VARCHAR" property="brand"/> | ||||
| <result column="type" jdbcType="SMALLINT" property="type"/> | <result column="type" jdbcType="SMALLINT" property="type"/> | ||||
| @@ -24,7 +25,7 @@ | |||||
| <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`,`shop_type`,`brand`,`type`,`is_public`,email | |||||
| `business_id`,`sub_business_id`,`shop_type`,`brand`,`type`,`is_public`,email | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||
| @@ -66,6 +67,10 @@ | |||||
| and `business_id` = #{businessId} | and `business_id` = #{businessId} | ||||
| </if> | </if> | ||||
| <if test=" null != subBusinessId "> | |||||
| and `sub_business_id` = #{subBusinessId} | |||||
| </if> | |||||
| <if test=" null != carParams "> | <if test=" null != carParams "> | ||||
| and `car_params` like concat('%', #{carParams},'%') | and `car_params` like concat('%', #{carParams},'%') | ||||
| </if> | </if> | ||||
| @@ -108,7 +113,7 @@ | |||||
| <sql id="allMerchantVoColumns"> | <sql id="allMerchantVoColumns"> | ||||
| m.id, | m.id, | ||||
| m.img_url,m.name,m.link_phone,m.status,m.business_id, | |||||
| m.img_url,m.name,m.link_phone,m.status,m.business_id,m.sub_business_id, | |||||
| s.addr,s.shop_number,s.baidu_poi, | s.addr,s.shop_number,s.baidu_poi, | ||||
| mb.building_name,mf.floor_name,m.is_public,m.email | mb.building_name,mf.floor_name,m.is_public,m.email | ||||
| </sql> | </sql> | ||||
| @@ -120,6 +125,7 @@ | |||||
| <result column="link_phone" jdbcType="VARCHAR" property="merchantLinkPhone"/> | <result column="link_phone" jdbcType="VARCHAR" property="merchantLinkPhone"/> | ||||
| <result column="status" jdbcType="VARCHAR" property="merchantStatus"/> | <result column="status" jdbcType="VARCHAR" property="merchantStatus"/> | ||||
| <result column="business_id" jdbcType="INTEGER" property="businessId"/> | <result column="business_id" jdbcType="INTEGER" property="businessId"/> | ||||
| <result column="sub_business_id" jdbcType="INTEGER" property="subBusinessId"/> | |||||
| <result column="addr" jdbcType="VARCHAR" property="addr"/> | <result column="addr" jdbcType="VARCHAR" property="addr"/> | ||||
| <result column="shop_number" jdbcType="VARCHAR" property="shopNumber"/> | <result column="shop_number" jdbcType="VARCHAR" property="shopNumber"/> | ||||
| <result column="building_name" jdbcType="VARCHAR" property="buildingName"/> | <result column="building_name" jdbcType="VARCHAR" property="buildingName"/> | ||||
| @@ -172,6 +178,10 @@ | |||||
| and m.`business_id` = #{businessId} | and m.`business_id` = #{businessId} | ||||
| </if> | </if> | ||||
| <if test=" null != subBusinessId "> | |||||
| and m.`sub_business_id` = #{subBusinessId} | |||||
| </if> | |||||
| <if test=" null != merchantStatus "> | <if test=" null != merchantStatus "> | ||||
| and m.`status` = #{merchantStatus} | and m.`status` = #{merchantStatus} | ||||
| </if> | </if> | ||||