From dbacf19ad08f150cccb903f0a4bfb8023c240f91 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Fri, 11 Apr 2025 10:15:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=85=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/account/service/impl/AccInfoServiceImpl.java    | 7 ++++---
 .../src/main/resources/mapper/account/AccTradeMapper.xml | 9 +++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccInfoServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccInfoServiceImpl.java
index 50073dc..130f9e2 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccInfoServiceImpl.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccInfoServiceImpl.java
@@ -177,9 +177,10 @@ public class AccInfoServiceImpl implements IAccInfoService {
     public int deleteAccInfoByUserIds(List<SysUser> users) {
         int count = 0;
         for (int i = 0; i < users.size(); i++) {
-            accWalletInfoService.deleteAccWalletInfoByUserId(users.get(i).getUserId());
-            //MqUtil.sendDataChange(userId, LeMqConstant.DataChangeType.REMOVE, LeMqConstant.Topic.DATA_CHANGE_CUSTOMER);
-            count += accInfoMapper.deleteAccInfoByUserId(users.get(i).getUserId());
+            Long userId = users.get(i).getUserId();
+            accWalletInfoService.deleteAccWalletInfoByUserId(userId);
+            MqUtil.sendDataChange(userId, LeMqConstant.DataChangeType.REMOVE, LeMqConstant.Topic.DATA_CHANGE_CUSTOMER);
+            count += accInfoMapper.deleteAccInfoByUserId(userId);
         }
         return count;
     }
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 5a2c57f..0a35f31 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
@@ -40,7 +40,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectAccTradeVo">
-        select trade_id, trade_time, user_id, dept_id, trade_type, actual_amount, amount, wallet_bal_total, acc_all_bal, pay_channel, pay_type, pay_state, trade_state, third_trade_no, machine_sn, batch_num, le_ord_no, origin_trade_id, sub_time_rule_id, manage_cost, withdraw_source, recharge_source, canteen_id, machine_type, fail_reason, recharge_operate, psn_type, operate_source, batch_import_id, create_by, create_time, update_by, update_time from acc_trade
+        select trade_id, trade_time, user_id, dept_id, trade_type, actual_amount, amount, wallet_bal_total, 
+               acc_all_bal, pay_channel, pay_type, pay_state, trade_state, third_trade_no, machine_sn, 
+               batch_num, order_no, origin_trade_id, sub_time_rule_id, manage_cost, withdraw_source, 
+               recharge_source, canteen_id, machine_type, fail_reason, recharge_operate, psn_type, 
+               operate_source, batch_import_id, create_by, create_time, update_by, update_time 
+        from acc_trade
     </sql>
 
     <select id="selectAccTradeList" parameterType="com.bonus.canteen.core.account.domain.AccTrade" resultMap="AccTradeResult">
@@ -82,7 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where trade_id = #{tradeId}
     </select>
 
-    <select id="selectAccTradeByOrderNo" parameterType="Long" resultMap="AccTradeResult">
+    <select id="selectAccTradeByOrderNo" parameterType="String" resultMap="AccTradeResult">
         <include refid="selectAccTradeVo"/>
         where order_no = #{orderNo}
     </select>