完善软件购买时扣除延期时间区间、作废/待支付旧订购记录、第三方支付回调支持作废/激活旧支付记录流程

cf-framework/cf-spring-boot-starter-redis/src/main/java/com/cf/imes/framework/redis/config/ChenfengCacheAutoConfiguration.java

@@ -3,6 +3,7 @@ package com.cf.imes.framework.redis.config;
 import cn.hutool.core.text.StrPool;
 import com.cf.imes.framework.redis.core.TimeoutRedisCacheManager;
 import com.cf.imes.framework.redis.util.RedisLockUtil;
+import org.redisson.api.RedissonClient;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.cache.CacheProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -81,7 +82,7 @@ public class ChenfengCacheAutoConfiguration {
     }
 
     @Bean
-    public RedisLockUtil lockUtil(RedisTemplate<String, Object> redisTemplate) {
-        return new RedisLockUtil(redisTemplate);
+    public RedisLockUtil lockUtil(RedisTemplate<String, Object> redisTemplate, RedissonClient client) {
+        return new RedisLockUtil(redisTemplate, client);
     }
 }

cf-framework/cf-spring-boot-starter-redis/src/main/java/com/cf/imes/framework/redis/constants/RedisKeyConstants.java

@@ -19,7 +19,7 @@ public class RedisKeyConstants {
 
 
     /**
-     *
+     * 软件购买
      */
-    public static final String PAY_NOTIFY_ORDER_LOCK_KEY = "pay_recharge_order:%s%s";
+    public static final String PRODUCT_PURCHASE_LOCK_KEY = "product_purchase:%s%s";
 }

cf-framework/cf-spring-boot-starter-redis/src/main/java/com/cf/imes/framework/redis/util/RedisLockUtil.java

@@ -3,6 +3,8 @@ package com.cf.imes.framework.redis.util;
 import cn.hutool.core.util.ObjectUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.redisson.api.RLock;
+import org.redisson.api.RedissonClient;
 import org.springframework.data.redis.core.RedisTemplate;
 
 import java.util.concurrent.TimeUnit;
@@ -19,6 +21,42 @@ public class RedisLockUtil {
 
     private RedisTemplate redisTemplate;
 
+    private RedissonClient redissonClient;
+
+    /**
+     * 加锁
+     *
+     * @param key      rediskey
+     * @param timeout  锁的超时时间，传空则按照默认配置
+     * @param waitTime 等待获取锁的时间，传空则按照默认配置
+     * @return true拿到锁，反之没有做对应的业务提醒
+     */
+    public boolean redissonLock(String key, Integer waitTime, Integer timeout) {
+        boolean getLock = false;
+        try {
+            RLock rLock = redissonClient.getLock(key);
+            return rLock.tryLock(waitTime, timeout, TimeUnit.MILLISECONDS);
+        } catch (Exception e) {
+            log.error("[RedisLockUtil][lock]加锁失败", e);
+            return getLock;
+        }
+    }
+
+    /**
+     * 解锁
+     * 使用注意：配合以上redisson的lock只能在当前线程中unlock，否则失败！！！
+     *
+     * @param key rediskey
+     */
+    public void redissonReleaseLock(String key) {
+        try {
+            RLock rLock = redissonClient.getLock(key);
+            rLock.unlock();
+        } catch (Exception e) {
+            log.error("[RedisLockUtil][unlock]解锁失败", e);
+        }
+    }
+
     /**
      * 手动set nx ex加锁
      * 使用注意：可用于跨服务