From 7afa5bacb96ae58e0efc1c2a12a148629dd4c232 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Wed, 25 Jun 2025 10:10:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=A1=E5=8F=B7=E4=B8=8D=E5=BA=94=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E5=8F=91=E6=94=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canteen/core/account/service/impl/AccCardServiceImpl.java | 4 ++++
 .../src/main/resources/mapper/account/AccCardMapper.xml       | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccCardServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccCardServiceImpl.java
index 077f660..8392638 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccCardServiceImpl.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccCardServiceImpl.java
@@ -78,6 +78,10 @@ public class AccCardServiceImpl implements IAccCardService {
             if (cardCountByUserId > 0) {
                 throw new ServiceException("此用户已有卡, 不能再次发放");
             }
+            int cardCountByCardSerialNum= accCardMapper.selectAccCardCountByCardSerialNum(accountCard.getSerialNum());
+            if (cardCountByCardSerialNum > 0) {
+                throw new ServiceException("卡号已存在, 卡号不能重复");
+            }
             int count = accCardMapper.insertAccCard(accountCard);
             saveAccCardChangeRecord(accountCard);
             return count;
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccCardMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccCardMapper.xml
index c65bcd1..9678d05 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccCardMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccCardMapper.xml
@@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectAccCardCountByCardSerialNum" parameterType="String" resultType="Integer">
         select count(1)
         from account_card
-        where serial_num = #{serialNum}
+        where serial_num = #{serialNum} and card_status in (1,4,5)
     </select>
 
     <select id="selectAccCardById" parameterType="Long" resultMap="AccCardResult">