Merge branch 'v6.4_transportation_20231110' of…

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

@@ -436,6 +436,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())){