|
|
@@ -482,7 +482,7 @@ |
|
|
inner join wx_c_user_basic_info c on(o.c_user_id=c.id) |
|
|
inner join wx_c_user_basic_info c on(o.c_user_id=c.id) |
|
|
where o.coupon_order_status=1 and o.tenant_id=#{tenantId} |
|
|
where o.coupon_order_status=1 and o.tenant_id=#{tenantId} |
|
|
<if test=" null != id "> |
|
|
<if test=" null != id "> |
|
|
and co.`id` = #{id} |
|
|
|
|
|
|
|
|
and cm.`merchant_id` = #{id} |
|
|
</if> |
|
|
</if> |
|
|
order by o.create_date desc |
|
|
order by o.create_date desc |
|
|
</select> |
|
|
</select> |
|
|
|