From 5f4a987c26096ca56271be38cdd8baf7418d53a1 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Wed, 3 Sep 2025 11:44:24 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E8=BF=87=E6=9C=9F=E6=89=AB=E4=B8=80?=
 =?UTF-8?q?=E6=89=AB=E8=AE=A2=E5=8D=95=E7=9B=B4=E6=8E=A5=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pjcloud/hard/redis/config/RedisConfig.java | 18 ++++++++++++++++++
 .../impl/order/HardOrderServiceImpl.java       |  9 ++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/redis/config/RedisConfig.java

diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/redis/config/RedisConfig.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/redis/config/RedisConfig.java
new file mode 100644
index 000000000..d81a2f85f
--- /dev/null
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/redis/config/RedisConfig.java
@@ -0,0 +1,18 @@
+package com.bsd.pjcloud.hard.redis.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.listener.RedisMessageListenerContainer;
+import org.springframework.stereotype.Component;
+
+@Component
+public class RedisConfig {
+
+    @Bean
+    public RedisMessageListenerContainer container(RedisConnectionFactory connectionFactory) {
+        RedisMessageListenerContainer container = new RedisMessageListenerContainer();
+        container.setConnectionFactory(connectionFactory);
+        return container;
+    }
+
+}
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java
index d12ee5ffc..28003b7b2 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java
@@ -5,6 +5,7 @@ import cn.hutool.extra.spring.SpringUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.alipay.api.response.AlipayTradePayResponse;
+import com.baomidou.lock.annotation.Lock4j;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -82,6 +83,7 @@ import com.bsd.pjcloud.wallet.api.vo.WalletManageVo;
 import com.bsd.pjcloud.wallet.api.vo.WalletSettingVo;
 import com.bsd.pjcloud.wallet.api.vo.mch.MchRuleJoinDtoVo;
 import jakarta.validation.Valid;
+import lombok.Locked;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Lazy;
@@ -413,9 +415,9 @@ public class HardOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardOrder
 
         // String qrCodeData = String.format("https://stgl.pj.gov.cn/h5/#/pages/pay/scanPay?action=harQrCodeScanPay&orderId=%s&mchId=%s", orderObj.getId(), orderObj.getMerchantId());
 
-        // 在redis里存储订单id如果30分钟没有支付就删除订单
+        // 在redis里存储订单id如果5分钟没有支付就删除订单
         String redisKey = String.format("%s:%s", CacheConstants.HARDER_ORDER_NON_PAY, orderObj.getId());
-        redisTemplate.opsForValue().set(redisKey, String.valueOf(orderObj.getId()), 30, TimeUnit.MINUTES);
+        redisTemplate.opsForValue().set(redisKey, String.valueOf(orderObj.getId()), 300, TimeUnit.SECONDS);
 
         String qrCodeData = String.format("http://192.168.101.173:8889/h5/#/pages/pay/scanPay?action=harQrCodeScanPay&orderId=%s&mchId=%s", orderObj.getId(), orderObj.getMerchantId());
         return HardCreateHardQrCodeScanOrderVo.builder().orderId(orderObj.getId()).mchId(orderObj.getMerchantId()).qrCodeData(qrCodeData).build();
@@ -425,6 +427,7 @@ public class HardOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardOrder
      * 用户确认设备二维码扫一扫订单
      */
     @Override
+    @Lock4j(keys = {"#dto.orderId"})
     @Transactional(rollbackFor = Exception.class)
     public void doneHardQrCodeScanOrder(HardDoneHardQrCodeScanOrderDto dto, PjcloudUser user) {
         // 查询订单
@@ -466,7 +469,7 @@ public class HardOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardOrder
         // 钱包扣款
         getSelf().fastReduceBalance(order);
 
-        // 在redis里存储订单id如果30分钟没有支付就删除订单(这里删除一下)
+        // 在redis里存储订单id如果5分钟没有支付就删除订单(这里删除一下)
         String redisKey = String.format("%s:%s", CacheConstants.HARDER_ORDER_NON_PAY, order.getId());
         redisTemplate.delete(redisKey);
     }