From 2cbd23d061be5076b86771750bf17615bbecb57d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 17 七月 2024 11:41:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/web/src/main/java/com/doumee/api/web/PersonnelApi.java | 148 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 140 insertions(+), 8 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 42bac63..18368d3 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
@@ -1,12 +1,19 @@
package com.doumee.api.web;
import com.doumee.biz.zbom.ZbomCRMService;
+import com.doumee.biz.zbom.model.crm.CrmCustomerListRequest;
+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.ZTContentListRequest;
+import com.doumee.biz.zbom.model.zhongtai.response.*;
import com.doumee.config.annotation.LoginRequired;
import com.doumee.config.annotation.UserLoginRequired;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.Shop;
import com.doumee.dao.business.model.SmsEmail;
import com.doumee.dao.web.reqeust.EditMemberRequest;
@@ -14,10 +21,7 @@
import com.doumee.dao.web.reqeust.EditUsersRequest;
import com.doumee.dao.web.reqeust.ContentShareImgDto;
import com.doumee.dao.web.response.AccountResponse;
-import com.doumee.service.business.MemberService;
-import com.doumee.service.business.ShopService;
-import com.doumee.service.business.SmsEmailService;
-import com.doumee.service.business.UsersService;
+import com.doumee.service.business.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -27,6 +31,8 @@
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
/**
* Created by IntelliJ IDEA.
@@ -49,6 +55,12 @@
@Autowired
public ShopService shopService;
+
+ @Autowired
+ public GetCrmDataService getCrmDataService;
+
+ @Autowired
+ private GetZhongTaiDataService getZhongTaiDataService;
@ApiOperation(value = "灏忕▼搴忕櫥闄�", notes = "鍛樺伐绔皬绋嬪簭")
@GetMapping("/loginByWx")
@@ -103,10 +115,9 @@
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
})
public ApiResponse getUserDetail() {
- usersService.usersDetail(getMemberId());
+ usersService.usersDetailById(getMemberId());
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
-
@UserLoginRequired
@ApiOperation(value = "鏇存柊涓汉淇℃伅", notes = "鍛樺伐绔皬绋嬪簭")
@@ -119,8 +130,6 @@
usersService.editUserInfo(editUsersRequest);
return ApiResponse.success("鏇存柊鎴愬姛");
}
-
-
@UserLoginRequired
@ApiOperation(value = "闂ㄥ簵鍒嗛〉", notes = "鍛樺伐绔皬绋嬪簭")
@PostMapping("/shopPage")
@@ -158,6 +167,7 @@
public ApiResponse<String> getUserCard() {
return ApiResponse.success(usersService.getUserCard(this.getLoginUserInfo()));
}
+
@ApiOperation(value = "鑾峰彇鍐呭鍒嗕韩娴锋姤", notes = "鑾峰彇鍐呭鍒嗕韩娴锋姤锛屽姞灏忕▼搴忕爜")
@PostMapping("/getContentShareImg")
public ApiResponse<String> getContentShareImg(@RequestBody ContentShareImgDto param) {
@@ -165,4 +175,126 @@
}
+ @UserLoginRequired
+ @ApiOperation(value = "鑾峰彇瀹㈡埛/娼滃鍒楄〃", notes = "鍛樺伐绔皬绋嬪簭")
+ @PostMapping("/getCustomerList")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse<CRMBaseResponse<List<CRMCustomerListResponse>>> getCustomerList(@RequestBody CrmCustomerListRequest crmCustomerListRequest) {
+ crmCustomerListRequest.setUserId(getMemberId());
+ return ApiResponse.success(getCrmDataService.getCrmCustomerList(crmCustomerListRequest));
+ }
+
+
+
+
+ @LoginRequired
+ @ApiOperation(value = "鍒嗙被鏁版嵁 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
+ @PostMapping("/getCatalogList")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse<List<ZTCatalogInfoResponse>> getCatalogList (@RequestBody ZTCatalogListRequest ztCatalogListRequest ) {
+ List<ZTCatalogInfoResponse> ztCatalogInfoResponseList = getZhongTaiDataService.getCatalogList(ztCatalogListRequest);
+ return ApiResponse.success("鏌ヨ鎴愬姛",ztCatalogInfoResponseList);
+ }
+
+
+
+ @LoginRequired
+ @ApiOperation(value = "鏍囩鏁版嵁 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
+ @PostMapping("/getCataLogTagList")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse<List<ZTTagInfoResponse>> getCataLogTagList(@RequestBody ZTCatalogListRequest ztCatalogListRequest ) {
+ List<ZTTagInfoResponse> ztTagInfoResponseList = getZhongTaiDataService.getCataLogTagList(ztCatalogListRequest);
+ 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 = "瀹㈡埛绔皬绋嬪簭")
+ @PostMapping("/pageContentList")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse<ZTBasePageResponse<ZTContentListResponse>> pageContentList(@RequestBody ZTContentListRequest ztContentListRequest) {
+ ZTBasePageResponse<ZTContentListResponse> ztBasePageResponse= getZhongTaiDataService.pageContentList(ztContentListRequest);
+ return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse);
+ }
+
+ @LoginRequired
+ @ApiOperation(value = "鍐呭璇︽儏 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
+ @GetMapping("/getContentInfo")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ @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());
+ return ApiResponse.success("鏌ヨ鎴愬姛",ztContentInfoResponse);
+ }
+
+
+ @LoginRequired
+ @ApiOperation(value = "鍐呭鏀惰棌 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
+ @GetMapping("/collectContent")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true),
+ })
+ public ApiResponse collectContent(@RequestParam String id) {
+ getZhongTaiDataService.collectContent(getMemberId(),Constants.BUSINESS,id);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+ @LoginRequired
+ @ApiOperation(value = "鍐呭鍠滄 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
+ @GetMapping("/likeContent")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true),
+ })
+ public ApiResponse likeContent(@RequestParam String id) {
+ getZhongTaiDataService.likeContent(getMemberId(),Constants.BUSINESS,id);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+
+ @LoginRequired
+ @ApiOperation(value = "鍐呭鍒嗕韩 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
+ @GetMapping("/shareContent")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true),
+ })
+ public ApiResponse shareContent(@RequestParam String id) {
+ getZhongTaiDataService.shareContent(getMemberId(),Constants.BUSINESS,id);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+
+ @LoginRequired
+ @ApiOperation(value = "鍐呭娴忚 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
+ @GetMapping("/viewContent")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true),
+ })
+ public ApiResponse viewContent(@RequestParam String id) {
+ getZhongTaiDataService.viewContent(getMemberId(),Constants.BUSINESS,id);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
}
--
Gitblit v1.9.3