|
|
|
@@ -720,6 +720,7 @@ |
|
|
|
<result column="business" jdbcType="INTEGER" property="business"/> |
|
|
|
<result column="subsidy_num" jdbcType="INTEGER" property="subsidyNum"/> |
|
|
|
<result column="subsidy_type" jdbcType="INTEGER" property="subsidyType"/> |
|
|
|
<result column="source_type" jdbcType="INTEGER" property="sourceType"/> |
|
|
|
|
|
|
|
<result column="name" jdbcType="VARCHAR" property="bUserName" /> |
|
|
|
<result column="bphone" jdbcType="VARCHAR" property="bUserPhone" /> |
|
|
|
@@ -749,7 +750,7 @@ |
|
|
|
|
|
|
|
co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status, |
|
|
|
co.create_date,co.update_date,co.coupon_price, co.verify_type, co.pay_vendor,c.title,c.sale_price,c.use_price,c.price, |
|
|
|
c.unit,c.auto_refund,c.business,c.subsidy_type,ms.subsidy subsidy_num, |
|
|
|
c.unit,c.auto_refund,c.business,c.subsidy_type,c.source_type,ms.subsidy subsidy_num, |
|
|
|
(CASE WHEN couc.mc = 1 THEN m1.name ELSE '[多商户通用]' END) AS merchant_name, |
|
|
|
(CASE WHEN couc.mc = 1 THEN m1.id ELSE 0 END) AS merchant_id, |
|
|
|
cu.phone,m2.name AS verify_merchant_name,cal.channel_type |
|
|
|
@@ -854,6 +855,9 @@ |
|
|
|
<if test=" null != business "> |
|
|
|
and c.business = #{business} |
|
|
|
</if> |
|
|
|
<if test=" null != sourceType "> |
|
|
|
and c.`source_type` = #{sourceType} |
|
|
|
</if> |
|
|
|
<if test=" null != verifyMerchantName and ''!= verifyMerchantName "> |
|
|
|
and bu.verify_merchant_name = #{verifyMerchantName} |
|
|
|
</if> |
|
|
|
|