From 45f9eb306184ac0f9f4cb4e6a7969fb602f23326 Mon Sep 17 00:00:00 2001
From: jsowell <123@jsowell.com>
Date: Wed, 5 Aug 2026 13:27:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=8E=E7=AE=A1=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E8=AE=A2=E5=8D=95=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/jsowell/service/OrderService.java |  1 +
 .../controller/pile/OrderBasicInfoController.java   | 13 +++++++++++++
 .../com/jsowell/pile/vo/web/OrderDetailInfoVO.java  |  1 +
 3 files changed, 15 insertions(+)

diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
index 23c3e45f1..178fc615b 100644
--- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
@@ -421,6 +421,7 @@ public class OrderService {
         order.setOrderCode(orderBasicInfo.getOrderCode());
         order.setTransactionCode(orderBasicInfo.getTransactionCode());
         order.setOrderStatus(orderBasicInfo.getOrderStatus());
+        order.setPayStatus(orderBasicInfo.getPayStatus());
         order.setLogicCard(orderBasicInfo.getLogicCard());
         if (orderBasicInfo.getVinCode() != null) {
             order.setVinCode(orderBasicInfo.getVinCode());
diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java
index 93d8329c3..90d334c32 100644
--- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java
@@ -178,6 +178,19 @@ public class OrderBasicInfoController extends BaseController {
 		return toAjax(orderBasicInfoService.deleteOrderBasicInfoByIds(ids));
 	}
 
+	/**
+	 * 取消订单/关闭待支付订单
+	 * 仅待支付状态的订单可取消，取消后订单状态变为 7-订单关闭
+	 * http://localhost:8080/order/closeOrderByOrderCode/{orderCode}
+	 */
+	@PreAuthorize("@ss.hasPermi('order:order:edit')")
+	@Log(title = "订单", businessType = BusinessType.UPDATE)
+	@PostMapping("/closeOrderByOrderCode/{orderCode}")
+	public AjaxResult closeOrderByOrderCode(@PathVariable("orderCode") String orderCode) {
+		orderBasicInfoService.closeOrderByOrderCode(orderCode);
+		return AjaxResult.success();
+	}
+
 
 	/**
 	 * 人工结算订单/手动结算逻辑/手动结算按钮/手动结算订单
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java
index 800904952..1c035289b 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java
@@ -57,6 +57,7 @@ public class OrderDetailInfoVO {
 		private String orderCode; // 订单编号
 		private String transactionCode; // 交易流水号
 		private String orderStatus; // 订单状态
+		private String payStatus; // 支付状态（0-待支付；1-支付完成；2-无需支付；3-待补缴）
 		private String orderStatusDescribe; // 订单状态描述
 		private String logicCard; // 卡号
 		private String vinCode; // vin号