取消支付修改为30秒

share-common/src/main/java/share/common/constant/Constants.java

@@ -27,7 +27,7 @@ public class Constants
     // 订单锁定Key
     public static final String ORDER_LOCK_KEY = "order_lock_key";
     //订单锁定
-    public static final String ORDER_LOCK_KEY_PREFIX = "order_lock_key_prefix:";
+    public static final String ORDER_LOCK_KEY_PREFIX = "order_lock_key_prefix.";
     //测试环境,经测试需要,手机验证码测试环境可以不需要就能登录,value为1,则不验证验证码
     public static final String PHONE_TEST_KEY = "phone_test_key";
     //通过uuid缓存的key 查找对应的 token数据   WX_TOKEN_USER:TOKEN

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

@@ -780,7 +780,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
         if(CollectionUtils.isNotEmpty(roomIds)) {
             queryWrapper.in(SOrder::getRoomId, roomIds);
         }
-        queryWrapper.eq(SOrder::getPayStatus, YesNoEnum.yes.getIndex());
+//        queryWrapper.eq(SOrder::getPayStatus, YesNoEnum.yes.getIndex());
         queryWrapper.notIn(SOrder::getRefundStatus, RefundStatusEnum.getRefundedStatus());
         queryWrapper.in(SOrder::getStatus, OrderStatusEnum.getValidOrderStatus());
         queryWrapper.eq(SOrder::getIsDelete, YesNoEnum.no.getIndex());
@@ -1047,7 +1047,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
         LambdaQueryWrapper<SOrder> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.notIn(SOrder::getRefundStatus, RefundStatusEnum.getRefundedStatus());
         queryWrapper.in(SOrder::getStatus, OrderStatusEnum.getValidOrderStatus());
-        queryWrapper.eq(SOrder::getPayStatus, YesNoEnum.yes.getIndex());
+//        queryWrapper.eq(SOrder::getPayStatus, YesNoEnum.yes.getIndex());
         queryWrapper.eq(SOrder::getIsDelete,YesNoEnum.no.getIndex());
         queryWrapper.eq(SOrder::getStoreId, request.getStoreId());
         queryWrapper.eq(SOrder::getRoomId, request.getRoomId());
@@ -1341,7 +1341,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
     public boolean cancelPay(String orderNo) {
         Map<String, String> map = new HashMap<>();
         map.put("orderNo", orderNo);
-        Date date = DateUtils.addMinutes(new Date(), 5);
+        Date date = DateUtils.addSeconds(new Date(), 30);
         map.put("expirationTime", date.toString());
         JSONObject jsonObject = new JSONObject(map);
         redisUtil.set(ReceiptRdeisEnum.ORDER_CANCEL_PAY.getValue() + orderNo, jsonObject.toString());