From 514c4c935c7179f0c2994faaafb4a19f2a2d0f47 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 18 十二月 2024 10:30:23 +0800
Subject: [PATCH] 12.18
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 98 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 85 insertions(+), 13 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 23cd4c5..a8dc0a4 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
@@ -1,6 +1,15 @@
package com.ruoyi.account.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.account.api.model.AppUser;
+import com.ruoyi.account.api.model.UserCancellationLog;
+import com.ruoyi.account.api.model.UserCoupon;
+import com.ruoyi.account.api.model.UserSignRecord;
+import com.ruoyi.account.service.AppUserService;
+import com.ruoyi.account.service.UserCancellationLogService;
+import com.ruoyi.account.service.UserCouponService;
+import com.ruoyi.account.service.UserSignRecordService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.api.model.*;
@@ -73,6 +82,10 @@
public R<LoginVo> mobileLogin(@RequestBody MobileLogin mobileLogin){
return appUserService.mobileLogin(mobileLogin);
}
+
+
+
+
@ResponseBody
@@ -174,9 +187,6 @@
public R<AppUser> info(){
Long userId = tokenService.getLoginUserApplet().getUserid();
AppUser user = appUserService.getById(userId);
-
-
-
return R.ok(user);
}
@Resource
@@ -348,6 +358,34 @@
appUserService.onlineRecord();
return R.ok();
}
+
+
+
+
+
+ /**
+ * 根据用户名称模糊搜索用户列表
+ * @param name
+ * @return
+ */
+ @PostMapping("/getAppUserByName")
+ public R<List<AppUser>> getAppUserByName(@RequestParam("name") String name){
+ List<AppUser> list = appUserService.list(new LambdaQueryWrapper<AppUser>().eq(AppUser::getDelFlag, 0).eq(AppUser::getStatus, 1)
+ .like(AppUser::getName, name));
+ return R.ok(list);
+ }
+
+ /**
+ * 根据用户电话模糊搜索用户列表
+ * @param phone
+ * @return
+ */
+ @PostMapping("/getAppUserByPhone")
+ public R<List<AppUser>> getAppUserByPhone(@RequestParam("phone") String phone){
+ List<AppUser> list = appUserService.list(new LambdaQueryWrapper<AppUser>().eq(AppUser::getDelFlag, 0).eq(AppUser::getStatus, 1)
+ .like(AppUser::getPhone, phone));
+ return R.ok(list);
+ }
/**
* 获取用户列表
@@ -361,6 +399,26 @@
IPage<AppUser> appuserPage = appUserService.getAppuserPage(pageNum, pageSize, appUser);
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 = {"管理后台"})
@@ -468,21 +526,35 @@
}
+ @GetMapping("/orders")
+ @ApiOperation(value = "用户列表-订单列表", tags = {"管理后台"})
+ public R<List<Order>> orders(Long id)
+ {
+ R<List<Order>> listR = remoteOrderGoodsClient.byUserId(id);
+ return R.ok(listR.getData());
-
-
-
-
- @GetMapping("/getAppUserByPhone")
- public R<AppUser> getAppUserByPhone(String phone){
- AppUser appUser = appUserService.lambdaQuery().eq(AppUser::getPhone, phone).one();
- return R.ok(appUser);
}
+
+
+
+
+
+
@GetMapping("/listByIds")
- List<AppUser> listByIds(List<String> list){
- return appUserService.listByIds(list);
+ List<AppUser> listByIds(@RequestParam("ids") List<Long> ids){
+ List<AppUser> appUsers = appUserService.listByIds(ids);
+ return appUsers;
+ }
+
+
+
+ @PostMapping("/getAppUserByPhone1")
+ public R<AppUser> getAppUserByPhone1(@RequestParam("phone") String phone){
+ AppUser appUser = appUserService.getOne(new LambdaQueryWrapper<AppUser>().eq(AppUser::getDelFlag, 0).eq(AppUser::getStatus, 1)
+ .eq(AppUser::getPhone, phone));
+ return R.ok(appUser);
}
}
--
Gitblit v1.7.1