增加退款锁

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/constant/GoblinRedisConst.java

@@ -461,6 +461,12 @@ public class GoblinRedisConst {
      */
     public static final String REFUND_ORDER_LOCK = PREFIX.concat("refund:lock:");
 
+    /**
+     * 收钱吧退款库存已归还标记（防回调重复还库存）
+     * {goblin:sqb:refund:stock:${orderId}}
+     */
+    public static final String SQB_REFUND_STOCK_FLAG = PREFIX.concat("sqb:refund:stock:");
+
     /**
      * 收钱吧 用户订单列表
      */

liquidnet-bus-common/liquidnet-common-service-base/src/main/java/com/liquidnet/service/base/constant/RedisKeyExpireConst.java

@@ -67,6 +67,16 @@ public class RedisKeyExpireConst {
      */
     public static final long SQB_ORDER_LOCK_EXPIRE = 10;
 
+    /**
+     * 收钱吧退款锁过期时间 (60秒，覆盖调收钱吧退款 API)
+     */
+    public static final long SQB_REFUND_LOCK_EXPIRE = 60;
+
+    /**
+     * 收钱吧退款库存归还标记过期时间 (30天)
+     */
+    public static final long SQB_REFUND_STOCK_FLAG_EXPIRE = 30 * 24 * 60 * 60;
+
     // 已发布状态徽章过期时间：30天
     public static final long CAOMEI_BADGE_PUBLISHED_EXPIRE = 30 * 24 * 60 * 60;
 }

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinSqbRedisUtils.java

@@ -90,6 +90,27 @@ public class GoblinSqbRedisUtils {
         redisUtil.uLock(key);
     }
 
+    /* ---------------------------------------- 退款锁 / 库存归还幂等 ---------------------------------------- */
+
+    /**
+     * 尝试获取收钱吧退款锁（发起退款与退款回调共用，按 orderId）
+     */
+    public boolean tryRefundLock(String orderId) {
+        String key = GoblinRedisConst.REFUND_ORDER_LOCK.concat(orderId);
+        return redisUtil.lock(key, 1, RedisKeyExpireConst.SQB_REFUND_LOCK_EXPIRE);
+    }
+
+    public void releaseRefundLock(String orderId) {
+        redisUtil.uLock(GoblinRedisConst.REFUND_ORDER_LOCK.concat(orderId));
+    }
+
+    /**
+     * 标记退款库存已归还。首次标记成功返回 true（应执行 incrSkuStock），已标记过返回 false。
+     */
+    public boolean tryMarkRefundStockRestored(String orderId) {
+        String key = GoblinRedisConst.SQB_REFUND_STOCK_FLAG.concat(orderId);
+        return redisUtil.lock(key, 1, RedisKeyExpireConst.SQB_REFUND_STOCK_FLAG_EXPIRE);
+    }
 
     // 获取 收钱吧订单id列表
     public List<String> getSqbOrderList(String uid) {

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/GoblinSqbRedisUtils.java

@@ -88,6 +88,28 @@ public class GoblinSqbRedisUtils {
         redisUtil.uLock(key);
     }
 
+    /* ---------------------------------------- 退款锁 / 库存归还幂等 ---------------------------------------- */
+
+    /**
+     * 尝试获取收钱吧退款锁（发起退款与退款回调共用，按 orderId）
+     */
+    public boolean tryRefundLock(String orderId) {
+        String key = GoblinRedisConst.REFUND_ORDER_LOCK.concat(orderId);
+        return redisUtil.lock(key, 1, RedisKeyExpireConst.SQB_REFUND_LOCK_EXPIRE);
+    }
+
+    public void releaseRefundLock(String orderId) {
+        redisUtil.uLock(GoblinRedisConst.REFUND_ORDER_LOCK.concat(orderId));
+    }
+
+    /**
+     * 标记退款库存已归还。首次标记成功返回 true（应执行 incrSkuStock），已标记过返回 false。
+     */
+    public boolean tryMarkRefundStockRestored(String orderId) {
+        String key = GoblinRedisConst.SQB_REFUND_STOCK_FLAG.concat(orderId);
+        return redisUtil.lock(key, 1, RedisKeyExpireConst.SQB_REFUND_STOCK_FLAG_EXPIRE);
+    }
+
     /**
      * 添加用户 收钱吧订单列表
      *