|
|
|
@@ -799,7 +799,7 @@ |
|
|
|
c.title,cubi.`name` c_user_name,cubi.phone,o.create_date,2 attribute from wx_order o |
|
|
|
left join wx_c_user_basic_info cubi on o.c_user_id=cubi.id |
|
|
|
left join wx_coupon c on o.product_id=c.id |
|
|
|
where c.type in (1,2,3,4,5,6,10,50,51,66) and o.order_status in(0,1,2,3,4,5) |
|
|
|
where c.type in (1,2,3,4,5,6,10,50,51,66) and o.order_status in(0,1,2,3,4,5,97) |
|
|
|
<if test=" null != tenantId and '' != tenantId"> |
|
|
|
and o.`tenant_id` = #{tenantId} |
|
|
|
</if> |
|
|
|
@@ -812,7 +812,7 @@ |
|
|
|
c.title,cubi.`name` c_user_name,cubi.phone,o.create_date,6 attribute from wx_order o |
|
|
|
left join wx_c_user_basic_info cubi on o.c_user_id=cubi.id |
|
|
|
left join wx_coupon c on o.product_id=c.id |
|
|
|
where c.type = 11 and o.order_status in(0,1,2,3,4,5) |
|
|
|
where c.type = 11 and o.order_status in(0,1,2,3,4,5,97) |
|
|
|
<if test=" null != tenantId and '' != tenantId"> |
|
|
|
and o.`tenant_id` = #{tenantId} |
|
|
|
</if> |
|
|
|
@@ -824,7 +824,7 @@ |
|
|
|
c.title,cubi.`name` c_user_name,cubi.phone,o.create_date,7 attribute from wx_order o |
|
|
|
left join wx_c_user_basic_info cubi on o.c_user_id=cubi.id |
|
|
|
left join wx_coupon c on o.product_id=c.id |
|
|
|
where c.type = 12 and o.order_status in(0,1,2,3,4,5) |
|
|
|
where c.type = 12 and o.order_status in(0,1,2,3,4,5,97) |
|
|
|
<if test=" null != tenantId and '' != tenantId"> |
|
|
|
and o.`tenant_id` = #{tenantId} |
|
|
|
</if> |
|
|
|
@@ -1139,7 +1139,7 @@ |
|
|
|
where c_user_id = #{cUserId} |
|
|
|
and parent_order_id = 0 |
|
|
|
and (`type` = 0 or `type` = 4) |
|
|
|
and order_status in (0,1,2,3,4,5) |
|
|
|
and order_status in (0,1,2,3,4,5,97) |
|
|
|
and `tenant_id` = #{tenantId} |
|
|
|
<if test=" null != parentTenantId and '' != parentTenantId"> |
|
|
|
and `parent_tenant_id` = #{parentTenantId} |
|
|
|
|