|
|
@@ -154,7 +154,7 @@ |
|
|
select <include refid="allBUserOrderedCouponOrderColumns" /> |
|
|
select <include refid="allBUserOrderedCouponOrderColumns" /> |
|
|
from wx_coupon_order co,wx_order o,wx_coupon c,wx_c_user cu |
|
|
from wx_coupon_order co,wx_order o,wx_coupon c,wx_c_user cu |
|
|
where o.id = co.order_id |
|
|
where o.id = co.order_id |
|
|
and o.merchant_id = #{merchantID} |
|
|
|
|
|
|
|
|
and o.merchant_id = #{merchantId} |
|
|
and co.coupon_id = c.id |
|
|
and co.coupon_id = c.id |
|
|
and cu.id = co.c_user_id |
|
|
and cu.id = co.c_user_id |
|
|
<if test="startDate != null"> |
|
|
<if test="startDate != null"> |
|
|
@@ -171,7 +171,7 @@ |
|
|
select <include refid="allBUserVerifiedCouponOrderColumns" /> |
|
|
select <include refid="allBUserVerifiedCouponOrderColumns" /> |
|
|
from wx_coupon_order co,wx_order o,wx_coupon c,wx_c_user cu,wx_merchant_b_user bu |
|
|
from wx_coupon_order co,wx_order o,wx_coupon c,wx_c_user cu,wx_merchant_b_user bu |
|
|
where o.id = co.order_id |
|
|
where o.id = co.order_id |
|
|
and o.merchant_id = #{merchantID} |
|
|
|
|
|
|
|
|
and o.merchant_id = #{merchantId} |
|
|
and co.coupon_id = c.id |
|
|
and co.coupon_id = c.id |
|
|
and cu.id = co.c_user_id |
|
|
and cu.id = co.c_user_id |
|
|
and bu.id = co.b_user_id |
|
|
and bu.id = co.b_user_id |
|
|
|