...
|
...
|
@@ -97,7 +97,7 @@ |
|
|
and (a.uid = #{buyerOrderReq.sellerUid} or a.seller_uid = #{buyerOrderReq.sellerUid})
|
|
|
</if>
|
|
|
<if test="buyerOrderReq.sellerWaybillCode != null and buyerOrderReq.sellerWaybillCode != '' ">
|
|
|
and d.waybill_code = #{buyerOrderReq.sellerWaybillCode}
|
|
|
and d.waybill_code = #{buyerOrderReq.sellerWaybillCode} and d.express_type=1
|
|
|
</if>
|
|
|
</sql>
|
|
|
|
...
|
...
|
@@ -110,7 +110,7 @@ |
|
|
LEFT JOIN seller_order_goods c
|
|
|
ON( c.id=b.skup)
|
|
|
</if>
|
|
|
<if test="buyerOrderReq.sellerWaybillCode != null">
|
|
|
<if test="buyerOrderReq.sellerWaybillCode != null and buyerOrderReq.sellerWaybillCode != ''">
|
|
|
LEFT JOIN express_record d
|
|
|
ON(a.order_code=d.order_code)
|
|
|
</if>
|
...
|
...
|
@@ -127,7 +127,7 @@ |
|
|
LEFT JOIN seller_order_goods c
|
|
|
ON( c.id=b.skup)
|
|
|
</if>
|
|
|
<if test="buyerOrderReq.sellerWaybillCode != null">
|
|
|
<if test="buyerOrderReq.sellerWaybillCode != null and buyerOrderReq.sellerWaybillCode != ''">
|
|
|
LEFT JOIN express_record d
|
|
|
ON(a.order_code=d.order_code)
|
|
|
</if>
|
...
|
...
|
|