Compare commits
3 Commits
7ec7522357
...
b46341bd32
| Author | SHA1 | Date |
|---|---|---|
 科技小王子
|
b46341bd32 | 3 days ago |
|
科技小王子
|
210efaf470 | 3 days ago |
|
科技小王子
|
3546be75e4 | 5 days ago |
11 changed files with 310 additions and 335 deletions
@ -1,33 +0,0 @@ |
|||
-- 快速支付配置检查SQL |
|||
-- 请在数据库中执行此查询 |
|||
|
|||
SELECT |
|||
'=== 支付配置检查 ===' as title, |
|||
tenant_id as '租户ID', |
|||
CASE |
|||
WHEN mch_id IS NULL OR mch_id = '' THEN '❌ 未配置' |
|||
ELSE CONCAT('✅ ', mch_id) |
|||
END as '商户号', |
|||
CASE |
|||
WHEN app_id IS NULL OR app_id = '' THEN '❌ 未配置' |
|||
ELSE CONCAT('✅ ', app_id) |
|||
END as '应用ID', |
|||
CASE |
|||
WHEN merchant_serial_number IS NULL OR merchant_serial_number = '' THEN '❌ 未配置' |
|||
ELSE '✅ 已配置' |
|||
END as '证书序列号', |
|||
CASE |
|||
WHEN api_key IS NULL OR api_key = '' THEN '❌ 未配置' |
|||
WHEN LENGTH(api_key) != 32 THEN CONCAT('❌ 长度错误(', LENGTH(api_key), '位)') |
|||
ELSE '✅ 已配置(32位)' |
|||
END as 'API密钥', |
|||
CASE |
|||
WHEN status = 1 THEN '✅ 已启用' |
|||
ELSE '❌ 未启用' |
|||
END as '状态' |
|||
FROM sys_payment |
|||
WHERE type = 0 -- 微信支付 |
|||
ORDER BY tenant_id; |
|||
|
|||
-- 如果上面的查询没有返回结果，说明没有微信支付配置，请执行： |
|||
-- SELECT COUNT(*) as '微信支付配置数量' FROM sys_payment WHERE type = 0; |
|||
@ -1,182 +0,0 @@ |
|||
package com.gxwebsoft.shop; |
|||
|
|||
import com.gxwebsoft.shop.entity.ShopOrder; |
|||
import com.gxwebsoft.shop.service.ShopOrderService; |
|||
import com.gxwebsoft.shop.service.OrderCancelService; |
|||
import com.gxwebsoft.shop.config.OrderConfigProperties; |
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.junit.jupiter.api.Test; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.boot.test.context.SpringBootTest; |
|||
|
|||
import java.time.LocalDateTime; |
|||
import java.time.format.DateTimeFormatter; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* 订单查询测试 |
|||
*/ |
|||
@Slf4j |
|||
@SpringBootTest |
|||
public class OrderQueryTest { |
|||
|
|||
@Autowired |
|||
private ShopOrderService shopOrderService; |
|||
|
|||
@Autowired |
|||
private OrderCancelService orderCancelService; |
|||
|
|||
@Autowired |
|||
private OrderConfigProperties orderConfig; |
|||
|
|||
@Test |
|||
public void testQuerySpecificOrder() { |
|||
String orderNo = "1957754623870595072"; |
|||
log.info("查询订单号: {}", orderNo); |
|||
|
|||
ShopOrder order = shopOrderService.getByOutTradeNo(orderNo); |
|||
if (order != null) { |
|||
log.info("订单信息:"); |
|||
log.info(" 订单ID: {}", order.getOrderId()); |
|||
log.info(" 订单号: {}", order.getOrderNo()); |
|||
log.info(" 订单状态: {} (0=待支付, 1=待发货, 2=已取消, 3=已完成)", order.getOrderStatus()); |
|||
log.info(" 支付状态: {} (false=未支付, true=已支付)", order.getPayStatus()); |
|||
log.info(" 创建时间: {}", order.getCreateTime()); |
|||
log.info(" 支付时间: {}", order.getPayTime()); |
|||
log.info(" 取消时间: {}", order.getCancelTime()); |
|||
log.info(" 租户ID: {}", order.getTenantId()); |
|||
log.info(" 订单金额: {}", order.getTotalPrice()); |
|||
log.info(" 取消原因: {}", order.getCancelReason()); |
|||
|
|||
// 检查是否符合自动取消条件
|
|||
checkAutoCancelConditions(order); |
|||
|
|||
// 计算什么时候会符合自动取消条件
|
|||
calculateCancelTime(order); |
|||
} else { |
|||
log.warn("未找到订单号为 {} 的订单", orderNo); |
|||
} |
|||
} |
|||
|
|||
private void checkAutoCancelConditions(ShopOrder order) { |
|||
log.info("\n=== 检查自动取消条件 ==="); |
|||
|
|||
// 1. 检查订单状态
|
|||
boolean statusOk = (order.getOrderStatus() != null && order.getOrderStatus() == 0); |
|||
log.info("1. 订单状态检查: {} (需要为0-待支付)", statusOk ? "✓通过" : "✗不通过"); |
|||
|
|||
// 2. 检查支付状态
|
|||
boolean payStatusOk = (order.getPayStatus() != null && !order.getPayStatus()); |
|||
log.info("2. 支付状态检查: {} (需要为false-未支付)", payStatusOk ? "✓通过" : "✗不通过"); |
|||
|
|||
// 3. 检查创建时间是否超时
|
|||
if (order.getCreateTime() != null) { |
|||
LocalDateTime createTime = order.getCreateTime(); |
|||
LocalDateTime now = LocalDateTime.now(); |
|||
|
|||
// 获取超时配置
|
|||
Integer timeoutMinutes = getTimeoutMinutes(order.getTenantId()); |
|||
LocalDateTime expireTime = createTime.plusMinutes(timeoutMinutes); |
|||
|
|||
boolean timeoutOk = now.isAfter(expireTime); |
|||
long minutesElapsed = java.time.Duration.between(createTime, now).toMinutes(); |
|||
|
|||
log.info("3. 超时检查:"); |
|||
log.info(" 创建时间: {}", createTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); |
|||
log.info(" 当前时间: {}", now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); |
|||
log.info(" 超时配置: {}分钟", timeoutMinutes); |
|||
log.info(" 过期时间: {}", expireTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); |
|||
log.info(" 已过时间: {}分钟", minutesElapsed); |
|||
log.info(" 是否超时: {} (需要超过{}分钟)", timeoutOk ? "✓是" : "✗否", timeoutMinutes); |
|||
|
|||
// 4. 综合判断
|
|||
boolean shouldCancel = statusOk && payStatusOk && timeoutOk; |
|||
log.info("\n=== 综合判断 ==="); |
|||
log.info("是否符合自动取消条件: {}", shouldCancel ? "✓是" : "✗否"); |
|||
|
|||
if (shouldCancel) { |
|||
log.info("该订单符合自动取消任务的处理条件"); |
|||
} else { |
|||
log.info("该订单不符合自动取消任务的处理条件"); |
|||
if (!statusOk) log.info(" - 订单状态不是待支付状态"); |
|||
if (!payStatusOk) log.info(" - 订单已支付"); |
|||
if (!timeoutOk) log.info(" - 订单未超时"); |
|||
} |
|||
} else { |
|||
log.warn("订单创建时间为空，无法判断是否超时"); |
|||
} |
|||
} |
|||
|
|||
private void calculateCancelTime(ShopOrder order) { |
|||
log.info("\n=== 计算自动取消时间点 ==="); |
|||
|
|||
if (order.getCreateTime() == null) { |
|||
log.warn("订单创建时间为空，无法计算取消时间"); |
|||
return; |
|||
} |
|||
|
|||
// 获取超时配置
|
|||
Integer timeoutMinutes = getTimeoutMinutes(order.getTenantId()); |
|||
LocalDateTime createTime = order.getCreateTime(); |
|||
LocalDateTime cancelTime = createTime.plusMinutes(timeoutMinutes); |
|||
LocalDateTime now = LocalDateTime.now(); |
|||
|
|||
log.info("订单创建时间: {}", createTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); |
|||
log.info("当前时间: {}", now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); |
|||
log.info("超时配置: {}分钟", timeoutMinutes); |
|||
log.info("预计取消时间: {}", cancelTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); |
|||
|
|||
if (now.isBefore(cancelTime)) { |
|||
long minutesLeft = java.time.Duration.between(now, cancelTime).toMinutes(); |
|||
long secondsLeft = java.time.Duration.between(now, cancelTime).getSeconds() % 60; |
|||
log.info("距离自动取消还有: {}分{}秒", minutesLeft, secondsLeft); |
|||
log.info("状态: ⏰ 等待中"); |
|||
} else { |
|||
long minutesOverdue = java.time.Duration.between(cancelTime, now).toMinutes(); |
|||
log.info("已超时: {}分钟", minutesOverdue); |
|||
log.info("状态: ⚠️ 应该被取消"); |
|||
|
|||
// 检查为什么没有被取消
|
|||
if (order.getPayStatus() != null && order.getPayStatus()) { |
|||
log.info("原因: 订单已支付，不会被自动取消"); |
|||
} else if (order.getOrderStatus() != null && order.getOrderStatus() != 0) { |
|||
log.info("原因: 订单状态不是待支付({}), 不会被自动取消", order.getOrderStatus()); |
|||
} else { |
|||
log.info("原因: 订单符合取消条件，可能定时任务尚未执行或执行失败"); |
|||
} |
|||
} |
|||
} |
|||
|
|||
private Integer getTimeoutMinutes(Integer tenantId) { |
|||
// 检查是否有租户特殊配置
|
|||
List<OrderConfigProperties.TenantCancelConfig> tenantConfigs = orderConfig.getAutoCancel().getTenantConfigs(); |
|||
if (tenantConfigs != null) { |
|||
for (OrderConfigProperties.TenantCancelConfig config : tenantConfigs) { |
|||
if (config.isEnabled() && config.getTenantId().equals(tenantId)) { |
|||
return config.getTimeoutMinutes(); |
|||
} |
|||
} |
|||
} |
|||
|
|||
// 使用默认配置
|
|||
return orderConfig.getAutoCancel().getDefaultTimeoutMinutes(); |
|||
} |
|||
|
|||
@Test |
|||
public void testFindExpiredOrders() { |
|||
log.info("=== 测试查找超时订单 ==="); |
|||
|
|||
Integer defaultTimeout = orderConfig.getAutoCancel().getDefaultTimeoutMinutes(); |
|||
Integer batchSize = orderConfig.getAutoCancel().getBatchSize(); |
|||
|
|||
log.info("默认超时时间: {}分钟", defaultTimeout); |
|||
log.info("批量大小: {}", batchSize); |
|||
|
|||
List<ShopOrder> expiredOrders = orderCancelService.findExpiredUnpaidOrders(defaultTimeout, batchSize); |
|||
log.info("找到{}个超时订单", expiredOrders.size()); |
|||
|
|||
for (ShopOrder order : expiredOrders) { |
|||
log.info("超时订单: {} - 创建时间: {}", order.getOrderNo(), order.getCreateTime()); |
|||
} |
|||
} |
|||
} |
|||
Loading…
Reference in new issue