From 1d44c20eabc99e9970fb58d4dbd3a94d77e83e39 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 07 三月 2025 18:35:50 +0800
Subject: [PATCH] 冥想

---
 xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/inner/InnerAppUserController.java |   50 ++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/inner/InnerAppUserController.java b/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/inner/InnerAppUserController.java
index 34b057a..a3f47a1 100644
--- a/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/inner/InnerAppUserController.java
+++ b/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/inner/InnerAppUserController.java
@@ -3,14 +3,14 @@
 import com.xinquan.common.core.domain.R;
 import com.xinquan.common.security.annotation.InnerAuth;
 import com.xinquan.system.api.model.AppCaptchaBody;
+import com.xinquan.system.api.model.AppLoginUser;
 import com.xinquan.system.api.model.AppVerifyCellPhoneBody;
 import com.xinquan.system.api.model.AppWXLoginBody;
-import com.xinquan.system.api.model.AppleLoginUser;
-import com.xinquan.system.api.model.LoginUser;
-import com.xinquan.system.api.model.WXLoginUser;
-import com.xinquan.user.api.domain.AppUser;
+import com.xinquan.system.api.domain.AppUser;
 import com.xinquan.user.api.domain.dto.AppUserDTO;
 import com.xinquan.user.service.AppUserService;
+import java.util.Collection;
+import java.util.List;
 import java.util.Optional;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -42,6 +42,11 @@
     R<Optional<AppUser>> getUserByCondition(@RequestBody AppUserDTO dto) {
         return R.ok(appUserService.getUserByCondition(dto));
     }
+    @InnerAuth
+    @PostMapping("/getUserByCondition1")
+    R<Optional<AppUser>> getUserByCondition1(@RequestBody AppUserDTO dto) {
+        return R.ok(appUserService.getUserByCondition1(dto));
+    }
 
     /**
      * APP用户注册
@@ -50,7 +55,7 @@
      */
     @InnerAuth
     @PostMapping("/registerAppUser")
-    R<Boolean> registerAppUser(@RequestBody AppUserDTO appUserDTO){
+    R<AppUser> registerAppUser(@RequestBody AppUserDTO appUserDTO) {
         return R.ok(appUserService.registerAppUser(appUserDTO));
     }
 
@@ -62,7 +67,7 @@
      */
     @InnerAuth
     @PostMapping("/wxLogin")
-    R<WXLoginUser> wxLogin(@RequestBody AppWXLoginBody body) {
+    R<AppLoginUser> wxLogin(@RequestBody AppWXLoginBody body) {
         return R.ok(appUserService.wxLogin(body));
     }
 
@@ -75,8 +80,8 @@
      */
     @InnerAuth
     @PostMapping("/appleLogin")
-    R<AppleLoginUser> appleLogin(@RequestParam("appleId") String appleId) {
-        return R.ok(appUserService.appleLogin(appleId));
+    R<AppLoginUser> appleLogin(@RequestParam("appleId") String appleId,@RequestParam("device") String device) {
+        return R.ok(appUserService.appleLogin(appleId,device));
     }
 
     /**
@@ -87,7 +92,7 @@
      */
     @InnerAuth
     @PostMapping("/captchaLogin")
-    R<LoginUser> appCaptchaLogin(@RequestBody AppCaptchaBody body) {
+    R<AppLoginUser> appCaptchaLogin(@RequestBody AppCaptchaBody body) {
         return R.ok(appUserService.appCaptchaLogin(body));
     }
 
@@ -99,7 +104,32 @@
      */
     @InnerAuth
     @PostMapping("/verifyCellPhone")
-    R<WXLoginUser> verifyCellPhone(@RequestBody AppVerifyCellPhoneBody body) {
+    R<AppLoginUser> verifyCellPhone(@RequestBody AppVerifyCellPhoneBody body) {
         return R.ok(appUserService.verifyCellPhone(body));
     }
+
+    /**
+     * 更新APP用户信息
+     *
+     * @param dto APP用户数据传输对象
+     */
+    @InnerAuth
+    @PostMapping("/updateAppUser")
+    R<?> updateAppUser(@RequestBody AppUserDTO dto) {
+        appUserService.updateAppUser(dto);
+        return R.ok();
+    }
+
+    /**
+     * 获取用户列表
+     *
+     * @param appUserIdSet 用户id列表
+     * @param source       请求来源
+     * @return
+     */
+    @InnerAuth
+    @PostMapping("/getAppUserList")
+    R<List<AppUser>> getAppUserList(@RequestBody Collection<Long> appUserIdSet) {
+        return R.ok(appUserService.listByIds(appUserIdSet));
+    }
 }

--
Gitblit v1.7.1