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

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

@@ -13,6 +13,7 @@ import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.data.redis.core.ZSetOperations;
 import org.springframework.stereotype.Component;
@@ -30,7 +31,7 @@ import java.util.Set;
 public class OrderGoodsStatusLazyComponent implements InitializingBean {
 
     @Autowired
-    private StringRedisTemplate stringRedisTemplate;
+    private RedisTemplate<String,String> redisTemplate;
 
     @Autowired
     private OrderGoodsDao orderGoodsDao;
@@ -39,7 +40,7 @@ public class OrderGoodsStatusLazyComponent implements InitializingBean {
     private OrderFeign orderFeign;
 
     public void expireProduce(LocalDateTime localDateTime, String orderGoodsNo) {
-        stringRedisTemplate.opsForZSet().add(RedisConstants.ORDER_GOODS_STATUS_LAZY, orderGoodsNo, localDateTime.toInstant(ZoneOffset.of("+8")).toEpochMilli());
+        redisTemplate.opsForZSet().add(RedisConstants.ORDER_GOODS_STATUS_LAZY, orderGoodsNo, localDateTime.toInstant(ZoneOffset.of("+8")).toEpochMilli());
     }
 
 
@@ -49,7 +50,7 @@ public class OrderGoodsStatusLazyComponent implements InitializingBean {
         log.info("货单已完结定时器启动");
         long nowTimeMillis = System.currentTimeMillis();
         LocalDateTime nowDateTime = new Date(nowTimeMillis).toInstant().atOffset(ZoneOffset.of("+8")).toLocalDateTime();
-        Set<ZSetOperations.TypedTuple<String>> orderGoodsIds = stringRedisTemplate.opsForZSet().rangeByScoreWithScores(
+        Set<ZSetOperations.TypedTuple<String>> orderGoodsIds = redisTemplate.opsForZSet().rangeByScoreWithScores(
                 RedisConstants.ORDER_GOODS_STATUS_LAZY,
                 0, nowTimeMillis  //延时任务score最小值
                 //延时任务score最大值（当前时间）
@@ -95,7 +96,7 @@ public class OrderGoodsStatusLazyComponent implements InitializingBean {
                     //返还订单剩余吨数
                     orderFeign.updateOrderInfo(updateOrderInfoParam);
                 }
-                stringRedisTemplate.opsForZSet().remove(RedisConstants.ORDER_GOODS_STATUS_LAZY, orderGoodsId.getValue());
+                redisTemplate.opsForZSet().remove(RedisConstants.ORDER_GOODS_STATUS_LAZY, orderGoodsId.getValue());
                 log.info("删除redis ORDER_GOODS_STATUS_LAZY id: {}", orderGoodsId.getValue());
 
             }
@@ -107,7 +108,7 @@ public class OrderGoodsStatusLazyComponent implements InitializingBean {
         Optional<List<OrderGoods>> optional = orderGoodsDao.getOrderGoodsList();
         if (optional.isPresent()) {
             for (OrderGoods orderGoods : optional.get()) {
-                stringRedisTemplate.opsForZSet().add(RedisConstants.ORDER_GOODS_STATUS_LAZY, orderGoods.getOrderGoodsNo(), orderGoods.getLastArriveSendTime().toInstant(ZoneOffset.of("+8")).toEpochMilli());
+                redisTemplate.opsForZSet().add(RedisConstants.ORDER_GOODS_STATUS_LAZY, orderGoods.getOrderGoodsNo(), orderGoods.getLastArriveSendTime().toInstant(ZoneOffset.of("+8")).toEpochMilli());
             }
         }
     }