ID生成

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

@@ -33,14 +33,13 @@ public class OrderGoodsIdGenerate {
 
 
     public long getOrderGoodsId(Integer size) {
-        long baseStart = Long.parseLong(DateUtils.formatDate(LocalDate.now(), "yyyyMMdd").get() + "00001");
-        Object o = redisTemplate.opsForValue().get(RedisConstants.ORDER_GOODS_ID_GENERATE);
-        if (o == null) {
         RLock rLock = null;
         try {
             rLock = redissonClient.getLock(RedisConstants.ORDER_NO_BLOCK + type);
+
             rLock.lock(5, TimeUnit.SECONDS);
-                o = redisTemplate.opsForValue().get(RedisConstants.ORDER_GOODS_ID_GENERATE);
+            long baseStart = Long.parseLong(DateUtils.formatDate(LocalDate.now(), "yyyyMMdd").get() + "00001");
+            Object o = redisTemplate.opsForHash().get(RedisConstants.ORDER_GOODS_ID, type);
             if (o == null) {
                 Long maxOrderGoodsId = null;
                 String maxID = orderGoodsDao.getMaxOrderGoodsId();
@@ -49,25 +48,25 @@ public class OrderGoodsIdGenerate {
                 }
 
                 if (maxOrderGoodsId == null) {
-                        maxOrderGoodsId = baseStart;
+                    maxOrderGoodsId = 0L;
                 }
-                    if (baseStart == maxOrderGoodsId) {
-                        redisTemplate.opsForValue().increment(RedisConstants.ORDER_GOODS_ID_GENERATE, size);
+                if (baseStart > maxOrderGoodsId) {
+                    redisTemplate.opsForHash().put(RedisConstants.ORDER_GOODS_ID, type, String.valueOf(baseStart + size));
                     return baseStart;
                 } else {
-                        redisTemplate.opsForValue().increment(RedisConstants.ORDER_GOODS_ID_GENERATE, size);
-                        return maxOrderGoodsId;
+                    long orderGoodsId = maxOrderGoodsId + size;
+                    redisTemplate.opsForHash().put(RedisConstants.ORDER_GOODS_ID, type, String.valueOf(orderGoodsId));
+                    return maxOrderGoodsId + 1;
                 }
             } else {
                 long redisOrderGoodsId = Long.parseLong(o.toString());
                 if (redisOrderGoodsId < baseStart) {
                     redisOrderGoodsId = baseStart;
                 }
-
-                    redisTemplate.opsForValue().increment(RedisConstants.ORDER_GOODS_ID_GENERATE, size);
+                long orderGoodsId = redisOrderGoodsId + size;
+                redisTemplate.opsForHash().put(RedisConstants.ORDER_GOODS_ID, type, String.valueOf(orderGoodsId));
                 return redisOrderGoodsId;
             }
-
         } catch (Exception e) {
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_GOODS_ID_GENERATE_LOCK, e.getMessage());
 
@@ -81,16 +80,6 @@ public class OrderGoodsIdGenerate {
                 log.error("redis 货单ID生成 分布式锁释放异常!", e);
             }
         }
-        } else {
-            long redisOrderGoodsId = Long.parseLong(o.toString());
-            if (redisOrderGoodsId < baseStart) {
-                redisOrderGoodsId = baseStart;
-            }
-            redisTemplate.opsForValue().increment(RedisConstants.ORDER_GOODS_ID_GENERATE, size);
-            return redisOrderGoodsId;
-        }
 
     }
-
-
 }