| @@ -429,10 +429,10 @@ | |||||
| left join wx_coupon co on(o.`coupon_id`=co.id) | left join wx_coupon co on(o.`coupon_id`=co.id) | ||||
| left join wx_coupon_merchant cm on(cm.product_id=co.id) | left join wx_coupon_merchant cm on(cm.product_id=co.id) | ||||
| inner join wx_c_user_basic_info c on(o.c_user_id=c.id) where cm.`merchant_id`=m.id and o.coupon_order_status=1 | inner join wx_c_user_basic_info c on(o.c_user_id=c.id) where cm.`merchant_id`=m.id and o.coupon_order_status=1 | ||||
| <if test="starttime != null"> | |||||
| <if test="starttime != null and starttime!=''"> | |||||
| and o.create_date >= #{starttime} | and o.create_date >= #{starttime} | ||||
| </if> | </if> | ||||
| <if test="endtime != null"> | |||||
| <if test="endtime != null and endtime!=''"> | |||||
| and o.create_date <= #{endtime} | and o.create_date <= #{endtime} | ||||
| </if> | </if> | ||||
| ) consumeCount, | ) consumeCount, | ||||
| @@ -441,10 +441,10 @@ | |||||
| left join wx_coupon co on(o.`coupon_id`=co.id) | left join wx_coupon co on(o.`coupon_id`=co.id) | ||||
| left join wx_coupon_merchant cm on(cm.product_id=co.id) | left join wx_coupon_merchant cm on(cm.product_id=co.id) | ||||
| inner join wx_c_user_basic_info c on(o.c_user_id=c.id) where cm.`merchant_id`=m.id and o.coupon_order_status=1 | inner join wx_c_user_basic_info c on(o.c_user_id=c.id) where cm.`merchant_id`=m.id and o.coupon_order_status=1 | ||||
| <if test="starttime != null"> | |||||
| <if test="starttime != null and starttime!=''"> | |||||
| and o.create_date >= #{starttime} | and o.create_date >= #{starttime} | ||||
| </if> | </if> | ||||
| <if test="endtime != null"> | |||||
| <if test="endtime != null and endtime!=''"> | |||||
| and o.create_date <= #{endtime} | and o.create_date <= #{endtime} | ||||
| </if> | </if> | ||||
| ) consumeCountP, | ) consumeCountP, | ||||
| @@ -453,10 +453,10 @@ | |||||
| left join wx_coupon co on(o.`coupon_id`=co.id) | left join wx_coupon co on(o.`coupon_id`=co.id) | ||||
| left join wx_coupon_merchant cm on(cm.product_id=co.id) | left join wx_coupon_merchant cm on(cm.product_id=co.id) | ||||
| inner join wx_c_user_basic_info c on(o.c_user_id=c.id) where cm.`merchant_id`=m.id and o.coupon_order_status=1 | inner join wx_c_user_basic_info c on(o.c_user_id=c.id) where cm.`merchant_id`=m.id and o.coupon_order_status=1 | ||||
| <if test="starttime != null"> | |||||
| <if test="starttime != null and starttime!=''"> | |||||
| and o.create_date >= #{starttime} | and o.create_date >= #{starttime} | ||||
| </if> | </if> | ||||
| <if test="endtime != null"> | |||||
| <if test="endtime != null and endtime!=''"> | |||||
| and o.create_date <= #{endtime} | and o.create_date <= #{endtime} | ||||
| </if> | </if> | ||||
| ),0) tradeAmt | ),0) tradeAmt | ||||