diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbShopUserRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbShopUserRepository.java index 52bcbcea..12a2b93c 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbShopUserRepository.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbShopUserRepository.java @@ -42,7 +42,8 @@ public interface TbShopUserRepository extends JpaRepository "on su.userId = CAST(u.id AS string) " + "WHERE su.isVip = IFNULL(:isVip, su.isVip)" + "AND (u.telephone = IFNULL(:phone, u.telephone))" + - "AND su.shopId = :shopId") + "AND su.shopId = :shopId " + + "order by su.createdAt desc ") Page findShopUserJoinUserInfo(String shopId,Integer isVip,String phone, Pageable pageable); @Query("SELECT NEW cn.ysk.cashier.vo.ShopUserInfoVo(su.id, u.headImg, u.nickName, u.sex, u.amount, u.totalScore, u.telephone, u.birthDay, u.isVip, su.createdAt, u.lastLogInAt) " + @@ -50,7 +51,8 @@ public interface TbShopUserRepository extends JpaRepository "LEFT JOIN TbUserInfo u " + "on su.userId = CAST(u.id AS string) " + "WHERE su.isVip = IFNULL(:isVip, su.isVip)" + - "AND (u.telephone = IFNULL(:phone, u.telephone))") + "AND (u.telephone = IFNULL(:phone, u.telephone))" + + "order by su.createdAt desc ") Page findAllShopUserJoinUserInfo(Integer isVip,String phone, Pageable pageable); @Query("SELECT count(0) from TbShopUser user where user.shopId = :shopId")