订单取消支付修改为定时任务

share-common/src/main/java/share/common/enums/ReceiptRdeisEnum.java

@@ -12,6 +12,7 @@ public enum ReceiptRdeisEnum {
     TIKTOK_CLIENT_TOKEN_KEY(8, "TIKTOK_CLIENT_TOKEN_KEY"),
     //房间15分钟过期
     ROOM_EXPIRE_TIME(9, "ROOM_EXPIRE_TIME."),
+    ORDER_CANCEL_PAY(10, "ORDER_CANCEL_PAY."),
     ;
 
 

share-quartz/src/main/java/share/quartz/task/RedisTask.java

@@ -28,6 +28,7 @@ import share.system.domain.*;
 import share.system.domain.vo.MqttxVo;
 import share.system.service.*;
 
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -403,4 +404,26 @@ public class RedisTask {
         });
     }
 
+    public void AutoOrderCancelPay() {
+        Set<String> keys = redisTemplate.keys(ReceiptRdeisEnum.ORDER_CANCEL_PAY + "*");
+        if (keys.size() == 0) {
+            return;
+        }
+        keys.stream().forEach(key -> {
+            String value = redisUtil.get(String.valueOf(key));
+            JSONObject jsonObject = new JSONObject(value);
+            Date expirationTime = jsonObject.getDate("expirationTime");
+            String orderNo = jsonObject.getStr("orderNo");
+            if (expirationTime.getTime() < new Date().getTime()) {
+                SOrder byOrderNo = orderService.getByOrderNo(orderNo);
+                if (ObjectUtils.isEmpty(byOrderNo.getPayTime()) && byOrderNo.getPayPrice().compareTo(BigDecimal.ZERO) > 0) {
+                    orderService.removeById(byOrderNo.getId());
+                    redisUtil.delete(key);
+                } else {
+                    redisUtil.delete(key);
+                }
+            }
+        });
+    }
+
 }

share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java

@@ -1272,11 +1272,12 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
 
     @Override
     public boolean cancelPay(String orderNo) {
-        SOrder order = getByOrderNo(orderNo);
-        if (Objects.isNull(order)) {
-            throw new BaseException("订单不存在！");
-        }
-        removeById(order.getId());
+        Map<String, String> map = new HashMap<>();
+        map.put("orderNo", orderNo);
+        Date date = DateUtils.addMinutes(new Date(), 5);
+        map.put("expirationTime", date.toString());
+        JSONObject jsonObject = new JSONObject(map);
+        redisUtil.set(ReceiptRdeisEnum.ORDER_CANCEL_PAY.getValue() + orderNo, jsonObject);
         return true;
     }