xiongzhu hace 3 años
padre
commit
8927dd1861

+ 2 - 2
src/main/java/com/izouma/nineth/service/OrderService.java

@@ -745,12 +745,12 @@ public class OrderService {
     }
 
     public boolean getOrderLock(Long orderId) {
-        BoundValueOperations<String, Object> ops = redisTemplate.boundValueOps("orderLock::" + orderId);
+        BoundValueOperations<String, Object> ops = redisTemplate.boundValueOps(RedisKeys.ORDER_LOCK + orderId);
         Boolean flag = ops.setIfAbsent(1, 1, TimeUnit.DAYS);
         return Boolean.TRUE.equals(flag);
     }
 
     public void releaseOrderLock(Long orderId) {
-        redisTemplate.delete("orderLock::" + orderId);
+        redisTemplate.delete(RedisKeys.ORDER_LOCK + orderId);
     }
 }

+ 3 - 2
src/main/java/com/izouma/nineth/web/OrderNotifyController.java

@@ -13,6 +13,7 @@ import com.huifu.adapay.core.AdapayCore;
 import com.huifu.adapay.core.util.AdapaySign;
 import com.izouma.nineth.config.AlipayProperties;
 import com.izouma.nineth.config.GeneralProperties;
+import com.izouma.nineth.config.RedisKeys;
 import com.izouma.nineth.enums.PayMethod;
 import com.izouma.nineth.event.OrderNotifyEvent;
 import com.izouma.nineth.repo.ErrorOrderRepo;
@@ -197,7 +198,7 @@ public class OrderNotifyController {
                 String id = jsonObject.getString("id");
                 PayMethod payMethod = channel.startsWith("wx") ? PayMethod.WEIXIN : PayMethod.ALIPAY;
 
-                BoundSetOperations<String, Object> listOps = redisTemplate.boundSetOps("orderNotify::" + orderId);
+                BoundSetOperations<String, Object> listOps = redisTemplate.boundSetOps(RedisKeys.PAY_RECORD + orderId);
                 listOps.add(id);
                 listOps.expire(7, TimeUnit.DAYS);
 
@@ -211,7 +212,7 @@ public class OrderNotifyController {
     @ResponseBody
     public void adapayNotifyTest(@PathVariable Long orderId, @RequestParam String transactionId) throws Exception {
         if (Arrays.asList(env.getActiveProfiles()).contains("notifytest")) {
-            BoundSetOperations<String, Object> listOps = redisTemplate.boundSetOps("orderNotify::" + orderId);
+            BoundSetOperations<String, Object> listOps = redisTemplate.boundSetOps(RedisKeys.PAY_RECORD + orderId);
             listOps.add(transactionId);
             listOps.expire(7, TimeUnit.DAYS);
             rocketMQTemplate.syncSend(generalProperties.getOrderNotifyTopic(),