Merge branch 'refs/heads/v17.5_order_child_sync_broker_20240617' into test

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

@@ -9,6 +9,7 @@ import com.clx.performance.dao.settle.OrderChildSyncTransportRecordDao;
 import com.clx.performance.dao.settle.SettlementOwnerDetailDao;
 import com.clx.performance.dto.PayStatusNotifyDTO;
 import com.clx.performance.enums.NetworkDriverAccountEnum;
+import com.clx.performance.enums.OrderChildEnum;
 import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.enums.settle.SettlementOwnerDetailEnum;
 import com.clx.performance.enums.settle.SettlementWayEnum;
@@ -31,6 +32,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDateTime;
 import java.util.Objects;
 
 /**
@@ -88,6 +90,11 @@ public class OrderChildSyncTransportRecordServiceImpl implements OrderChildSyncT
         );
         SettlementDriverDetail driverDetail = settlementDriverDetailService.selectOneByChildNo(childNo);
 
+        orderChild.setStatus(OrderChildEnum.Status.COMPLETE.getCode());
+        orderChild.setSettleTime(LocalDateTime.now());
+        orderChild.setFinishTime(orderChild.getSettleTime());
+        orderChildDao.updateSettlement(orderChild);
+
         if (Objects.equals(orderGoods.getPlatformFreightQuotationTaxType(),
                 QuotationEnum.PlatformFreightQuotationTaxType.NO.getCode())
                 && Objects.equals(orderGoods.getSettlementWay(), SettlementWayEnum.WayType.UNLOAD_LOSS.getCode())) {