修改bug 货单编号生成

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

@@ -33,53 +33,65 @@ public class OrderGoodsIdGenerate {
 
 
     public long getOrderGoodsId(Integer size) {
-        RLock rLock = null;
-        try {
-            rLock = redissonClient.getLock(RedisConstants.ORDER_NO_BLOCK + type);
-
-            rLock.lock(5, TimeUnit.SECONDS);
-            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(type);
-                if (StringUtils.isNotBlank(maxID)) {
-                    maxOrderGoodsId = Long.valueOf(maxID.substring(2));
-                }
+        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);
+                if (o == null) {
+                    Long maxOrderGoodsId = null;
+                    String maxID = orderGoodsDao.getMaxOrderGoodsId();
+                    if (StringUtils.isNotBlank(maxID)) {
+                        maxOrderGoodsId = Long.valueOf(maxID.substring(2));
+                    }
 
-                if (maxOrderGoodsId == null) {
-                    maxOrderGoodsId = 0L;
-                }
-                if (baseStart > maxOrderGoodsId) {
-                    redisTemplate.opsForHash().put(RedisConstants.ORDER_GOODS_ID, type, String.valueOf(baseStart + size));
-                    return baseStart;
+                    if (maxOrderGoodsId == null) {
+                        maxOrderGoodsId = baseStart;
+                    }
+                    if (baseStart == maxOrderGoodsId) {
+                        redisTemplate.opsForValue().increment(RedisConstants.ORDER_GOODS_ID_GENERATE, size);
+                        return baseStart;
+                    } else {
+                        redisTemplate.opsForValue().increment(RedisConstants.ORDER_GOODS_ID_GENERATE, size);
+                        return maxOrderGoodsId;
+                    }
                 } else {
-                    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;
-                }
-                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());
+                    long redisOrderGoodsId = Long.parseLong(o.toString());
+                    if (redisOrderGoodsId < baseStart) {
+                        redisOrderGoodsId = baseStart;
+                    }
 
-        } finally {
-            try {
-                if (rLock != null && rLock.isLocked()) {
-                    rLock.unlock();
+                    redisTemplate.opsForValue().increment(RedisConstants.ORDER_GOODS_ID_GENERATE, size);
+                    return redisOrderGoodsId;
                 }
-                log.info("锁释放完成货单ID生成");
+
             } catch (Exception e) {
-                log.error("redis 货单ID生成 分布式锁释放异常!", e);
+                throw new ServiceSystemException(PerformanceResultEnum.ORDER_GOODS_ID_GENERATE_LOCK, e.getMessage());
+
+            } finally {
+                try {
+                    if (rLock != null && rLock.isLocked()) {
+                        rLock.unlock();
+                    }
+                    log.info("锁释放完成货单ID生成");
+                } catch (Exception e) {
+                    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;
         }
 
     }
+
+
 }

performance-web/src/main/java/com/clx/performance/constant/RedisConstants.java

@@ -6,7 +6,7 @@ public class RedisConstants {
 
     public static final String ORDER_GOODS_ID ="clx-performance:orderGoodsId:";
 
-
+    public static final String ORDER_GOODS_ID_GENERATE ="clx-performance:orderGoodsId:generate";
     public static final String ZJXL_TRUCK_TRACE_LIST = "clx-performance:zjxl_truck_trace_list:";
 
 

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

@@ -24,7 +24,7 @@ import java.util.List;
 public interface OrderGoodsDao extends BaseDao<OrderGoodsMapper, OrderGoods, Integer> {
     boolean updateWeight(@Param("orderId")Integer orderId, @Param("weight") BigDecimal weight);
 
-    String getMaxOrderGoodsId(String type);
+    String getMaxOrderGoodsId();
 
     Optional<OrderGoods> getByOrderGoodsNo(String orderGoodsNo);
 

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

@@ -35,8 +35,8 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
     }
 
     @Override
-    public String getMaxOrderGoodsId(String type) {
-        return baseMapper.getMaxOrderGoodsId(type);
+    public String getMaxOrderGoodsId() {
+        return baseMapper.getMaxOrderGoodsId();
     }
 
     @Override

performance-web/src/main/java/com/clx/performance/mapper/OrderGoodsMapper.java

@@ -29,7 +29,7 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
     int updateWeight(@Param("orderId") Integer orderId, @Param("weight") BigDecimal weight);
 
     @SelectProvider(type = OrderGoodsSqlProvider.class, method = "getMaxOrderGoodsId")
-    String getMaxOrderGoodsId(String type);
+    String getMaxOrderGoodsId();
 
     @SelectProvider(type = OrderGoodsSqlProvider.class, method = "pageOrderGoodsList")
     IPage<OrderGoodsVO> pageOrderGoodsList(Page<OrderGoodsVO> page, PageOrderGoodsListParam param);

performance-web/src/main/java/com/clx/performance/sqlProvider/OrderGoodsSqlProvider.java

@@ -16,7 +16,6 @@ public class OrderGoodsSqlProvider {
 
     public String getMaxOrderGoodsId(String type) {
         return "SELECT s.order_goods_no FROM  `order_goods` s WHERE s. id = ( SELECT max(id) FROM order_goods )";
-//        return "SELECT s.order_goods_no FROM  `order_goods` s WHERE s. id = ( SELECT max(id) FROM order_goods where order_goods_type = '" + type + "')";
     }
 
     public String pageOrderGoodsList(@Param("param") PageOrderGoodsListParam param) {