Merge branch 'v6.4_transportation_20231110' into release

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

@@ -29,7 +29,6 @@ public enum OrderChildLogEnum {
 
         DRIVER_CONFIRM(51, "司机确认收货"),
 
-        SETTLEMENT(61, "结算成功"),
 
         POUND_AUDIT(71, "磅单审核通过"),
         POUND_AUDIT_REJECT(72, "磅单审核驳回"),

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

@@ -25,6 +25,7 @@ public class OrderChildLogDaoImpl extends BaseDaoImpl<OrderChildLogMapper, Order
                 , OrderChildLogEnum.Type.LOAD.getCode(), OrderChildLogEnum.Type.UNLOAD.getCode()
                 , OrderChildLogEnum.Type.DRIVER_CANCEL.getCode(), OrderChildLogEnum.Type.PLATFORM_CANCEL.getCode()
                 , OrderChildLogEnum.Type.OWNER_CANCEL.getCode(), OrderChildLogEnum.Type.DRIVER_CONFIRM.getCode()
-                , OrderChildLogEnum.Type.ARTIFICIAL_CANCEL.getCode()).groupBy(OrderChildLog::getType).orderByAsc(OrderChildLog::getId));
+                , OrderChildLogEnum.Type.ARTIFICIAL_CANCEL.getCode(), OrderChildLogEnum.Type.COMPLETE.getCode())
+                .groupBy(OrderChildLog::getType).orderByAsc(OrderChildLog::getId));
     }
 }

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

@@ -437,6 +437,7 @@ public class BreakContractSettlementOwnerServiceImpl  implements BreakContractSe
         statusList.add(OrderChildEnum.Status.ARRIVE_RECEIVE.getCode());
         statusList.add(OrderChildEnum.Status.UNLOAD.getCode());
         statusList.add(OrderChildEnum.Status.UNSETTLE.getCode());
+        statusList.add(OrderChildEnum.Status.COMPLETE.getCode());
 
         //由于已经更新了订单状态为货主取消了
         if(Objects.equals(cancelType,CancelOrderEnum.Type.NOT_ARRIVE.getCode())){

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);