diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/HomeAppController.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/HomeAppController.java index 156d7a3..20ca1a7 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/HomeAppController.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/HomeAppController.java @@ -47,8 +47,8 @@ public class HomeAppController { @GetMapping("/vip/page") @Operation(summary = "首页查询VIP推荐用户-分页") @Log(title = "首页查询VIP推荐用户-分页", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false) - public R> vipPage(){ - List vo = userService.vipHomePage(); + public R> vipPage(String residenceCityCode){ + List vo = userService.vipHomePage(residenceCityCode); return R.ok(vo); } diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/UserMapper.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/UserMapper.java index ecc58da..1e2ce78 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/UserMapper.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/UserMapper.java @@ -23,7 +23,7 @@ public interface UserMapper extends BaseMapper { Page homePageApp(@Param("build") Page build, @Param("params") HomePageReq params); - List vipHomePage(@Param("limit") int limit); + List vipHomePage(@Param("residenceCityCode") String residenceCityCode, @Param("limit") int limit); MinUser getMinUserById(@Param("userId") Long userId); } diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserService.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserService.java index a4ba34e..29d7513 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserService.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserService.java @@ -47,7 +47,7 @@ public interface UserService extends IService { Page homePage(HomePageReq params); - List vipHomePage(); + List vipHomePage(String residenceCityCode); boolean lock(Long id); diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserServiceImpl.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserServiceImpl.java index c6d6d56..7d6c739 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserServiceImpl.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserServiceImpl.java @@ -272,8 +272,8 @@ public class UserServiceImpl extends ServiceImpl implements Use } @Override - public List vipHomePage() { - List result = baseMapper.vipHomePage(20); + public List vipHomePage(String residenceCityCode) { + List result = baseMapper.vipHomePage(residenceCityCode,20); String cosDomain = systemConfigManager.getSystemConfig(SystemConfigEnum.COS_DOMAIN); boolean vip = false; // 是否为VIP boolean card = false; // 是否实名认证 diff --git a/ruoyi-xq/src/main/resources/mapper/xq/UserMapper.xml b/ruoyi-xq/src/main/resources/mapper/xq/UserMapper.xml index 7cfccae..5a1f8ba 100644 --- a/ruoyi-xq/src/main/resources/mapper/xq/UserMapper.xml +++ b/ruoyi-xq/src/main/resources/mapper/xq/UserMapper.xml @@ -98,6 +98,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" join xq_user_status t3 on t1.id = t3.user_id join xq_user_login t4 on t1.id = t4.user_id where t1.type = 0 and t1.status = 0 and t1.finish_base_status = 1 and t3.personals_status = 1 and t1.open_vip = 1 and t3.push_vip = 1 + + and t1.residence_city_code = #{residenceCityCode} + order by t4.last_login_time desc