|
|
|
@@ -465,7 +465,7 @@ |
|
|
|
o.`coupon_number`,o.`freight_price`,o.`shipping_type`,o.`shipping_address` |
|
|
|
from wx_coupon c,wx_order o |
|
|
|
where o.product_id = c.id and o.order_status in (0,2) |
|
|
|
and o.compose_order_type in (0,3) |
|
|
|
and o.compose_order_type = 0 |
|
|
|
and o.compose_order_id = 0 |
|
|
|
<if test="cUserId != null"> |
|
|
|
and o.c_user_id = #{cUserId} |
|
|
|
@@ -510,7 +510,7 @@ |
|
|
|
null ,null ,null ,null |
|
|
|
from wx_order o |
|
|
|
where o.order_status in (0,2) |
|
|
|
and o.compose_order_type in (1,2) |
|
|
|
and o.compose_order_type in (1,2,3) |
|
|
|
and o.compose_order_id > 0 |
|
|
|
<if test="cUserId != null"> |
|
|
|
and o.c_user_id = #{cUserId} |
|
|
|
|