|
|
|
@@ -370,7 +370,7 @@ |
|
|
|
<result column="price" jdbcType="INTEGER" property="price" /> |
|
|
|
<result column="auto_refund" jdbcType="INTEGER" property="autoRefund" /> |
|
|
|
<result column="business" jdbcType="INTEGER" property="business"/> |
|
|
|
<result column="subsidy_sum" jdbcType="INTEGER" property="subsidySum"/> |
|
|
|
<result column="subsidy_num" jdbcType="INTEGER" property="subsidyNum"/> |
|
|
|
<result column="subsidy_type" jdbcType="INTEGER" property="subsidyType"/> |
|
|
|
|
|
|
|
<result column="name" jdbcType="VARCHAR" property="bUserName" /> |
|
|
|
@@ -387,11 +387,11 @@ |
|
|
|
|
|
|
|
<sql id="allAdminCouponOrderListColumns"> |
|
|
|
co.id,co.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,c.subsidy_sum, |
|
|
|
c.title,c.sale_price,c.use_price,c.price,c.unit,c.auto_refund,c.business,c.subsidy_type,c.subsidy_num, |
|
|
|
(case when com.mc=1 then |
|
|
|
(select m.name from wx_merchant m, wx_coupon_merchant cm |
|
|
|
where m.id = cm.merchant_id and cm.product_id=co.coupon_id and cm.status = 0) else '[多商户通用]' end) as merchant_name, |
|
|
|
case when com.mc = 1 then (select m.id from wx_merchant m, |
|
|
|
(case when com.mc = 1 then (select m.id from wx_merchant m, |
|
|
|
wx_coupon_merchant cm where m.id = cm.merchant_id and cm.product_id = co.coupon_id |
|
|
|
and cm.status = 0) else 0 end) as merchant_id |
|
|
|
</sql> |
|
|
|
@@ -401,7 +401,7 @@ |
|
|
|
c.type,c.title,c.sale_price,c.use_price,c.price,c.unit,c.auto_refund,c.business,c.subsidy_type,c.subsidy_sum, |
|
|
|
bu.name, bu.phone as bphone, |
|
|
|
cu.phone, |
|
|
|
m.name as merchant_name |
|
|
|
m.name as merchant_name,m.id as merchant_id |
|
|
|
</sql> |
|
|
|
|
|
|
|
<select id="findListOfAdmin" parameterType="com.iformall.domain.vo.WxCouponOrderBVo" resultMap="BVoResultMap"> |
|
|
|
@@ -475,7 +475,7 @@ |
|
|
|
left join wx_coupon_merchant cm on ms.merchant_id=cm.merchant_id |
|
|
|
where ms.is_del=0 and s.building=#{building} |
|
|
|
<if test=" null != tenantId "> |
|
|
|
and ms.tenant_id=#{tenant_id} |
|
|
|
and ms.tenant_id=#{tenantId} |
|
|
|
</if> |
|
|
|
<if test="null!=floor"> |
|
|
|
and s.floor=#{floor} |
|
|
|
|