Merge remote-tracking branch 'origin/v7.6_small_version_fix_20231204' into test

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java

@@ -869,9 +869,12 @@ public class OrderChildServiceImpl implements OrderChildService {
         // 更新出车状态
         updateDriverOrderStatusUnload(orderChild.getDriverUserNo(), orderChild.getTruckId());
 
+        OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
         //释放车辆
-        goodsOrderTruckRecordComponent.releaseDriverCard(orderChild.getOrderGoodsNo(), orderChild.getTruckNo());
-
+        //非自有车辆配货的进行车辆释放
+        if(!Objects.equals(orderGoods.getVehicleUsage(), VehicleUsageEnum.Status.OWN.getCode())){
+            goodsOrderTruckRecordComponent.releaseDriverCard(orderChild.getOrderGoodsNo(), orderChild.getTruckNo());
+        }
         // 发送mq 卸车
         orderChildMqService.orderChildUnload(orderChild.getChildNo());
     }

performance-web/src/main/java/com/clx/performance/service/impl/OwnerAccountServiceImpl.java

@@ -71,6 +71,10 @@ import java.time.LocalDateTime;
 import java.util.*;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 @Slf4j
 @Service

performance-web/src/main/java/com/clx/performance/sqlProvider/settle/SettlementDriverDetailSqlProvider.java

@@ -13,7 +13,7 @@ public class SettlementDriverDetailSqlProvider {
         return new SQL(){{
             SELECT("a.* ");
             FROM("settlement_owner_detail a ");
-            LEFT_OUTER_JOIN("settlement_driver b on a.settlement_no = b.settlement_no");
+            LEFT_OUTER_JOIN("settlement_driver b on a.child_no = b.child_no ");
             WHERE("b.create_time >= #{beginTime}");
             WHERE("b.status = " + SettlementDriverEnum.Status.WAIT_SETTLEMENT.getCode());
             ORDER_BY("b.create_time");