From 07c1ebfe7589fd68363a9cb72301359f953658d3 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 10 一月 2025 17:57:32 +0800
Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/funingyunwei into 2.0.1
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java | 42 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 41 insertions(+), 1 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java
index f2d0c6f..e5f73cb 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java
@@ -44,7 +44,7 @@
@RestController
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/business/member")
public class MemberCloudController extends BaseController {
- @Autowired
+// @Autowired
private ERPSyncService erpSyncService;
@Autowired
private HkSyncOrgUserFromHKServiceImpl hkSyncOrgUserFHKService;
@@ -372,4 +372,44 @@
return ApiResponse.success(null);
}
+
+
+ /********************************************************闃滃畞杩愮淮*********************************************************************************************/
+
+ @PreventRepeat
+ @ApiOperation("闃滃畞杩愮淮 - 鏂板缓")
+ @PostMapping("/ywCreate")
+ @CloudRequiredPermission("business:member:create")
+ public ApiResponse ywCreate(@RequestBody Member member,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ member.setLoginUserInfo(this.getLoginUser(token));
+ memberService.ywCreate(member);
+ return ApiResponse.success("鎿嶄綔鎴愬姛锛�");
+ }
+
+
+ @ApiOperation("闃滃畞杩愮淮 - 鏍规嵁ID淇敼")
+ @PostMapping("/ywUpdateById")
+ @CloudRequiredPermission("business:member:update")
+ public ApiResponse ywUpdateById(@RequestBody Member member,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ member.setLoginUserInfo(this.getLoginUser(token));
+ memberService.ywUpdate(member);
+ return ApiResponse.success(null);
+ }
+
+
+ @ApiOperation("闃滃畞杩愮淮 - 鏌ヨ鍒楄〃")
+ @PostMapping("/ywList")
+ @CloudRequiredPermission("business:member:query")
+ public ApiResponse<List<Member>> ywList (@RequestBody Member model,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ return ApiResponse.success(memberService.ywList(model));
+ }
+
+
+ @ApiOperation("闃滃畞杩愮淮 - 鍒嗛〉鏌ヨ")
+ @PostMapping("/ywFindPage")
+ @CloudRequiredPermission("business:member:query")
+ public ApiResponse<PageData<Member>> ywFindPage (@RequestBody PageWrap<Member> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ return ApiResponse.success(memberService.ywFindPage(pageWrap));
+ }
+
}
--
Gitblit v1.9.3