From f52c9ecaa576145ecb097e2335b5f12acddec93b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 18 七月 2024 15:04:21 +0800
Subject: [PATCH] 提交

---
 server/web/src/main/java/com/doumee/api/web/PersonnelApi.java |   27 +++++++++------------------
 1 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/server/web/src/main/java/com/doumee/api/web/PersonnelApi.java b/server/web/src/main/java/com/doumee/api/web/PersonnelApi.java
index 9b6eb64..722e029 100644
--- a/server/web/src/main/java/com/doumee/api/web/PersonnelApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/PersonnelApi.java
@@ -5,6 +5,7 @@
 import com.doumee.biz.zbom.model.crm.response.CRMBaseResponse;
 import com.doumee.biz.zbom.model.crm.response.CRMCustomerListResponse;
 import com.doumee.biz.zbom.model.zhongtai.ZTCatalogListRequest;
+import com.doumee.biz.zbom.model.zhongtai.ZTConstants;
 import com.doumee.biz.zbom.model.zhongtai.ZTContentListRequest;
 import com.doumee.biz.zbom.model.zhongtai.response.*;
 import com.doumee.config.annotation.LoginRequired;
@@ -104,7 +105,7 @@
             @ApiImplicitParam(paramType = "query", dataType = "String", name = "code", value = "寰俊code", required = true),
     })
     public ApiResponse bindingOpenid(@RequestParam String code) {
-        usersService.bindingOpenid(code,getMemberId());
+        usersService.bindingOpenid(code,getUserId());
         return  ApiResponse.success("鎿嶄綔鎴愬姛");
     }
 
@@ -115,7 +116,7 @@
             @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
     })
     public ApiResponse getUserDetail() {
-        usersService.usersDetailById(getMemberId());
+        usersService.usersDetailById(getUserId());
         return  ApiResponse.success("鎿嶄綔鎴愬姛");
     }
 
@@ -126,7 +127,7 @@
             @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
     })
     public ApiResponse editUsers(@RequestBody EditUsersRequest editUsersRequest) {
-        editUsersRequest.setUserId(getMemberId());
+        editUsersRequest.setUserId(getUserId());
         usersService.editUserInfo(editUsersRequest);
         return  ApiResponse.success("鏇存柊鎴愬姛");
     }
@@ -213,16 +214,6 @@
         return ApiResponse.success("鏌ヨ鎴愬姛",ztTagInfoResponseList);
     }
 
-    @LoginRequired
-    @ApiOperation(value = "鏍囩鏁版嵁 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
-    @PostMapping("/getZTCatalogInfoResponse")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
-    })
-    public ApiResponse<List<ZTCatalogInfoResponse>> getZTCatalogInfoResponse(@RequestBody ZTCatalogListRequest ztCatalogListRequest) {
-        List<ZTCatalogInfoResponse> ztCatalogInfoResponse = getZhongTaiDataService.getZTCatalogInfoResponse(ztCatalogListRequest);
-        return ApiResponse.success("鏌ヨ鎴愬姛",ztCatalogInfoResponse);
-    }
 
     @LoginRequired
     @ApiOperation(value = "鍐呭鍒嗛〉 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
@@ -243,7 +234,7 @@
             @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true),
     })
     public ApiResponse<ZTContentInfoResponse> getContentInfo(@RequestParam String id) {
-        ZTContentInfoResponse ztContentInfoResponse= getZhongTaiDataService.getContentInfo(id,Constants.BUSINESS,getMemberId());
+        ZTContentInfoResponse ztContentInfoResponse= getZhongTaiDataService.getContentInfo(id, ZTConstants.BUSINESS,getUserId());
         return ApiResponse.success("鏌ヨ鎴愬姛",ztContentInfoResponse);
     }
 
@@ -256,7 +247,7 @@
             @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true),
     })
     public ApiResponse collectContent(@RequestParam String id) {
-        getZhongTaiDataService.collectContent(getMemberId(),Constants.BUSINESS,id);
+        getZhongTaiDataService.collectContent(getUserId(),ZTConstants.BUSINESS,id);
         return ApiResponse.success("鎿嶄綔鎴愬姛");
     }
 
@@ -268,7 +259,7 @@
             @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true),
     })
     public ApiResponse likeContent(@RequestParam String id) {
-        getZhongTaiDataService.likeContent(getMemberId(),Constants.BUSINESS,id);
+        getZhongTaiDataService.likeContent(getUserId(),ZTConstants.BUSINESS,id);
         return ApiResponse.success("鎿嶄綔鎴愬姛");
     }
 
@@ -281,7 +272,7 @@
             @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true),
     })
     public ApiResponse shareContent(@RequestParam String id) {
-        getZhongTaiDataService.shareContent(getMemberId(),Constants.BUSINESS,id);
+        getZhongTaiDataService.shareContent(getUserId(),ZTConstants.BUSINESS,id);
         return ApiResponse.success("鎿嶄綔鎴愬姛");
     }
 
@@ -294,7 +285,7 @@
             @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true),
     })
     public ApiResponse viewContent(@RequestParam String id) {
-        getZhongTaiDataService.viewContent(getMemberId(),Constants.BUSINESS,id);
+        getZhongTaiDataService.viewContent(getUserId(),ZTConstants.BUSINESS,id);
         return ApiResponse.success("鎿嶄綔鎴愬姛");
     }
 }

--
Gitblit v1.9.3