From 866f686c3c4ae1bd47affe146a26db5dd1ceb032 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期三, 18 十二月 2024 14:57:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 81 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 78 insertions(+), 3 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 315b847..7479972 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
@@ -187,9 +187,6 @@
public R<AppUser> info(){
Long userId = tokenService.getLoginUserApplet().getUserid();
AppUser user = appUserService.getById(userId);
-
-
-
return R.ok(user);
}
@Resource
@@ -403,6 +400,27 @@
return R.ok(appuserPage);
}
+ @GetMapping("/shop/getAppuserPage")
+ @ApiOperation(value = "用户列表", tags = {"门店后台"})
+ public R<IPage<AppUser>> shopGetAppuserPage(@ApiParam("页码") @RequestParam Integer pageNum,
+ @ApiParam("每一页数据大小") Integer pageSize,
+ AppUser appUser)
+ {
+ Integer objectId = tokenService.getLoginUser().getSysUser().getObjectId();
+
+ List<Long> userIds = new ArrayList<>();
+ userIds.add(-1L);
+ //获取在该本店下单的用户ids
+ R<List<Order>> listR = remoteOrderGoodsClient.byShopId(objectId);
+ for (Order datum : listR.getData()) {
+ userIds.add(datum.getAppUserId());
+ }
+ IPage<AppUser> appuserPage = appUserService.getAppuserPage1(pageNum, pageSize, appUser,objectId,userIds);
+ return R.ok(appuserPage);
+ }
+
+
+
@GetMapping("/danger/info")
@ApiOperation(value = "用户列表-保级条件详情", tags = {"管理后台"})
public R<DangerInfoDto> dangerinfo(Long id)
@@ -463,6 +481,52 @@
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();
+ }
+ @GetMapping("/change/shop")
+ @ApiOperation(value = "用户列表-更换门店", tags = {"管理后台"})
+ public R<AppUser> shop(Long id,Long shopId)
+ {
+ AppUser byId = appUserService.getById(id);
+ byId.setShopId(shopId);
+ 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
@@ -497,6 +561,7 @@
if (lastOrder.getData()!=null){
byId.setLastOrderTime(lastOrder.getData().getCreateTime());
}
+ //消费总金额
return R.ok(byId);
}
@GetMapping("/bottom")
@@ -509,6 +574,16 @@
}
+ @GetMapping("/orders")
+ @ApiOperation(value = "用户列表-订单列表", tags = {"管理后台"})
+ public R<List<Order>> orders(Long id)
+ {
+ R<List<Order>> listR = remoteOrderGoodsClient.byUserId(id);
+ return R.ok(listR.getData());
+
+ }
+
+
--
Gitblit v1.7.1