From d41358fce9a436d81b9341d06fc1d8f3ddff92ff Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期一, 25 九月 2023 16:17:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java | 42 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 39 insertions(+), 3 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 78b9786..9fb0168 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
@@ -3,9 +3,12 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.dsh.account.dto.SelectDto;
+import com.dsh.account.entity.Coach;
import com.dsh.account.entity.TAppUser;
import com.dsh.account.entity.TCourseInfoRecord;
import com.dsh.account.model.*;
+import com.dsh.account.model.query.appUserQuery.QueryAppUser;
+import com.dsh.account.model.vo.QueryAppUserVO;
import com.dsh.account.service.IVipPaymentService;
import com.dsh.account.service.TAppUserService;
import com.dsh.account.service.TCourseInfoRecordService;
@@ -22,10 +25,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.PrintWriter;
-import java.util.ArrayList;
+import java.util.*;
import java.util.List;
-import java.util.List;
-import java.util.Map;
/**
* @author zhibing.pu
@@ -51,7 +52,42 @@
private TCourseInfoRecordService courseInfoRecordService;
+ /**
+ * 后台添加
+ */
+ @RequestMapping("/base/appUser/addAppUser1")
+ public Object addAppUser1(@RequestBody TAppUser query){
+ // 修改
+ if (query.getId()!=null){
+ TAppUser phone = appUserService.getOne(new QueryWrapper<TAppUser>().eq("phone", query.getPhone()).ne("id",query.getId()));
+ if (null != phone){
+ return 5001;
+ }
+ }
+ query.setIsVip(0);
+ query.setPassword("111111");
+ query.setInsertTime(new Date());
+ return appUserService.saveOrUpdate(query);
+ }
+ /**
+ * 获取用户信息列表数据
+ */
+ @RequestMapping("/base/appUser/listAll")
+ public List<QueryAppUserVO> listAll(@RequestBody QueryAppUser query){
+
+ return appUserService.listAll(query);
+ }
+
+ /**
+ * 根据用户手机号获取用户id
+ */
+ @ResponseBody
+ @GetMapping("/base/appUser/getAppUserByPhone/{phone}")
+ public TAppUser getAppUserByPhone(@PathVariable("phone") String phone){
+ TAppUser appUser = appUserService.getOne(new QueryWrapper<TAppUser>().eq("phone", phone));
+ return appUser;
+ }
@ResponseBody
@PostMapping("/base/appUser/getSMSCode")
--
Gitblit v1.7.1