From 8764dae833b80c370f1688daa03f07ee2e272d11 Mon Sep 17 00:00:00 2001
From: gaowdong <gaowdong@bonus.com>
Date: Thu, 3 Jul 2025 09:14:08 +0800
Subject: [PATCH] =?UTF-8?q?6651=20=E8=B4=A6=E6=88=B7=E6=B6=88=E8=B4=B9?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E4=B8=AD=E7=BC=BA=E5=B0=91=E6=B6=88=E8=B4=B9?=
 =?UTF-8?q?=E6=A1=A3=E5=8F=A3=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canteen/core/account/domain/vo/AccConsumeDetailVO.java  | 5 +++++
 .../src/main/resources/mapper/account/AccTradeMapper.xml    | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/vo/AccConsumeDetailVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/vo/AccConsumeDetailVO.java
index e2ef94d..e26c3c9 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/vo/AccConsumeDetailVO.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/vo/AccConsumeDetailVO.java
@@ -64,4 +64,9 @@ public class AccConsumeDetailVO implements Serializable {
      * 来源类型
      */
     private Integer sourceType;
+
+    /**
+     * 订单编号
+     */
+    private String stallName;
 }
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeMapper.xml
index 1e2a6b3..f447477 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeMapper.xml
@@ -312,9 +312,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             atwd.wallet_type,
             atwd.amount,
             atwd.wallet_bal,
-            oi.source_type
+            oi.source_type,
+            bs.stall_name
         from
             order_info oi
+                left join basic_stall bs on
+                oi.stall_id = bs.stall_id
                 inner join account_trade at2 on
                 oi.order_id = at2.order_no
                 inner join account_trade_wallet_detail atwd on
@@ -323,6 +326,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 oi.user_id = su.user_id
                 inner join sys_dept sd on
                 su.dept_id = sd.dept_id
+
         where
             atwd.trade_type in (110, 120, 130)
           and oi.order_state in (1, 2, 3)