From a3435a56b276eb985cc9598a15531ba387c326b8 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 28 Nov 2025 17:21:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E8=AF=8D=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/czg/account/entity/BkContactList.java   | 2 +-
 .../account/service/impl/AShopUserServiceImpl.java        | 8 ++++----
 .../src/main/resources/mapper/BkContactListMapper.xml     | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/BkContactList.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/BkContactList.java
index b2e0e0dad..4e83deaee 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/BkContactList.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/BkContactList.java
@@ -56,7 +56,7 @@ public class BkContactList implements Serializable {
      * 取消数
      */
     @Column(ignore = true)
-    private Integer cannelNum;
+    private Integer cancelNum;
 
     /**
      * 最后一次预约时间
diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java
index 114df43c7..7e68b3c09 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java
@@ -97,10 +97,10 @@ public class AShopUserServiceImpl implements AShopUserService {
         Long mainIdByShopId = shopInfoService.getMainIdByShopId(StpKit.USER.getShopId());
         PageHelper.startPage(PageUtil.buildPageHelp());
         PageInfo<ShopUserDTO> shopUserDTOPageInfo = new PageInfo<>(shopUserMapper.selectPageByKeyAndIsVip(mainIdByShopId, isVip, key, amount));
-        shopUserDTOPageInfo.getList().forEach(item -> {
-            item.setNew(consumeDiscountService.isNewUser(item, StpKit.USER.getShopId()));
-            setUserDiscount(item);
-        });
+//        shopUserDTOPageInfo.getList().forEach(item -> {
+//            item.setNew(consumeDiscountService.isNewUser(item, StpKit.USER.getShopId()));
+//            setUserDiscount(item);
+//        });
         return PageUtil.convert(shopUserDTOPageInfo);
     }
 
diff --git a/cash-service/account-service/src/main/resources/mapper/BkContactListMapper.xml b/cash-service/account-service/src/main/resources/mapper/BkContactListMapper.xml
index 6af02096e..f42bef410 100644
--- a/cash-service/account-service/src/main/resources/mapper/BkContactListMapper.xml
+++ b/cash-service/account-service/src/main/resources/mapper/BkContactListMapper.xml
@@ -8,7 +8,7 @@
         SELECT
             `order`.call_phone AS phone,
             count( 1 ) AS orderNum,
-            sum( CASE `order`.`status` WHEN '已取消' THEN 1 ELSE 0 END ) AS cannelNum,
+            sum( CASE `order`.`status` WHEN '已取消' THEN 1 ELSE 0 END ) AS cancelNum,
             MAX(`order`.create_time) AS lastBookingTime
         FROM
             `bk_order` `order`