From b01f752252eaadd1fa31eda6a9ad43146660b721 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 03 四月 2025 23:42:57 +0800
Subject: [PATCH] bug修改
---
xinquan-api/xinquan-api-user/src/main/java/com/xinquan/user/api/feign/RemoteAppUserService.java | 190 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 182 insertions(+), 8 deletions(-)
diff --git a/xinquan-api/xinquan-api-user/src/main/java/com/xinquan/user/api/feign/RemoteAppUserService.java b/xinquan-api/xinquan-api-user/src/main/java/com/xinquan/user/api/feign/RemoteAppUserService.java
index 0735297..a576d9d 100644
--- a/xinquan-api/xinquan-api-user/src/main/java/com/xinquan/user/api/feign/RemoteAppUserService.java
+++ b/xinquan-api/xinquan-api-user/src/main/java/com/xinquan/user/api/feign/RemoteAppUserService.java
@@ -3,23 +3,124 @@
import com.xinquan.common.core.constant.SecurityConstants;
import com.xinquan.common.core.constant.ServiceNameConstants;
import com.xinquan.common.core.domain.R;
-import com.xinquan.user.api.domain.AppUser;
+import com.xinquan.common.core.utils.page.PageDTO;
+import com.xinquan.system.api.domain.*;
+import com.xinquan.system.api.domain.vo.AppUserVO;
+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.user.api.domain.dto.AppUserDTO;
+import com.xinquan.user.api.domain.dto.OrderListDTO;
import com.xinquan.user.api.factory.RemoteAppUserFallbackFactory;
+
+import java.math.BigDecimal;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.*;
/**
* @author mitao
* @date 2024/8/21
*/
-@FeignClient(contextId = "remoteAppUserService", value = ServiceNameConstants.APP_USER, fallbackFactory = RemoteAppUserFallbackFactory.class)
+@FeignClient(contextId = "remoteAppUserService", value = ServiceNameConstants.APP_USER_SERVICE, fallbackFactory = RemoteAppUserFallbackFactory.class)
public interface RemoteAppUserService {
+ @GetMapping("/client/app-user/getUserById/{id}")
+ public R<AppUser> getUserById(@PathVariable("id") Long id);
+ @PostMapping("/client/app-user/saveQrCode")
+ public R saveQrCode(@RequestBody AppUser appUser);
+
+ @PostMapping("/client/app-user-tree/getUserEnergy/{id}")
+ public R getUserEnergy(@PathVariable("id")Long id);
+ @PostMapping("/client/app-user/getUserBlackList/{appUserId}")
+ public R<List<Long>> getUserBlackList(@PathVariable("appUserId") Long appUserId);
+ @GetMapping("/client/app-user/deleteBalance/{id}/{amount}")
+ public R deleteBalance(@PathVariable("id")String id,@PathVariable("amount")String amount);
+ @PostMapping("/user/app-user-viewing-history/getCourseChapterHistoryState/{id}/{chapterId}")
+ public R<Integer> getCourseChapterHistoryState(@PathVariable("id") Long id,@PathVariable("chapterId") Long chapterId);
+ @GetMapping("/client/user/notice-record/addNotice/{id}/{courseId}/{userId}/{price}")
+ public R addNotice(@PathVariable("id")String id,@PathVariable("courseId")String courseId
+ ,@PathVariable("userId")String userId,@PathVariable("price")String price);
+ @GetMapping("/client/app-user/getUserByPhone/{phone}")
+ public R<AppUser> getUserByPhone(@PathVariable("phone")String phone);
+ @PostMapping("/user/app-user-viewing-history/getMeditationHistoryCount/{id}")
+ public R<Long> getMeditationHistoryCount(@PathVariable("id") Long id);
+ @PostMapping("/user/app-user-viewing-history/getMeditationHistoryCountAll")
+ public R<List<AppUserViewingHistory>> getMeditationHistoryCountAll();
+ @PostMapping("/user/app-user-viewing-history/getCourseHistoryCount/{id}")
+ public R<Long> getCourseHistoryCount(@PathVariable("id") Long id);
+ @PostMapping("/user/app-user-viewing-history/getCourseChapterHistoryCount/{id}")
+ public R<Long> getCourseChapterHistoryCount(@PathVariable("id") Long id);
+
+ @PostMapping("/client/tag/queryTagList/{ids}")
+ public R<List<String>> queryTagList(@PathVariable("ids") String ids);
+ @PostMapping("/user/app-user-viewing-history/getCourseHistoryByUserId/{id}")
+ public R<List<Long>> getCourseHistoryByUserId(@PathVariable("id") Long id);
+ @GetMapping("/client/app-user/getAllUserList")
+ public R<List<AppUser>> getAllUserList();
+ @GetMapping("/client/app-user/addBalance/{id}/{money}")
+ public R addBalance(@PathVariable("id")Long id,@PathVariable("money") BigDecimal money);
+ @GetMapping("/client/app-user/addVipExpireTime/{id}/{type}")
+ public R addVipExpireTime(@PathVariable("id")Long id,@PathVariable("type")Integer type);
+ @PostMapping("/client/app-user/getUserListCount")
+ public R<Map<String,Object>> getUserListCount();
+ @PostMapping("/client/prize-redemption-record/getPrizeRecordCount")
+ public R<String> getPrizeRecordCount();
+ @PostMapping("/client/app-user/getUserCount")
+ public R<String> getUserCount();
+ @PostMapping("/client/app-user-withdraw/getWithdrawList")
+ public R<List<AppUserWithdraw>> getWithdraw(@RequestBody OrderListDTO courseDTO);
+ @PostMapping("/client/app-user-wallet-record/addBalanceRecord")
+ public R addBalanceRecord(@RequestBody AppUserWalletRecord appUserWalletRecord);
+ /**
+ * 远程调用 购买课程后 增加课程与用户关系表
+ *
+ * @return 用户信息
+ * @see AppUserVO
+ */
+ @GetMapping("/client/app-user-course/addAppUserCourse/{courseId}/{appUserId}/{orderId}/{giftFlag}")
+ public R addAppUserCourse(@PathVariable("courseId") Long courseId,
+ @PathVariable("appUserId") Long appUserId,
+ @PathVariable("orderId") Long orderId,
+ @PathVariable("giftFlag") Integer giftFlag
+ );
+ /**
+ * 后台远程调用 新增回复消息
+ * @return
+ */
+ @PostMapping("/client/user/notice-record/addNoticeReplay")
+ public R addNoticeReplay(@RequestBody NoticeRecord noticeRecord);
+ /**
+ * 远程调用根据用户id 查询用户
+ */
+ @PostMapping("/client/app-user/getAppUserById/{id}")
+ public R<AppUser> getAppUserById(@PathVariable("id")String id);
+ /**
+ * 远程调用根据用户名称 查询用户
+ */
+ @PostMapping("/client/app-user/getAppUserByName/{name}")
+ public R<List<Long>> getAppUserByName(@PathVariable("name")String name);
+ @PostMapping("/client/app-user/getAppUserByNameOrPhone/{name}")
+ public R<List<Long>> getAppUserByNameOrPhone(@PathVariable("name")String name);
+ @PostMapping("/client/tag/queryTag/{name}")
+ public R<List<Tag>> queryTag(@PathVariable("name") String name);
+ @PostMapping("/client/app-user/getCurrentUser")
+ public R<AppUserVO> getCurrentUser();
+ @GetMapping("/client/app-user-course/getPayCourse/{pageCurr}/{pageSize}/{id}")
+ R<PageDTO<AppUserCourse>> getPayCourse(@PathVariable("pageCurr")Integer pageCurr, @PathVariable("pageSize")Integer pageSize
+ , @PathVariable("id")String id);
+ @PostMapping("/user/app-user-viewing-history/getCourseStudyHistory")
+ R<AppUserViewingHistory> getCourseStudyHistory(@RequestParam("chapterId") Long chapterId);
+
+ @GetMapping("/client/app-user-course/getUserByCourseId/{courseId}")
+ R<List<AppUser>> getUserByCourseId(@PathVariable("courseId") Long courseId);
/**
- * 获取用户信息
+ * 获取未注销的用户信息
*
* @param dto
* @param source
@@ -28,15 +129,88 @@
@PostMapping("/inner/app-user/getUserByCondition")
R<AppUser> getUserByCondition(@RequestBody AppUserDTO dto,
@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+ @PostMapping("/inner/app-user/getUserByCondition1")
+ R<AppUser> getUserByCondition1(@RequestBody AppUserDTO dto,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
/**
- * app用户注册
+ * APP用户注册
*
* @param appUserDTO
* @param source
* @return
*/
@PostMapping("/inner/app-user/registerAppUser")
- R<Boolean> registerAppUser(@RequestBody AppUserDTO appUserDTO,
+ R<AppUser> registerAppUser(@RequestBody AppUserDTO appUserDTO,
@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+ /**
+ * APP微信登录
+ *
+ * @param body
+ * @param source
+ * @return
+ */
+ @PostMapping("/inner/app-user/wxLogin")
+ R<AppLoginUser> wxLogin(@RequestBody AppWXLoginBody body,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+ /**
+ * APP苹果登录
+ *
+ * @param appleId
+ * @param source
+ * @return
+ */
+ @PostMapping("/inner/app-user/appleLogin")
+ R<AppLoginUser> appleLogin(@RequestParam("appleId") String appleId,@RequestParam("device") String device,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+ /**
+ * 验证码登录
+ *
+ * @param body
+ * @param source
+ * @return
+ */
+ @PostMapping("/inner/app-user/captchaLogin")
+ R<AppLoginUser> appCaptchaLogin(@RequestBody AppCaptchaBody body,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+ /**
+ * 微信苹果登录验证手机号码操作
+ *
+ * @param body
+ * @param source
+ * @return
+ */
+ @PostMapping("/inner/app-user/verifyCellPhone")
+ R<AppLoginUser> verifyCellPhone(@RequestBody AppVerifyCellPhoneBody body,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+ /**
+ * 更新用户信息
+ *
+ * @param dto
+ * @param source
+ * @return
+ */
+ @PostMapping("/inner/app-user/updateAppUser")
+ R<?> updateAppUser(@RequestBody AppUserDTO dto,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+ /**
+ * 获取用户列表
+ *
+ * @param appUserIdSet 用户id列表
+ * @param source 请求来源
+ * @return
+ */
+ @PostMapping("/inner/app-user/getAppUserList")
+ R<List<AppUser>> getAppUserList(@RequestBody Collection<Long> appUserIdSet,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+ @GetMapping("/client/app-user-course/deleteAppUserCourse/{courseId}/{appUserId}")
+ void deleteAppUserCourse(@PathVariable("courseId") Long courseId,@PathVariable("appUserId") Long appUserId);
+ @PostMapping("/client/app-user/subVipExpireTime/{appUserId}/{type}")
+ public void subVipExpireTime(@PathVariable("appUserId") Long appUserId,@PathVariable("type") Integer type);
}
--
Gitblit v1.7.1