|
|
|
@@ -764,6 +764,8 @@ |
|
|
|
<result column="merchant_name" jdbcType="VARCHAR" property="merchantName" /> |
|
|
|
|
|
|
|
<result column="verify_merchant_name" jdbcType="VARCHAR" property="verifyMerchantName"/> |
|
|
|
|
|
|
|
<result column="send_merchant_id" jdbcType="INTEGER" property="sendMerchantId" /> |
|
|
|
</resultMap> |
|
|
|
|
|
|
|
<sql id="allAdminCouponOrderListColumns"> |
|
|
|
@@ -786,7 +788,7 @@ |
|
|
|
|
|
|
|
co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status,co.order_id, |
|
|
|
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,c.source_type,ms.subsidy subsidy_num, |
|
|
|
co.send_merchant_id,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 |
|
|
|
|