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

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

@@ -160,7 +160,7 @@ public class OrderGoodsTruckBindDaoImpl extends BaseDaoImpl<OrderGoodsTruckBindM
     @Override
     public List<OrderGoodsTruckBind> getCancelOrderGoods(List<String> truckList, String beginTime, String endTime) {
         return baseMapper.selectList(lQrWrapper().in(OrderGoodsTruckBind::getTruckNo, truckList)
-//                        .eq(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.CANCEL.getCode())
+                        .eq(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.NORMAL.getCode())
                 .le(OrderGoodsTruckBind::getCreateTime, endTime)
                 .ge(OrderGoodsTruckBind::getCreateTime, beginTime)
         );

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

@@ -699,6 +699,8 @@ public class OrderCancelServiceImpl implements OrderCancelService {
         orderChildDao.updateEntityByKey(update);
 
         orderCancelComponent.backFillTonnageForArtificial(orderChild.getOrderGoodsNo(), orderChild.getWeight());
+        goodsOrderTruckRecordComponent.releaseDriverCard(orderChild.getOrderGoodsNo(), orderChild.getTruckNo());
+        driverService.updateOrderStatus(orderChild.getDriverUserNo(), DriverInfoEnum.DriverStatus.NO.getCode(), orderChild.getTruckId(), 1);
 
         orderChildLogService.saveOrderChildLog(orderChild.getChildNo(),
                 OrderChildEnum.Status.ARTIFICIAL_CANCEL.getCode(), OrderChildEnum.Status.ARTIFICIAL_CANCEL.getName(),