From 26e2592813b9263124d518d238262910e817d323 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 14 八月 2023 10:13:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java | 49 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 45 insertions(+), 4 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java
index 46643ca..fccd65a 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java
@@ -1,11 +1,9 @@
package com.dsh.account.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.dsh.account.entity.TAppUser;
-import com.dsh.account.model.AddAppUserVo;
-import com.dsh.account.model.JoinPlayPaiVo;
-import com.dsh.account.model.LoginSMSCodeVo;
-import com.dsh.account.model.LoginWeChatVo;
+import com.dsh.account.model.*;
import com.dsh.account.service.IVipPaymentService;
import com.dsh.account.service.TAppUserService;
import com.dsh.account.util.PayMoneyUtil;
@@ -21,6 +19,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.List;
import java.util.List;
import java.util.Map;
@@ -340,6 +340,47 @@
}
+ @PostMapping("/base/appUser/getAllUser")
+ @ResponseBody
+ public List<TAppUser> getAllUser(){
+ try {
+ return appUserService.list();
+ }catch (Exception e){
+ e.printStackTrace();
+ return new ArrayList<>();
+ }
+ }
+
+
+ @PostMapping("/base/appUser/queryByNamePhone")
+ public List<TAppUser> queryByNamePhone(@RequestBody QueryByNamePhone queryByNamePhone){
+ try {
+ LambdaQueryWrapper<TAppUser> tAppUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ if(ToolUtil.isNotEmpty(queryByNamePhone.getName())){
+ tAppUserLambdaQueryWrapper.like(TAppUser::getName,queryByNamePhone.getName());
+ }
+ if(ToolUtil.isNotEmpty(queryByNamePhone.getPhone())){
+ tAppUserLambdaQueryWrapper.like(TAppUser::getPhone,queryByNamePhone.getPhone());
+ }
+ List<TAppUser> list = appUserService.list(tAppUserLambdaQueryWrapper);
+ return list;
+ }catch (Exception e){
+ e.printStackTrace();
+ return new ArrayList<>();
+ }
+ }
+
+ @PostMapping("/base/appUser/queryById")
+ public TAppUser queryById(@RequestBody Integer appUserId){
+ try {
+ return appUserService.getById(appUserId);
+ }catch (Exception e){
+ e.printStackTrace();
+ return new TAppUser();
+ }
+ }
+
+
/**
* 根据名称模糊搜索用户
* @param name
--
Gitblit v1.7.1