From ef4b27f560a5b2c4a48c8c2e74763b9586611a50 Mon Sep 17 00:00:00 2001
From: fansongsong <1103393971@qq.com>
Date: Fri, 19 Dec 2025 16:50:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E8=B4=B9=E6=98=8E=E7=BB=86=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8-=E5=AF=BC=E5=87=BA,=E8=B0=83=E6=95=B4=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E9=A1=BA=E5=BA=8F6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jeecg/payment/controller/StBbzxOrderInfoController.java | 6 +++---
 .../org/jeecg/payment/mapper/xml/StBbzxOrderInfoMapper.xml  | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/controller/StBbzxOrderInfoController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/controller/StBbzxOrderInfoController.java
index c97f6ea..3ec07ce 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/controller/StBbzxOrderInfoController.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/controller/StBbzxOrderInfoController.java
@@ -387,9 +387,9 @@ public class StBbzxOrderInfoController {
 //        String exportFields = "serialNo|交易流水号,orderNo|交易单号,userName|姓名,phone|手机号,workNo|工号," +
 //                "statusName|操作类型,transactionAmount|交易金额,paymentMethodName|结账方式,storedBalance|储值金额变动(元),rewardBalance|赠送金额变动(元),availableBalance|余额," +
 //                "integralBalance|积分变动,createTime|交易时间,payTime|结账时间,updateStatusName|操作端,createOne|操作人";
-            String exportFields = "userName|姓名,deptName|部门,phone|手机号,workNo|工号,restName|食堂名称," +
-                    "transactionAmount|交易金额,statusName|操作类型,paymentMethodName|充值方式,availableBalance|现金余额," +
-                    "createTime|充值时间,createOne|操作人";
+            String exportFields = "workNo|工号,userName|姓名,restName|充值食堂名称,transactionAmount|交易金额,statusName|操作类型," +
+                    "availableBalance|现金余额," +
+                    "createTime|充值时间,phone|手机号";
             ExcelUtils.export(response, "充值记录", statisticsCanteenBusiness, exportFields, "yyyy-MM-dd HH:mm",true);
         }
 
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/mapper/xml/StBbzxOrderInfoMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/mapper/xml/StBbzxOrderInfoMapper.xml
index 009afc5..3926afe 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/mapper/xml/StBbzxOrderInfoMapper.xml
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/mapper/xml/StBbzxOrderInfoMapper.xml
@@ -235,6 +235,7 @@
         SUM(oi.order_price) orderPrice,
         (SELECT COUNT(DISTINCT member_id) FROM st_bbzx_order_info WHERE eat_day = oi.eat_day and `status` = 5
         and order_type = 3
+        AND canteen_id = oi.canteen_id
         <if test="list != null and list.size() > 0">
             and canteen_id IN
             <foreach collection="list" item="canteenId" separator="," open="(" close=")" >
@@ -262,7 +263,8 @@
         </if>
         GROUP BY
         oi.canteen_id,
-        oi.eat_day
+        oi.eat_day,
+        r.rest_name
         order by oi.eat_day desc
     </select>
     <select id="statisticsTheAmountSpentEveryMember"