修改自由车辆定向单对车队运营定向单的影响问题

performance-web/src/main/java/com/clx/performance/sqlProvider/OrderGoodsTruckBindSqlProvider.java

 package com.clx.performance.sqlProvider;
 
 import com.clx.order.enums.VehicleUsageEnum;
+import com.clx.performance.enums.OrderGoodsStatusEnum;
 import com.clx.performance.enums.OrderGoodsTruckBindEnum;
 import org.apache.ibatis.jdbc.SQL;
 
@@ -42,7 +43,10 @@ public class OrderGoodsTruckBindSqlProvider {
             FROM("order_goods_truck_bind a");
             LEFT_OUTER_JOIN("order_goods b on a.order_goods_no = b.order_goods_no");
             WHERE("a.truck_no IN ("  + truckList.stream().map(code -> "'"+code+"'").collect(Collectors.joining(","))+ ")" );
-            WHERE("b.vehicle_usage = " + VehicleUsageEnum.Status.OWN.getCode()  + " or a.`status` =" + OrderGoodsTruckBindEnum.Status.NORMAL.getCode());
+            WHERE("b.vehicle_usage = " + VehicleUsageEnum.Status.OWN.getCode()  + " and a.`status` =" + OrderGoodsTruckBindEnum.Status.NORMAL.getCode());
+            WHERE("b.order_goods_status IN ( " + OrderGoodsStatusEnum.Status.PAYING.getCode() + ","
+                    + OrderGoodsStatusEnum.Status.GO_TO_SEND.getCode() +")");
+
         }}.toString();
     }