From 0003dfe7c87661f9d3eee143f92a5caf14acedeb Mon Sep 17 00:00:00 2001
From: gaowdong <gaowdong@bonus.com>
Date: Tue, 27 May 2025 17:37:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A6=E6=88=B7=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/canteen/core/account/mapper/AccInfoMapper.java | 4 +++-
 .../src/main/resources/mapper/account/AccInfoMapper.xml      | 5 ++---
 .../main/resources/mapper/account/AccWalletInfoMapper.xml    | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/mapper/AccInfoMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/mapper/AccInfoMapper.java
index e6edad9..0c68f22 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/mapper/AccInfoMapper.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/mapper/AccInfoMapper.java
@@ -76,7 +76,9 @@ public interface AccInfoMapper extends BaseMapper<AccountInfo> {
     AccInfoDetailsVO queryAccInfoBalanceSum(@Param("accountInfoQueryParam") AccountInfoQueryParam accountInfoQueryParam,
                                             @Param("encryptedSearchValue") String encryptedSearchValue);
 
-    void updateAccInfoEndDateByUserId(LocalDate endDate, List<Long> userIds, String updateBy);
+    void updateAccInfoEndDateByUserId(@Param("endDate") LocalDate endDate,
+                                      @Param("userIds") List<Long> userIds,
+                                      @Param("updateBy") String updateBy);
     List<AccInfoDetailsVO> queryAccInfoByUserIds(@Param("userIds") List<Long> userIds);
     AccInfoDetailsVO queryAccInfoByUserId(@Param("userId") Long userId);
 
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccInfoMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccInfoMapper.xml
index c7d1d28..1e3b249 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccInfoMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccInfoMapper.xml
@@ -115,7 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where account_id = #{accId}
     </select>
 
-    <insert id="insertAccInfo" parameterType="com.bonus.canteen.core.account.domain.AccountInfo" useGeneratedKeys="true" keyProperty="accId">
+    <insert id="insertAccInfo" parameterType="com.bonus.canteen.core.account.domain.AccountInfo" useGeneratedKeys="true" keyProperty="accountId">
         insert into account_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="accountName != null and accountName != ''">account_name,</if>
@@ -152,7 +152,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userId != null">#{userId},</if>
             <if test="scope != null">#{scope},</if>
             <if test="endDate != null">#{endDate},</if>
-            <if test="redValidityDate != null">#{redValidityDate},</if>
             <if test="accountStatus != null">#{accountStatus},</if>
             <if test="payPwd != null and payPwd != ''">#{payPwd},</if>
             <if test="lastCreditTime != null">#{lastCreditTime},</if>
@@ -224,7 +223,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <delete id="deleteAccInfoByIds" parameterType="String">
         update account_info set del_flag = '2' where account_id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{accId}
+            #{id}
         </foreach>
     </delete>
 
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccWalletInfoMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccWalletInfoMapper.xml
index 6e85447..5ad9aa3 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccWalletInfoMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccWalletInfoMapper.xml
@@ -106,7 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="batchInsertAccWalletInfo" parameterType="com.bonus.canteen.core.account.domain.AccWalletInfo">
         insert into account_wallet_info(user_id,account_id,wallet_type,create_by,create_time) values
         <foreach item="item" index="index" collection="list" separator=",">
-            (#{item.userId},#{item.accId},#{item.walletType},#{item.createBy},NOW())
+            (#{item.userId},#{item.accountId},#{item.walletType},#{item.createBy},NOW())
         </foreach>
     </insert>