feature 1.修改依赖redisson版本号

order-management-invoice/pom.xml

@@ -20,7 +20,7 @@
         <dependency>
             <groupId>org.redisson</groupId>
             <artifactId>redisson-spring-boot-starter</artifactId>
-            <version>3.23.1</version>
+            <version>3.12.5</version>
         </dependency>
         <!-- Spring Boot dependencies -->
         <!--Spring Boot 初始化引用-->

order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/OrderInvoiceInfoServiceImpl.java

@@ -1705,8 +1705,8 @@ public class OrderInvoiceInfoServiceImpl implements OrderInvoiceInfoService {
         return redInvoiceRespPo;
     }
 
-//    @Resource
+    @Resource
-//    private RedissonClient redisson;
+    private RedissonClient redisson;
 
     @SneakyThrows
     @Override
@@ -1718,12 +1718,12 @@ public class OrderInvoiceInfoServiceImpl implements OrderInvoiceInfoService {
         //组装发票报文
         //金额、数量、税额跟跟换为负数，折扣行要与被折扣行合并
         //校验重复提交数据覆盖问题
-//        RLock lock = redisson.getLock(redInvoiceSaveReqPo.getFpqqlsh());
+        RLock lock = redisson.getLock(redInvoiceSaveReqPo.getFpqqlsh());
 //        boolean redRedisLock = redisService.setNx(redInvoiceSaveReqPo.getFpqqlsh(), key, RedisConstant.REDIS_EXPIRE_TIME_2HOUR);
         for (int i = 0; i < 3; i++) {
-//            try {
+            try {
-//                if(!lock.isLocked()){
+                if(!lock.isLocked()){
-//                    lock.lock();
+                    lock.lock();
                     Map<String, String> paramMap = redisService.pullAllHashMap(key);
                     if(paramMap != null){
                         String value = redisService.pullHashMap(key, innerKey);
@@ -1750,16 +1750,16 @@ public class OrderInvoiceInfoServiceImpl implements OrderInvoiceInfoService {
                         redisService.set(redSyjeKey,syfpje);
                         hashMap.put(redItemList.get(0).getId(),syfpje);
                     }
-//                    lock.unlock();
+                    lock.unlock();
                     return R.ok().put(OrderManagementConstant.DATA,hashMap);
-//                } else {
+                } else {
-//                    Thread.sleep(2000);
+                    Thread.sleep(2000);
-//                    log.info("获取redis锁请等待，三次之后还是获取锁失败则返回。。。");
+                    log.info("获取redis锁请等待，三次之后还是获取锁失败则返回。。。");
-//                }
+                }
-//            } catch (InterruptedException e) {
+            } catch (InterruptedException e) {
-//                lock.unlock();
+                lock.unlock();
-//                throw new RuntimeException(e);
+                throw new RuntimeException(e);
-//            }
+            }
         }
         return R.ok();
     }