Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test

performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java

@@ -121,7 +121,6 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
                 .eq(OrderChild::getId, item.getId())
                 .set(OrderChild::getStatus, item.getStatus())
                 .set(OrderChild::getConfirmTime, item.getConfirmTime())
-                .set(OrderChild::getFinishTime, item.getFinishTime())
         );
     }
 

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

@@ -1052,7 +1052,7 @@ public class OrderChildServiceImpl implements OrderChildService {
 
         orderChild.setStatus(OrderChildEnum.Status.UNSETTLE.getCode());
         orderChild.setConfirmTime(LocalDateTime.now());
-        orderChild.setFinishTime(LocalDateTime.now());
+
         orderChildDao.updateDriverConfirm(orderChild);
 
         // 更新车辆状态

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

@@ -130,7 +130,7 @@ public class TransportSyncServiceImpl implements TransportSyncService {
         param.setPayTime(DateUtils.formatDateTime(orderChild.getPayTime()).get());
         param.setLoadTime(DateUtils.formatDateTime(orderChild.getLoadTime()).get());
         param.setUnloadTime(DateUtils.formatDateTime(orderChild.getUnloadTime()).get());
-        param.setPayFinishedTime(DateUtils.formatDateTime(orderChild.getFinishTime()).get());
+        param.setPayFinishedTime(DateUtils.formatDateTime(orderChild.getConfirmTime()).get());
         param.setReceiveNet(orderChild.getUnloadNet());
         param.setAdvanceType(0);