From 9ea2ecf552a64891ddc27e75481eb9eea7cb9380 Mon Sep 17 00:00:00 2001
From: yijiegong <sankejuzi@163.com>
Date: Fri, 30 Aug 2024 11:26:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BC=9A=E5=91=98=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=95=B0=E9=87=8Fbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/ysk/cashier/mybatis/mapper/ShopUserMapper.java | 2 +-
 .../cashier/service/impl/shopimpl/TbShopUserServiceImpl.java    | 2 +-
 .../src/main/java/cn/ysk/cashier/vo/ShopUserInfoVo.java         | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/ShopUserMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/ShopUserMapper.java
index 44efefb9..5c789e38 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/ShopUserMapper.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/ShopUserMapper.java
@@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Select;
 public interface ShopUserMapper extends BaseMapper<TbShopUser> {
 
     @Select("<script>" +
-            "SELECT su.id as id, su.head_img as headImg, su.name as nickName, su.sex as sex, " +
+            "SELECT su.id as id, su.user_id as user_id, su.head_img as headImg, su.name as nickName, su.sex as sex, " +
             "su.amount as amount, 0 as totalScore, su.telephone as telephone, u.last_log_in_at as lastLoginAt, " +
             "su.birth_day as birthDay, su.is_vip as isVip, su.created_at as createAt " +
             "FROM tb_shop_user su " +
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopUserServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopUserServiceImpl.java
index e0f7c24e..92474ffd 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopUserServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopUserServiceImpl.java
@@ -73,7 +73,7 @@ public class TbShopUserServiceImpl implements TbShopUserService {
                     shopUserInfoVo.setTotalScore(0);
                 });
             }
-            Integer orderNumber=tbOrderInfoRepository.countByUserIdAndStatusAndShopId(shopUserInfoVo.getId().toString(),criteria.getShopId());
+            Integer orderNumber=tbOrderInfoRepository.countByUserIdAndStatusAndShopId(shopUserInfoVo.getUserId().toString(),criteria.getShopId());
             shopUserInfoVo.setOrderNumber(Objects.isNull(orderNumber)?0:orderNumber);
             shopUserInfoVo.setInMoney(tbShopUserRepository.sumAmount(shopUserInfoVo.getId()));
 
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/vo/ShopUserInfoVo.java b/eladmin-system/src/main/java/cn/ysk/cashier/vo/ShopUserInfoVo.java
index d52439a5..75baf7f4 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/vo/ShopUserInfoVo.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/vo/ShopUserInfoVo.java
@@ -23,6 +23,7 @@ import java.math.BigDecimal;
 @Data
 public class ShopUserInfoVo implements Serializable {
     private Integer id;
+    private Integer userId;
     private String headImg;
     private String nickName;
     private Object sex;