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

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

@@ -154,8 +154,8 @@ public class OneGoodsOrderStrategy implements GoodsOrderStrategy, InitializingBe
             if (CollectionUtil.isNotEmpty(child.getTruckList())) {
                 orderGoodsTruckBindDao.saveBatchEntity(orderNo, OrderGoodsTypeEnum.Status.PLATFORM.getCode() + 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(), OrderGoodsTypeEnum.Status.PLATFORM.getCode() + beginOrderGoodsId);
 
             beginOrderGoodsId = beginOrderGoodsId + 1;
             orderGoodsList.add(orderGoods);

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

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

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

@@ -163,7 +163,7 @@ public class TwoGoodsOrderStrategy implements GoodsOrderStrategy, InitializingBe
             if (CollectionUtil.isNotEmpty(child.getTruckList())) {
                 orderGoodsTruckBindDao.saveBatchEntity(orderNo, OrderGoodsTypeEnum.Status.PLATFORM.getCode() + beginOrderGoodsId, child.getTruckList(), now);
             }
-            mqMap.put(OrderGoodsTypeEnum.Status.PLATFORM.getCode() + beginOrderGoodsId, postedTime);
+            mqMap.put(orderNoPrefix + beginOrderGoodsId, postedTime);
             orderGoodsStatusLazyComponent.expireProduce(orderGoods.getLastArriveSendTime(), OrderGoodsTypeEnum.Status.PLATFORM.getCode() + beginOrderGoodsId);
 
             beginOrderGoodsId = beginOrderGoodsId + 1;