From 581845ce98731d52e90f9c151e0b0243678690be Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Wed, 7 May 2025 13:04:46 +0800
Subject: [PATCH] bug 5902

---
 .../core/account/controller/AccCardController.java   | 12 ++++++------
 .../account/service/impl/AccCardServiceImpl.java     |  4 ++--
 .../main/resources/mapper/account/AccCardMapper.xml  |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/controller/AccCardController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/controller/AccCardController.java
index 09ab9a4..004b7bf 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/controller/AccCardController.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/controller/AccCardController.java
@@ -88,7 +88,7 @@ public class AccCardController extends BaseController {
             accCard.setOperationType(CardRecordTypeEnum.APPLY.getKey());
             return toAjax(accCardService.insertAccCard(accCard));
         } catch (Exception e) {
-            return error("系统错误, " + e.getMessage());
+            return error(e.getMessage());
         }
     }
 
@@ -104,7 +104,7 @@ public class AccCardController extends BaseController {
         try {
             return toAjax(accCardService.updateAccCard(accCard));
         } catch (Exception e) {
-            return error("系统错误, " + e.getMessage());
+            return error(e.getMessage());
         }
     }
 
@@ -118,7 +118,7 @@ public class AccCardController extends BaseController {
             accCard.setOperationType(CardRecordTypeEnum.CHANGE.getKey());
             return toAjax(accCardService.updateAccCard(accCard));
         } catch (Exception e) {
-            return error("系统错误, " + e.getMessage());
+            return error(e.getMessage());
         }
     }
 
@@ -133,7 +133,7 @@ public class AccCardController extends BaseController {
             accCard.setCardStatus(CardStatusEnum.LOSS.getKey());
             return toAjax(accCardService.updateAccCard(accCard));
         } catch (Exception e) {
-            return error("系统错误, " + e.getMessage());
+            return error(e.getMessage());
         }
     }
 
@@ -148,7 +148,7 @@ public class AccCardController extends BaseController {
             accCard.setCardStatus(CardStatusEnum.NORMAL.getKey());
             return toAjax(accCardService.updateAccCard(accCard));
         } catch (Exception e) {
-            return error("系统错误, " + e.getMessage());
+            return error(e.getMessage());
         }
     }
 
@@ -163,7 +163,7 @@ public class AccCardController extends BaseController {
             accCard.setCardStatus(CardStatusEnum.REFUND.getKey());
             return toAjax(accCardService.updateAccCard(accCard));
         } catch (Exception e) {
-            return error("系统错误, " + e.getMessage());
+            return error(e.getMessage());
         }
     }
 
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 23ae389..15e6112 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
@@ -92,7 +92,7 @@ public class AccCardServiceImpl implements IAccCardService {
             saveAccCardChangeRecord(accCard);
             return count;
         } catch (Exception e) {
-            throw new ServiceException("发卡异常, " + e.getMessage());
+            throw new ServiceException(e.getMessage());
         }
     }
 
@@ -154,7 +154,7 @@ public class AccCardServiceImpl implements IAccCardService {
             }
             return count;
         } catch (Exception e) {
-            throw new ServiceException("更新异常, " + e.getMessage());
+            throw new ServiceException(e.getMessage());
         }
     }
 
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 0b2866d..7d9a317 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
@@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where user_id = #{userId} and card_status in (1,4,5)
     </select>
 
-    <select id="selectAccCardCountByCardSerialNum" parameterType="Long" resultType="Integer">
+    <select id="selectAccCardCountByCardSerialNum" parameterType="String" resultType="Integer">
         select count(1)
         from acc_card
         where serial_num = #{serialNum}