Merge remote-tracking branch 'origin/v6.4_transportation_20231110' into release

performance-api/src/main/java/com/clx/performance/enums/OrderGoodsTruckBindEnum.java

@@ -22,7 +22,7 @@ public enum OrderGoodsTruckBindEnum {
 
         ;
 
-        private final int code;
+        private final Integer code;
         private final String name;
 
         public static Optional<Status> getByCode(int code) {

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

@@ -415,7 +415,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
         if (CollectionUtil.isNotEmpty(truckList)) {
             if (CollectionUtil.isNotEmpty(getChildList)) {
                 for (OrderGoodsTruckBind bind : getChildList) {
-                    if (!truckList.contains(bind.getTruckNo())) {
+                    if (OrderGoodsTruckBindEnum.Status.SUCCESS.getCode().equals(bind.getStatus()) && !truckList.contains(bind.getTruckNo())) {
                         throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "当前取消的车辆已经接单,车牌号为：" + bind.getTruckNo());
                     } else {
                         //已存在的记录不需要重新创建绑定记录

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

@@ -123,6 +123,9 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
                 settlementOwnerDao.updateInvoiceStatusById(settlementOwner.getId(),SettlementOwnerEnum.InvoiceStatus.NO_NEED_INVOICE.getCode());
                 settlementOwnerDetailDao.updateInvoiceStatusBySettlementNo(settlementNo, SettlementOwnerDetailEnum.InvoiceStatus.NO_INVOICE.getCode());
             }
+            if(settlementOwner.getSettlementFreight().compareTo(BigDecimal.ZERO) == 0){
+                settlementOwnerDetailDao.updateFinalPaymentStatusBySettlementNo(settlementNo, SettlementOwnerDetailEnum.FinalPaymentStatus.NO_REQUIRE.getCode());
+            }
         }
 
         //更新状态