diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/truck/OrderclusterTruckService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/truck/OrderclusterTruckService.java index dbe457b..93e1f44 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/truck/OrderclusterTruckService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/truck/OrderclusterTruckService.java @@ -110,8 +110,8 @@ public class OrderclusterTruckService extends BaseService { " left join ordercluster c on c.id = t.ordercluster_id \n" + " where c.supermarket_id = ? \n" + " and c.state < ?" + - " and c.start_time >= ? \n" + - " and c.cutoff_time <= ? \n" + + " and c.start_time <= ? \n" + + " and c.cutoff_time >= ? \n" + " and t.truck_license = ? \n" + " limit 0,1", supermarket_id, @@ -139,8 +139,8 @@ public class OrderclusterTruckService extends BaseService { " left join ordercluster c on c.id = t.ordercluster_id \n" + " where c.supermarket_id = ? \n" + " and c.state < ?" + - " and c.start_time >= ? \n" + - " and c.cutoff_time <= ? \n" + + " and c.start_time <= ? \n" + + " and c.cutoff_time >= ? \n" + " and t.truck_license = ? \n" + " limit 0,1", supermarket_id,