From a5d3bf730ac99c81210d6ae29393fc51ac0fedd2 Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期三, 18 十二月 2024 11:35:42 +0800 Subject: [PATCH] 12.18 --- ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 38 ++++++++++++++++++++++++++++++++++++++ ruoyi-service/ruoyi-account/src/main/resources/mapper/account/AppUserMapper.xml | 7 +++++++ 2 files changed, 45 insertions(+), 0 deletions(-) diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java index a8dc0a4..3d0b39f 100644 --- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java +++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java @@ -420,6 +420,7 @@ } + @GetMapping("/danger/info") @ApiOperation(value = "用户列表-保级条件详情", tags = {"管理后台"}) public R<DangerInfoDto> dangerinfo(Long id) @@ -480,6 +481,42 @@ appUserService.updateById(byId); return R.ok(); } + + @GetMapping("/select") + @ApiOperation(value = "用户列表-查询绑定人", tags = {"管理后台"}) + public R<AppUser> select(String phone) + { + AppUser byId = appUserService.lambdaQuery().eq(AppUser::getPhone,phone).one(); + if (byId==null){ + return R.fail("搜索失败,手机号错误。"); + } + return R.ok(byId); + } + + @GetMapping("/change/bind") + @ApiOperation(value = "用户列表-更换绑定人", tags = {"管理后台"}) + public R<AppUser> select(Long id,Long inviteId) + { + AppUser byId = appUserService.getById(id); + byId.setInviteUserId(inviteId); + byId.setTopInviteId(getTop(inviteId)); + appUserService.updateById(byId); + return R.ok(); + } + + public Long getTop(Long inviteId){ + AppUser byId = appUserService.getById(inviteId); + if (byId!=null){ + return getTop(byId.getInviteUserId()); + }else { + return inviteId; + } + } + + + + + @Resource private ShopClient shopClient; @Resource @@ -514,6 +551,7 @@ if (lastOrder.getData()!=null){ byId.setLastOrderTime(lastOrder.getData().getCreateTime()); } + //消费总金额 return R.ok(byId); } @GetMapping("/bottom") diff --git a/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/AppUserMapper.xml b/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/AppUserMapper.xml index fa9943c..935fb14 100644 --- a/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/AppUserMapper.xml +++ b/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/AppUserMapper.xml @@ -102,6 +102,13 @@ #{shopId} </foreach> </if> + and ( ta.id + in + ( + <foreach collection="userIds" item="userId" open="(" separator="," close=")"> + #{userId} + </foreach> + ) or ta.shop_id = #{objectId} ) </where> </select> </mapper> -- Gitblit v1.7.1