|
|
|
@@ -128,7 +128,7 @@ |
|
|
|
bu.name,cu.phone |
|
|
|
</sql> |
|
|
|
|
|
|
|
<sql id="allBUserUnverifiedCouponOrderColumns"> |
|
|
|
<sql id="allBUserOrderedCouponOrderColumns"> |
|
|
|
co.id,co.tenant_id,co.coupon_id,co.c_user_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price, |
|
|
|
c.type,c.title,c.sale_price,c.use_price,c.price, |
|
|
|
cu.phone |
|
|
|
@@ -138,8 +138,8 @@ |
|
|
|
co.id,co.tenant_id,co.coupon_id,co.c_user_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price |
|
|
|
</sql> |
|
|
|
|
|
|
|
<select id="findListOfUnverifiedByDateForBUser" parameterType="map" resultMap="BVoResultMap"> |
|
|
|
select <include refid="allBUserUnverifiedCouponOrderColumns" /> |
|
|
|
<select id="findListOfOrderedByDateForBUser" parameterType="map" resultMap="BVoResultMap"> |
|
|
|
select <include refid="allBUserOrderedCouponOrderColumns" /> |
|
|
|
from wx_coupon_order co,wx_order o,wx_coupon c,wx_c_user cu |
|
|
|
where o.id = co.order_id |
|
|
|
and o.merchant_id = #{merchantID} |
|
|
|
@@ -151,7 +151,7 @@ |
|
|
|
<if test="startDate != null"> |
|
|
|
AND co.create_date < #{endDate,jdbcType=TIMESTAMP} |
|
|
|
</if> |
|
|
|
AND co.coupon_order_status = '0' |
|
|
|
AND (co.coupon_order_status = '0' or co.coupon_order_status = '1') |
|
|
|
order by co.create_date desc |
|
|
|
|
|
|
|
</select> |
|
|
|
@@ -243,7 +243,7 @@ |
|
|
|
|
|
|
|
</select> |
|
|
|
|
|
|
|
<select id="findListOfUnverifiedByDate" parameterType="map" resultMap="BaseResultMap"> |
|
|
|
<select id="findListOfOrderedByDate" parameterType="map" resultMap="BaseResultMap"> |
|
|
|
select <include refid="allCouponOrderColumns" /> |
|
|
|
from wx_coupon_order co,wx_order o |
|
|
|
where o.id = co.order_id |
|
|
|
@@ -254,7 +254,7 @@ |
|
|
|
<if test="startDate != null"> |
|
|
|
AND co.create_date < #{endDate,jdbcType=TIMESTAMP} |
|
|
|
</if> |
|
|
|
AND co.coupon_order_status = '0' |
|
|
|
AND (co.coupon_order_status = '0' or co.coupon_order_status = '1') |
|
|
|
|
|
|
|
</select> |
|
|
|
|
|
|
|
|