From 780bdc2ddc346c85b181333f1091b26a40953498 Mon Sep 17 00:00:00 2001 From: "lisai17@sina.com" Date: Mon, 26 Oct 2020 17:34:00 +0800 Subject: [PATCH] . --- .../com/cowr/ssjygl/order/ordertemp/OrderTempService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java index f11174f..252c6ef 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java @@ -64,8 +64,8 @@ public class OrderTempService extends BaseService { " from order_temp t \n" + " left join transport p on p.order_sn = t.sn \n" + " left join supermarket s on s.id = t.supermarket_id \n" + - " left join invoice_invalid_verify v on v.order_sn = t.sn and v.state = 1 \n" + - " left join order_invalid_verify ov on ov.order_sn = t.sn and ov.state = 1 \n" + + " left join invoice_invalid_verify v on v.order_sn = t.sn and ( v.state = 1 or v.state = 2 ) \n" + + " left join order_invalid_verify ov on ov.order_sn = t.sn and ( ov.state = 1 or ov.state = 2 ) \n" + " where t.sn = ?", sn); } @@ -96,7 +96,7 @@ public class OrderTempService extends BaseService { " left join transport p on p.order_sn = t.sn \n" + " left join supermarket s on s.id = t.supermarket_id \n" + " left join invoice_invalid_verify v on v.order_sn = t.sn and ( v.state = 1 or v.state = 2 ) \n" + - " left join order_invalid_verify ov on ov.order_sn = t.sn and ( ov.state = 1 or v.state = 2 ) \n" + + " left join order_invalid_verify ov on ov.order_sn = t.sn and ( ov.state = 1 or ov.state = 2 ) \n" + " where 1=1 "; List paraList = new ArrayList<>();