货单定时处理状态

performance-web/src/main/java/com/clx/performance/component/GoodsOrderTruckRecordComponent.java

@@ -31,7 +31,8 @@ public class GoodsOrderTruckRecordComponent {
 
     //删除货单下的所有车牌号
     public void deleteTruckRecord(String orderGoodsNo) {
-        redisTemplate.opsForSet().remove(RedisConstants.ORDER_GOODS_TRUCK_RECORD + orderGoodsNo);
+        redisTemplate.delete(RedisConstants.ORDER_GOODS_TRUCK_RECORD + orderGoodsNo);
+        //redisTemplate.opsForSet().remove(RedisConstants.ORDER_GOODS_TRUCK_RECORD + orderGoodsNo,);
         redisTemplate.opsForSet().remove(RedisConstants.ORDER_GOODS_RECORD, orderGoodsNo);
     }
 

performance-web/src/main/java/com/clx/performance/component/OrderGoodsStatusLazyComponent.java

@@ -108,8 +108,18 @@ public class OrderGoodsStatusLazyComponent implements InitializingBean {
                 OrderGoods orderGoods = optional.get();
 
                 if (orderGoods.getResidueTransportWeight().compareTo(BigDecimal.ZERO) == 0) {
-                    //更新货单已完成
-                    orderGoodsDao.updateOrderGoodsStatusByOrderGoodsNo(orderGoodsNo, OrderGoodsStatusEnum.Status.SUCCESS.getCode());
+                    List<OrderChild> orderChildren = orderChildDao.selectInTransitOrderChildByOrderGoodsNo(orderGoodsNo);
+                    if (CollectionUtil.isNotEmpty(orderChildren)) {
+                        //更新货单已完结
+                        log.info("当前货单虽然可拉运吨数为0,但是存在未拉运完成的运单,所以更新为已完结,货单编号{}", orderGoodsNo);
+                        orderGoodsDao.updateOrderGoodsStatusByOrderGoodsNo(orderGoodsNo, OrderGoodsStatusEnum.Status.COMPLETED.getCode());
+                    } else {
+                        //更新货单已完成
+                        log.info("当前货单虽然可拉运吨数为0,未存在未拉运完成的运单,所以更新为已完成,货单编号{}", orderGoodsNo);
+                        orderGoodsDao.updateOrderGoodsStatusByOrderGoodsNo(orderGoodsNo, OrderGoodsStatusEnum.Status.SUCCESS.getCode());
+                    }
+
+
                 } else {
                     RollbackOrderWeightParam param = new RollbackOrderWeightParam();
                     param.setOrderNo(orderGoods.getOrderNo());

performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java

@@ -105,4 +105,7 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
     List<OrderChild> listOrderChildByOrderNoAndStatus(String orderNo,List<Integer> status);
 
     List<OrderChild> selectInTransitOrderChild(String orderNo);
+
+    List<OrderChild> selectInTransitOrderChildByOrderGoodsNo(String orderGoodsNo);
+
 }

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

@@ -363,4 +363,10 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
                 .lt(OrderChild::getStatus, OrderChildEnum.Status.COMPLETE.getCode())
         );
     }
+
+    @Override
+    public List<OrderChild> selectInTransitOrderChildByOrderGoodsNo(String orderGoodsNo) {
+        return baseMapper.selectList(lQrWrapper().eq(OrderChild::getOrderGoodsNo, orderGoodsNo)
+                .lt(OrderChild::getStatus, OrderChildEnum.Status.COMPLETE.getCode())
+        );    }
 }

performance-web/src/test/java/com/clx/performance/JobTest.java

@@ -62,6 +62,7 @@ public class JobTest {
 
         //orderCancelService.ownerCancelOrderPre("PT2023102700473");
         //orderCancelService.ownerCancelOrder("PT2023102600466");
+        recordComponent.deleteTruckRecord("123");
         System.out.println();
     }
 }