From 2d88b7732583334b1676ce899a2c661bb4e48603 Mon Sep 17 00:00:00 2001
From: luqingjie <544309509@qq.com>
Date: Wed, 14 Oct 2026 05:32:05 -0400
Subject: [PATCH] =?UTF-8?q?orders=20=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5wa?=
=?UTF-8?q?llet=5Fuser=5Fname?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/ruoyi/system/domain/UsdtOrders.java | 14 ++++++++++++++
.../com/ruoyi/system/domain/UsdtOrdersPlus.java | 13 +++++++++++++
.../system/service/PaymentOrderOpenApiService.java | 1 +
.../resources/mapper/system/UsdtOrdersMapper.xml | 12 ++++++++++--
4 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtOrders.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtOrders.java
index 279ba87..661dbe2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtOrders.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtOrders.java
@@ -45,6 +45,10 @@ public class UsdtOrders extends BaseEntity
@Excel(name = "钱包地址")
private String token;
+ /** 支付用户,由商户创建订单时传入 */
+ @Excel(name = "支付用户")
+ private String walletUserName;
+
/** 状态 */
@Excel(name = "状态")
private Long status;
@@ -163,6 +167,15 @@ public class UsdtOrders extends BaseEntity
{
return token;
}
+ public void setWalletUserName(String walletUserName)
+ {
+ this.walletUserName = walletUserName;
+ }
+
+ public String getWalletUserName()
+ {
+ return walletUserName;
+ }
public void setStatus(Long status)
{
this.status = status;
@@ -273,6 +286,7 @@ public class UsdtOrders extends BaseEntity
.append("actualAmount", getActualAmount())
.append("amount", getAmount())
.append("token", getToken())
+ .append("walletUserName", getWalletUserName())
.append("status", getStatus())
.append("notifyUrl", getNotifyUrl())
.append("redirectUrl", getRedirectUrl())
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtOrdersPlus.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtOrdersPlus.java
index cbd4ffe..a8924f9 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtOrdersPlus.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtOrdersPlus.java
@@ -45,6 +45,9 @@ public class UsdtOrdersPlus implements Serializable
/** 钱包地址 */
@Excel(name = "钱包地址")
private String token;
+ /** 支付用户,由商户创建订单时传入 */
+ @Excel(name = "支付用户")
+ private String walletUserName;
/** 状态 */
@Excel(name = "状态 状态1:等待支付,2:支付成功,3:已过期")
private Long status;
@@ -154,6 +157,15 @@ public class UsdtOrdersPlus implements Serializable
{
return token;
}
+ public void setWalletUserName(String walletUserName)
+ {
+ this.walletUserName = walletUserName;
+ }
+
+ public String getWalletUserName()
+ {
+ return walletUserName;
+ }
public void setStatus(Long status)
{
this.status = status;
@@ -264,6 +276,7 @@ public class UsdtOrdersPlus implements Serializable
.append("actualAmount", getActualAmount())
.append("amount", getAmount())
.append("token", getToken())
+ .append("walletUserName", getWalletUserName())
.append("status", getStatus())
.append("notifyUrl", getNotifyUrl())
.append("redirectUrl", getRedirectUrl())
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/PaymentOrderOpenApiService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/PaymentOrderOpenApiService.java
index a6db943..9935649 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/PaymentOrderOpenApiService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/PaymentOrderOpenApiService.java
@@ -104,6 +104,7 @@ public class PaymentOrderOpenApiService {
order.setAmount(amount);
order.setActualAmount(actualAmount);
order.setToken(wallet.getToken());
+ order.setWalletUserName(walletUserName);
order.setStatus(1L);
order.setNotifyUrl(notifyUrl);
order.setRedirectUrl(redirectUrl);
diff --git a/ruoyi-system/src/main/resources/mapper/system/UsdtOrdersMapper.xml b/ruoyi-system/src/main/resources/mapper/system/UsdtOrdersMapper.xml
index f8e8975..dd306b4 100644
--- a/ruoyi-system/src/main/resources/mapper/system/UsdtOrdersMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/UsdtOrdersMapper.xml
@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -27,7 +28,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select id, trade_id, order_id,order_type, block_transaction_id, actual_amount, amount, token, status, notify_url, redirect_url, callback_num, callback_confirm, created_at, updated_at, deleted_at, app_id, settlement_status, user_id from orders
+ select id, trade_id, order_id, order_type, block_transaction_id, actual_amount, amount,
+ token, wallet_user_name, status, notify_url, redirect_url, callback_num,
+ callback_confirm, created_at, updated_at, deleted_at, app_id, settlement_status, user_id
+ from orders