From beea5e902c5eb0f59d78a7f85b540e4b7365638d Mon Sep 17 00:00:00 2001
From: GYJ <1157756119@qq.com>
Date: Tue, 20 Aug 2024 17:30:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E4=BC=9A?=
 =?UTF-8?q?=E5=91=98=E5=88=97=E8=A1=A8=20-=20=E4=BB=8EshopUser=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashier/controller/shop/TbShopUserController.java |  1 -
 .../cn/ysk/cashier/mybatis/mapper/ShopUserMapper.java | 11 +++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopUserController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopUserController.java
index 0dbe5f8b..ee7d8fd9 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopUserController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopUserController.java
@@ -50,7 +50,6 @@ public class TbShopUserController {
 
     @GetMapping("queryAllShopUser")
     @ApiOperation("查询商家用户")
-    @AnonymousGetMapping
     public ResponseEntity<Object> queryAllShopUser(TbShopUserQueryCriteria criteria) {
         return new ResponseEntity<>(tbShopUserService.queryShopUser(criteria), HttpStatus.OK);
     }
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 0d6fa038..e9d4d8da 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,18 +13,17 @@ import org.apache.ibatis.annotations.Select;
 public interface ShopUserMapper extends BaseMapper<TbShopUser> {
 
     @Select("<script>" +
-            "SELECT su.id as id, u.head_img as headImg, u.nick_name as nickName, u.sex as sex, " +
-            "su.amount as amount, u.total_score as totalScore, u.telephone as telephone, " +
-            "u.birth_day as birthDay, su.is_vip as isVip, su.created_at as createAt, u.last_log_in_at as lastLoginAt " +
+            "SELECT su.id as 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, " +
+            "su.birth_day as birthDay, su.is_vip as isVip, su.created_at as createAt " +
             "FROM tb_shop_user su " +
-            "LEFT JOIN tb_user_info u ON su.user_id = u.id " +
             "<where> " +
             "<if test='param.shopId != null and param.shopId != &quot;&quot; and param.shopId != 1'>" +
             "AND su.shop_id = #{param.shopId} " +
             "</if>" +
             "<if test='param.name != null and param.name != &quot;&quot;'>" +
-            "AND (u.nick_name like concat('%', #{param.name}, '%') or su.name LIKE concat( '%', #{param.name}, '%' ) " +
-            " or u.telephone like concat('%', #{param.name}, '%') or su.telephone like concat('%', #{param.name}, '%'))" +
+            "AND (su.name like concat('%', #{param.name}, '%') or su.name LIKE concat( '%', #{param.name}, '%' ) " +
+            " or su.telephone like concat('%', #{param.name}, '%') or su.telephone like concat('%', #{param.name}, '%'))" +
             "</if>" +
             "<if test='isVip != null'>" +
             "AND su.is_vip=#{isVip}" +