@@ -626,6 +626,7 @@
<resultMap id="AdminBVoResultMap" type="com.iformall.domain.vo.WxCouponOrderBVo">
<resultMap id="AdminBVoResultMap" type="com.iformall.domain.vo.WxCouponOrderBVo">
<id column="id" jdbcType="BIGINT" property="id" />
<id column="id" jdbcType="BIGINT" property="id" />
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
<result column="sub_tenant_id" jdbcType="VARCHAR" property="subTenantId" />
<result column="coupon_id" jdbcType="BIGINT" property="couponId" />
<result column="coupon_id" jdbcType="BIGINT" property="couponId" />
<result column="coupon_type" jdbcType="INTEGER" property="couponType" />
<result column="coupon_type" jdbcType="INTEGER" property="couponType" />
<result column="c_user_id" jdbcType="BIGINT" property="cUserId" />
<result column="c_user_id" jdbcType="BIGINT" property="cUserId" />
@@ -659,6 +660,7 @@
</resultMap>
</resultMap>
<sql id="allAdminCouponOrderListColumns">
<sql id="allAdminCouponOrderListColumns">
<!--
co.id,co.tenant_id,co.sub_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.id,co.tenant_id,co.sub_tenant_id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,
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.title,c.sale_price,c.use_price,c.price,c.unit,c.auto_refund,c.business,c.subsidy_type,ms.subsidy subsidy_num,
@@ -675,7 +677,7 @@
cu.phone,m2.name as verify_merchant_name,cal.channel_type
cu.phone,m2.name as verify_merchant_name,cal.channel_type
-->
-->
co.id,co.tenant_id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status,
co.id,co.tenant_id,co.sub_tenant_id,co. coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status,
co.create_date,co.update_date,co.coupon_price, c.title,c.sale_price,c.use_price,c.price,
co.create_date,co.update_date,co.coupon_price, 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,ms.subsidy subsidy_num,
(CASE WHEN couc.mc = 1 THEN m1.name ELSE '[多商户通用]' END) AS merchant_name,
(CASE WHEN couc.mc = 1 THEN m1.name ELSE '[多商户通用]' END) AS merchant_name,
@@ -727,7 +729,7 @@
FROM wx_coupon_merchant wcm
FROM wx_coupon_merchant wcm
WHERE STATUS = 0 AND wcm.tenant_id = #{tenantId} GROUP BY product_id) couc
WHERE STATUS = 0 AND wcm.tenant_id = #{tenantId} GROUP BY product_id) couc
RIGHT JOIN (
RIGHT JOIN (
SELECT co.id,co.tenant_id,co.coupon_id,co.c_user_id,co.b_user_id,co.coupon_type,
SELECT co.id,co.tenant_id,co.sub_tenant_id,co. coupon_id,co.c_user_id,co.b_user_id,co.coupon_type,
co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price
co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price
FROM wx_coupon_order co
FROM wx_coupon_order co
WHERE co.tenant_id = #{tenantId}) co
WHERE co.tenant_id = #{tenantId}) co
@@ -990,6 +992,7 @@
<resultMap id="CVoResultMapOptimize" type="com.iformall.domain.vo.WxCouponOrderCVo">
<resultMap id="CVoResultMapOptimize" type="com.iformall.domain.vo.WxCouponOrderCVo">
<id column="id" jdbcType="BIGINT" property="id" />
<id column="id" jdbcType="BIGINT" property="id" />
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
<result column="sub_tenant_id" jdbcType="VARCHAR" property="subTenantId" />
<result column="coupon_id" jdbcType="BIGINT" property="couponId" />
<result column="coupon_id" jdbcType="BIGINT" property="couponId" />
<result column="coupon_type" jdbcType="INTEGER" property="couponType" />
<result column="coupon_type" jdbcType="INTEGER" property="couponType" />
<result column="c_user_id" jdbcType="BIGINT" property="cUserId" />
<result column="c_user_id" jdbcType="BIGINT" property="cUserId" />