Merge remote-tracking branch 'origin/v4.9_create_goods_child_20230918' into…

performance-api/src/main/java/com/clx/performance/vo/app/GoingOrderChildVO.java

@@ -31,5 +31,8 @@ public class GoingOrderChildVO {
     @ApiModelProperty(value = "车牌号", example = "京A12345")
     private String truckNo;
 
+    @ApiModelProperty(value = "状态", example = "0")
+    private Integer status;
+
 
 }
\ No newline at end of file

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

@@ -70,8 +70,19 @@ public class OrderGoodsStatusLazyComponent implements InitializingBean {
                 log.info("货单" + orderGoodsId + "过了最晚拉运时间");
                 String orderGoodsNo = orderGoodsId.getValue();
                 log.info("处理当前货单编号:{}", orderGoodsNo);
-                OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderGoodsNo).get();
+                Optional<OrderGoods> optional = orderGoodsDao.getByOrderGoodsNo(orderGoodsNo);
+                if (!optional.isPresent()) {
+                    redisTemplate.opsForZSet().remove(RedisConstants.ORDER_GOODS_STATUS_LAZY, orderGoodsId.getValue());
+                    log.info("当前货单编号未查询出货单数据，执行删除redis ORDER_GOODS_STATUS_LAZY id: {}", orderGoodsId.getValue());
+                    continue;
+                }
+                OrderGoods orderGoods = optional.get();
                 FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(orderGoods.getOrderNo());
+                if (orderInfoFeign == null) {
+                    redisTemplate.opsForZSet().remove(RedisConstants.ORDER_GOODS_STATUS_LAZY, orderGoodsId.getValue());
+                    log.info("当前货单编号未查询出订单数据，执行删除redis ORDER_GOODS_STATUS_LAZY id: {}", orderGoodsId.getValue());
+                    continue;
+                }
 
                 if (OrderGoodsStatusEnum.Status.SUCCESS.getCode().equals(orderGoods.getOrderGoodsStatus())) {
                     log.info("当前货单状态为已完成");

performance-web/src/main/java/com/clx/performance/listener/RabbitOrderGoodsStatusOnHandler.java

@@ -30,7 +30,7 @@ public class RabbitOrderGoodsStatusOnHandler {
         }
         Optional<OrderGoods> optional = orderGoodsDao.getByOrderGoodsNo(message);
         if (!optional.isPresent()) {
-            log.info("处理货单状态由已挂单变为挂单中监听器未查询到订单数据,消息为{}", message);
+            log.info("处理货单状态由已挂单变为挂单中监听器未查询到货单数据,消息为{}", message);
             return;
         }
         OrderGoods orderGoods = optional.get();

performance-web/src/main/java/com/clx/performance/strategy/impl/OneGoodsOrderStrategy.java

@@ -152,10 +152,10 @@ public class OneGoodsOrderStrategy implements GoodsOrderStrategy, InitializingBe
             orderGoods.setUserName(loginUserInfo.getUserName());
             orderGoods.setUserNo(loginUserInfo.getUserNo());
             if (CollectionUtil.isNotEmpty(child.getTruckList())) {
-                orderGoodsTruckBindDao.saveBatchEntity(orderNo, OrderGoodsTypeEnum.Status.PLATFORM.getCode() + beginOrderGoodsId, child.getTruckList(), now);
+                orderGoodsTruckBindDao.saveBatchEntity(orderNo, orderNoPrefix+ beginOrderGoodsId, child.getTruckList(), now);
             }
-            mqMap.put(OrderGoodsTypeEnum.Status.PLATFORM.getCode() + beginOrderGoodsId, postedTime);
-            orderGoodsStatusLazyComponent.expireProduce(orderGoods.getLastArriveSendTime(),OrderGoodsTypeEnum.Status.PLATFORM.getCode() + beginOrderGoodsId);
+            mqMap.put(orderNoPrefix + beginOrderGoodsId, postedTime);
+            orderGoodsStatusLazyComponent.expireProduce(orderGoods.getLastArriveSendTime(), orderNoPrefix + beginOrderGoodsId);
 
             beginOrderGoodsId = beginOrderGoodsId + 1;
             orderGoodsList.add(orderGoods);

performance-web/src/main/java/com/clx/performance/strategy/impl/ThreeGoodsOrderStrategy.java

@@ -151,10 +151,10 @@ public class ThreeGoodsOrderStrategy implements GoodsOrderStrategy, Initializing
             orderGoods.setUserName(loginUserInfo.getUserName());
             orderGoods.setUserNo(loginUserInfo.getUserNo());
             if (CollectionUtil.isNotEmpty(child.getTruckList())) {
-                orderGoodsTruckBindDao.saveBatchEntity(orderNo, OrderGoodsTypeEnum.Status.PLATFORM.getCode() + beginOrderGoodsId, child.getTruckList(), now);
+                orderGoodsTruckBindDao.saveBatchEntity(orderNo, orderNoPrefix + beginOrderGoodsId, child.getTruckList(), now);
             }
-            mqMap.put(OrderGoodsTypeEnum.Status.PLATFORM.getCode() + beginOrderGoodsId, postedTime);
-            orderGoodsStatusLazyComponent.expireProduce(orderGoods.getLastArriveSendTime(),OrderGoodsTypeEnum.Status.PLATFORM.getCode() + beginOrderGoodsId);
+            mqMap.put(orderNoPrefix + beginOrderGoodsId, postedTime);
+            orderGoodsStatusLazyComponent.expireProduce(orderGoods.getLastArriveSendTime(), orderNoPrefix + beginOrderGoodsId);
 
             beginOrderGoodsId = beginOrderGoodsId + 1;
 

performance-web/src/main/java/com/clx/performance/strategy/impl/TwoGoodsOrderStrategy.java

@@ -161,10 +161,10 @@ public class TwoGoodsOrderStrategy implements GoodsOrderStrategy, InitializingBe
             orderGoods.setUserName(loginUserInfo.getUserName());
             orderGoods.setUserNo(loginUserInfo.getUserNo());
             if (CollectionUtil.isNotEmpty(child.getTruckList())) {
-                orderGoodsTruckBindDao.saveBatchEntity(orderNo, OrderGoodsTypeEnum.Status.PLATFORM.getCode() + beginOrderGoodsId, child.getTruckList(), now);
+                orderGoodsTruckBindDao.saveBatchEntity(orderNo, orderNoPrefix + beginOrderGoodsId, child.getTruckList(), now);
             }
-            mqMap.put(OrderGoodsTypeEnum.Status.PLATFORM.getCode() + beginOrderGoodsId, postedTime);
-            orderGoodsStatusLazyComponent.expireProduce(orderGoods.getLastArriveSendTime(), OrderGoodsTypeEnum.Status.PLATFORM.getCode() + beginOrderGoodsId);
+            mqMap.put(orderNoPrefix + beginOrderGoodsId, postedTime);
+            orderGoodsStatusLazyComponent.expireProduce(orderGoods.getLastArriveSendTime(), orderNoPrefix + beginOrderGoodsId);
 
             beginOrderGoodsId = beginOrderGoodsId + 1;
             orderGoodsList.add(orderGoods);