|
|
|
@@ -464,7 +464,7 @@ |
|
|
|
from wx_order o |
|
|
|
inner join wx_merchant_b_user bu on bu.id = o.product_id |
|
|
|
inner join wx_merchant m on m.id = bu.merchant_id |
|
|
|
where m.`id` = #{merchantId} and o.`type` = 1 |
|
|
|
where m.`id` = #{merchantId} and o.`type` = 1 and o.`order_status` = 1 |
|
|
|
<if test=" null != startTime and null != endTime"> |
|
|
|
and o.`create_date` BETWEEN #{startTime} and #{endTime} |
|
|
|
</if> |
|
|
|
|