Merge branch 'v6.4_transportation_20231110' of…

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/SettlementMqHandlerServiceImpl.java

@@ -24,6 +24,7 @@ import com.clx.performance.model.settle.SettlementDriverDetail;
 import com.clx.performance.model.settle.SettlementOwner;
 import com.clx.performance.model.settle.SettlementOwnerDetail;
 import com.clx.performance.param.pc.payment.PayParam;
+import com.clx.performance.service.OrderChildLogService;
 import com.clx.performance.service.PaymentService;
 import com.clx.performance.service.impl.UniqueOrderNumService;
 import com.clx.performance.service.settle.SettlementLogService;
@@ -89,6 +90,9 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
     @Autowired
     private OrderChildDao orderChildDao;
 
+    @Autowired
+    private OrderChildLogService orderChildLogService;
+
 
 
     @Override
@@ -183,9 +187,16 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
 
         if(1 == payType){
             orderChild.setStatus(OrderChildEnum.Status.COMPLETE.getCode());
+            orderChild.setSettleTime(LocalDateTime.now());
+            orderChild.setFinishTime(orderChild.getSettleTime());
             orderChildDao.updateSettlement(orderChild);
+
             settlementDriver.setStatus(SettlementDriverEnum.Status.SETTLED.getCode());
             settlementDriverDao.updateEntityByKey(settlementDriver);
+
+            // 日志
+            orderChildLogService.saveDriverOrderChildLog(childNo, OrderChildLogEnum.Type.COMPLETE.getCode(),
+                    OrderChildLogEnum.Type.COMPLETE.getMsg(), 0L, "系统");
         }else{
             settlementDriver.setPayErrorMsg(payErrorMsg);
             settlementDriverDao.updateEntityByKey(settlementDriver);