From e685b58fd40cf28a20844643d70cc5f5b46ca037 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 10 四月 2026 11:08:17 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
server/web/src/main/java/com/doumee/api/web/UserApi.java | 163 +++++++++++++++++++++++-------------------------------
1 files changed, 70 insertions(+), 93 deletions(-)
diff --git a/server/web/src/main/java/com/doumee/api/web/UserApi.java b/server/web/src/main/java/com/doumee/api/web/UserApi.java
index 30cac74..c02650b 100644
--- a/server/web/src/main/java/com/doumee/api/web/UserApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/UserApi.java
@@ -1,6 +1,5 @@
package com.doumee.api.web;
-import com.doumee.config.wx.TransferToUser;
import com.doumee.core.annotation.LoginRequired;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
@@ -44,14 +43,14 @@
@Autowired
private MemberService memberService;
- @Autowired
- private IdentityInfoService identityInfoService;
+// @Autowired
+// private IdentityInfoService identityInfoService;
- @Autowired
- private MemberRevenueService memberRevenueService;
-
- @Autowired
- private WithdrawalOrdersService withdrawalOrdersService;
+// @Autowired
+// private MemberRevenueService memberRevenueService;
+//
+// @Autowired
+// private WithdrawalOrdersService withdrawalOrdersService;
@ApiOperation(value = "鑾峰彇绯荤粺閰嶇疆", notes = "灏忕▼搴忕")
@@ -84,104 +83,82 @@
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
- @LoginRequired
- @ApiOperation(value = "鍒囨崲鐢ㄥ伐韬唤", notes = "灏忕▼搴忕")
- @PostMapping("/editUseIdentity")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- })
- public ApiResponse editUseIdentity(@RequestBody Member member) {
- member.setId(getMemberId());
- memberService.editUseIdentity(member);
- return ApiResponse.success("鎿嶄綔鎴愬姛");
- }
+// @LoginRequired
+// @ApiOperation(value = "鍒囨崲鐢ㄥ伐韬唤", notes = "灏忕▼搴忕")
+// @PostMapping("/editUseIdentity")
+// @ApiImplicitParams({
+// @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+// })
+// public ApiResponse editUseIdentity(@RequestBody Member member) {
+// member.setId(getMemberId());
+// memberService.editUseIdentity(member);
+// return ApiResponse.success("鎿嶄綔鎴愬姛");
+// }
- @LoginRequired
- @ApiOperation(value = "鑾峰彇韬唤璁よ瘉淇℃伅", notes = "灏忕▼搴忕")
- @GetMapping("/getIdentityInfo")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- })
- public ApiResponse<IdentityInfo> getIdentityInfo(@RequestParam Integer type) {
- return ApiResponse.success("鏌ヨ鎴愬姛",identityInfoService.findByMemberType(type,getMemberId()));
- }
+// @LoginRequired
+// @ApiOperation(value = "鑾峰彇韬唤璁よ瘉淇℃伅", notes = "灏忕▼搴忕")
+// @GetMapping("/getIdentityInfo")
+// @ApiImplicitParams({
+// @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+// })
+// public ApiResponse<IdentityInfo> getIdentityInfo(@RequestParam Integer type) {
+// return ApiResponse.success("鏌ヨ鎴愬姛",identityInfoService.findByMemberType(type,getMemberId()));
+// }
- @LoginRequired
- @ApiOperation(value = "鐢宠韬唤淇℃伅", notes = "灏忕▼搴忕")
- @PostMapping("/applyForIdentity")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- })
- public ApiResponse applyForIdentity(@RequestBody IdentityInfo identityInfo) {
- identityInfo.setMemberId(getMemberId());
- identityInfoService.create(identityInfo);
- return ApiResponse.success("鎿嶄綔鎴愬姛");
- }
+// @LoginRequired
+// @ApiOperation(value = "鐢宠韬唤淇℃伅", notes = "灏忕▼搴忕")
+// @PostMapping("/applyForIdentity")
+// @ApiImplicitParams({
+// @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+// })
+// public ApiResponse applyForIdentity(@RequestBody IdentityInfo identityInfo) {
+// identityInfo.setMemberId(getMemberId());
+// identityInfoService.create(identityInfo);
+// return ApiResponse.success("鎿嶄綔鎴愬姛");
+// }
- @LoginRequired
- @ApiOperation(value = "淇敼韬唤淇℃伅锛堣璇佸け璐ュ悗浣跨敤锛�", notes = "灏忕▼搴忕")
- @PostMapping("/updateIdentity")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- })
- public ApiResponse updateIdentity(@RequestBody IdentityInfo identityInfo) {
- identityInfo.setMemberId(getMemberId());
- identityInfoService.updateById(identityInfo);
- return ApiResponse.success("鎿嶄綔鎴愬姛");
- }
+// @LoginRequired
+// @ApiOperation(value = "淇敼韬唤淇℃伅锛堣璇佸け璐ュ悗浣跨敤锛�", notes = "灏忕▼搴忕")
+// @PostMapping("/updateIdentity")
+// @ApiImplicitParams({
+// @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+// })
+// public ApiResponse updateIdentity(@RequestBody IdentityInfo identityInfo) {
+// identityInfo.setMemberId(getMemberId());
+// identityInfoService.updateById(identityInfo);
+// return ApiResponse.success("鎿嶄綔鎴愬姛");
+// }
- @LoginRequired
- @ApiOperation(value = "淇敼韬唤淇℃伅浣嶇疆锛堣璇佹垚鍔熷悗浣跨敤锛�", notes = "灏忕▼搴忕")
- @PostMapping("/updateLocation")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- })
- public ApiResponse updateLocation(@RequestBody IdentityInfo identityInfo) {
- identityInfo.setMemberId(getMemberId());
- identityInfoService.updateLocation(identityInfo);
- return ApiResponse.success("鎿嶄綔鎴愬姛");
- }
+// @LoginRequired
+// @ApiOperation(value = "淇敼韬唤淇℃伅浣嶇疆锛堣璇佹垚鍔熷悗浣跨敤锛�", notes = "灏忕▼搴忕")
+// @PostMapping("/updateLocation")
+// @ApiImplicitParams({
+// @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+// })
+// public ApiResponse updateLocation(@RequestBody IdentityInfo identityInfo) {
+// identityInfo.setMemberId(getMemberId());
+// identityInfoService.updateLocation(identityInfo);
+// return ApiResponse.success("鎿嶄綔鎴愬姛");
+// }
- @LoginRequired
- @ApiOperation("浣欓鏄庣粏")
- @PostMapping("/revenuePage")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- })
- public ApiResponse<PageData<MemberRevenue>> revenuePage (@RequestBody PageWrap<MemberRevenue> pageWrap) {
- pageWrap.getModel().setMemberId(this.getMemberId());
- return ApiResponse.success(memberRevenueService.findPage(pageWrap));
- }
-
- @LoginRequired
- @ApiOperation("鎻愮幇鐢宠")
- @PostMapping("/applyWithdrawal")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- })
- public ApiResponse<TransferToUser.TransferToUserResponse> applyWithdrawal (@RequestBody WithdrawalDTO withdrawalDTO) {
- withdrawalDTO.setMember(this.getMemberResponse());
- return ApiResponse.success("鎿嶄綔鎴愬姛",withdrawalOrdersService.applyWithdrawal(withdrawalDTO));
- }
+// @LoginRequired
+// @ApiOperation("浣欓鏄庣粏")
+// @PostMapping("/revenuePage")
+// @ApiImplicitParams({
+// @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+// })
+// public ApiResponse<PageData<MemberRevenue>> revenuePage (@RequestBody PageWrap<MemberRevenue> pageWrap) {
+// pageWrap.getModel().setMemberId(this.getMemberId());
+// return ApiResponse.success(memberRevenueService.findPage(pageWrap));
+// }
-
- @LoginRequired
- @ApiOperation("鎾ら攢鎻愮幇鐢宠")
- @PostMapping("/cancelTransfer")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- })
- public ApiResponse cancelTransfer (@RequestBody TransferToUser.CancelTransferRequest request) {
- withdrawalOrdersService.cancelTransfer(request);
- return ApiResponse.success("鎿嶄綔鎴愬姛");
- }
}
--
Gitblit v1.9.3