From a50adedd851b802b8855ed6ea47ea21a7257f00d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 26 七月 2024 11:42:50 +0800
Subject: [PATCH] 提交
---
server/web/src/main/java/com/doumee/api/web/CustomerApi.java | 86 +++++++++++++++++++++++++++++--------------
1 files changed, 58 insertions(+), 28 deletions(-)
diff --git a/server/web/src/main/java/com/doumee/api/web/CustomerApi.java b/server/web/src/main/java/com/doumee/api/web/CustomerApi.java
index 10b0573..74fd760 100644
--- a/server/web/src/main/java/com/doumee/api/web/CustomerApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/CustomerApi.java
@@ -5,6 +5,7 @@
import com.doumee.biz.zbom.model.zhongtai.*;
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;
@@ -82,6 +83,7 @@
@Autowired
private ActionsService actionsService;
+
@ApiOperation(value = "瀹㈡埛绔皬绋嬪簭鐧婚檰", notes = "瀹㈡埛绔皬绋嬪簭")
@GetMapping("/wxLoginCustomer")
@ApiImplicitParams({
@@ -91,8 +93,6 @@
public ApiResponse<AccountResponse> wxLoginCustomer(@RequestParam String code,String iamId) {
return ApiResponse.success(memberService.wxLogin(code,iamId));
}
-
-
@LoginRequired
@@ -210,7 +210,7 @@
@ApiOperation(value = "鐢ㄦ埛娉ㄩ攢", notes = "瀹㈡埛绔皬绋嬪簭")
@GetMapping("/logOff")
public ApiResponse logOff() {
- ZTBaseRequst ztBaseRequst = memberService.logOff(getUserId());
+ ZTBaseRequst ztBaseRequst = memberService.logOff(getUserId(),getToken());
if(Objects.nonNull(ztBaseRequst)){
getZhongTaiDataService.userLogout(ztBaseRequst);
}
@@ -297,6 +297,7 @@
+ @UserLoginRequired
@LoginRequired
@ApiOperation(value = "鍒嗙被鏁版嵁 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
@PostMapping("/getCatalogList")
@@ -305,13 +306,14 @@
})
public ApiResponse<List<ZTCatalogInfoResponse>> getCatalogList (@RequestBody ZTCatalogListRequest ztCatalogListRequest ) {
ztCatalogListRequest.setUserId(getMemberId()+"");
- ztCatalogListRequest.setUserType(ZTConstants.CUSTOMER);
+ ztCatalogListRequest.setUserType(getUserType());
List<ZTCatalogInfoResponse> ztCatalogInfoResponseList = getZhongTaiDataService.getCatalogList(ztCatalogListRequest);
return ApiResponse.success("鏌ヨ鎴愬姛",ztCatalogInfoResponseList);
}
+ @UserLoginRequired
@LoginRequired
@ApiOperation(value = "鏍囩鏁版嵁 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
@PostMapping("/getCataLogTagList")
@@ -320,13 +322,14 @@
})
public ApiResponse<List<ZTTagInfoResponse>> getCataLogTagList(@RequestBody ZTCatalogListRequest ztCatalogListRequest ) {
ztCatalogListRequest.setUserId(getMemberId()+"");
- ztCatalogListRequest.setUserType(ZTConstants.CUSTOMER);
+ ztCatalogListRequest.setUserType(getUserType());
List<ZTTagInfoResponse> ztTagInfoResponseList = getZhongTaiDataService.getCataLogTagList(ztCatalogListRequest);
return ApiResponse.success("鏌ヨ鎴愬姛",ztTagInfoResponseList);
}
+ @UserLoginRequired
@LoginRequired
@ApiOperation(value = "琛屼负鍐呭鎺ュ彛 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
@GetMapping("/actionDo")
@@ -336,10 +339,11 @@
@ApiImplicitParam(paramType = "query", dataType = "String", name = "actionType", value = "琛屼负绫诲瀷锛氭敹钘忥細collect;鍙栨秷鏀惰棌锛歝ollect_cancel;鍠滄锛歭ike;鍙栨秷鍠滄锛歭ike_cancel锛涙祻瑙堬細view;鍒嗕韩锛歴hare;涓嬭浇锛歞ownload", required = true),
})
public ApiResponse actionDo(@RequestParam String id,@RequestParam String actionType) {
- getZhongTaiDataService.actionDo(getMemberId(),ZTConstants.CUSTOMER,id,actionType);
+ getZhongTaiDataService.actionDo(getMemberId(),getUserType(),id,actionType);
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
+ @UserLoginRequired
@LoginRequired
@ApiOperation(value = "瀹氬埗鏈嶅姟鍒楄〃", notes = "瀹㈡埛绔皬绋嬪簭")
@GetMapping("/getCustomizedNewsList")
@@ -350,6 +354,7 @@
return ApiResponse.success("鏌ヨ鎴愬姛",newsService.getCustomizedNewsList(Constants.ONE,null,null));
}
+ @UserLoginRequired
@LoginRequired
@ApiOperation(value = "瀹氬埗鏈嶅姟璇︽儏", notes = "瀹㈡埛绔皬绋嬪簭")
@GetMapping("/getCustomizedNewsDetail")
@@ -361,6 +366,7 @@
return ApiResponse.success("鏌ヨ鎴愬姛",newsService.getCustomizedNewsDetail(id));
}
+ @UserLoginRequired
@LoginRequired
@ApiOperation(value = "淇濆瓨鎺ㄥ箍鍜ㄨ鍒嗕韩璁板綍", notes = "瀹㈡埛绔皬绋嬪簭")
@GetMapping("/saveShareRecord")
@@ -381,7 +387,7 @@
})
public ApiResponse<ZTBasePageResponse<ZTCusFavoritesInfoResponse>> getZhongTaiCusFavorite(@RequestBody ZTContentListRequest ztContentListRequest) {
ztContentListRequest.setUserId(getMemberId()+"");
- ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
+ ztContentListRequest.setUserType(getUserType());
ZTBasePageResponse<ZTCusFavoritesInfoResponse> ztBasePageResponse = getZhongTaiDataService.getZhongTaiCusFavorite(ztContentListRequest);
return ApiResponse.success("鑾峰彇鎴愬姛",ztBasePageResponse);
}
@@ -396,13 +402,14 @@
})
public ApiResponse<List<ZTCusCarouselImageResponse>> getZhongTaiCarouselImage(@RequestBody ZTContentListRequest ztContentListRequest) {
ztContentListRequest.setUserId(getMemberId()+"");
- ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
+ ztContentListRequest.setUserType(getUserType());
List<ZTCusCarouselImageResponse> ztCusCarouselImageResponseList = getZhongTaiDataService.getZhongTaiCarouselImage(ztContentListRequest);
return ApiResponse.success("鑾峰彇鎴愬姛",ztCusCarouselImageResponseList);
}
+ @UserLoginRequired
@LoginRequired
@ApiOperation(value = "杞挱鍥捐鎯�", notes = "瀹㈡埛绔皬绋嬪簭")
@PostMapping("/getZhongTaiCarouselImageDetail")
@@ -411,12 +418,13 @@
})
public ApiResponse<ZTCusCarouselImageResponse> getZhongTaiCarouselImageDetail(@RequestBody ZTDataDetailRequest ztDataDetailRequest) {
ztDataDetailRequest.setUserId(getMemberId()+"");
- ztDataDetailRequest.setUserType(ZTConstants.CUSTOMER);
+ ztDataDetailRequest.setUserType(getUserType());
ZTCusCarouselImageResponse ztCusCarouselImageResponse = getZhongTaiDataService.getZhongTaiCarouselImageDetail(ztDataDetailRequest);
return ApiResponse.success("鑾峰彇鎴愬姛",ztCusCarouselImageResponse);
}
+ @UserLoginRequired
@LoginRequired
@ApiOperation(value = "鍜ㄨ鍒嗛〉鍒楄〃 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
@PostMapping("/getZhongTaiProductNewsPage")
@@ -425,12 +433,17 @@
})
public ApiResponse<ZTBasePageResponse<ZTProductNewsInfoResponse>> getZhongTaiProductNewsPage(@RequestBody ZTContentListRequest ztContentListRequest) {
ztContentListRequest.setUserId(getMemberId()+"");
- ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
+ ztContentListRequest.setUserType(getUserType());
ZTBasePageResponse<ZTProductNewsInfoResponse> ztBasePageResponse= getZhongTaiDataService.getZhongTaiProductNewsPage(ztContentListRequest);
return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse);
}
+
+
+
+
+ @UserLoginRequired
@LoginRequired
@ApiOperation(value = "浜у搧鍒嗛〉鍒楄〃 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
@PostMapping("/getZhongTaiProductPage")
@@ -439,11 +452,13 @@
})
public ApiResponse<ZTBasePageResponse<ZTProductInfoResponse>> getZhongTaiProductPage(@RequestBody ZTContentListRequest ztContentListRequest) {
ztContentListRequest.setUserId(getMemberId()+"");
- ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
+ ztContentListRequest.setUserType(getUserType());
ZTBasePageResponse<ZTProductInfoResponse> ztBasePageResponse= getZhongTaiDataService.getZhongTaiProductPage(ztContentListRequest);
return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse);
}
+
+ @UserLoginRequired
@LoginRequired
@ApiOperation(value = "瀹炴櫙鍒嗛〉鍒楄〃 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
@PostMapping("/getZhongTaiRealcasePage")
@@ -452,11 +467,13 @@
})
public ApiResponse<ZTBasePageResponse<ZTRealcaseInfoResponse>> getZhongTaiRealcasePage(@RequestBody ZTContentListRequest ztContentListRequest) {
ztContentListRequest.setUserId(getMemberId()+"");
- ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
+ ztContentListRequest.setUserType(getUserType());
ZTBasePageResponse<ZTRealcaseInfoResponse> ztBasePageResponse= getZhongTaiDataService.getZhongTaiRealcasePage(ztContentListRequest);
return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse);
}
+
+ @UserLoginRequired
@LoginRequired
@ApiOperation(value = "瑙嗛鍒嗛〉鍒楄〃 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
@PostMapping("/getZhongTaiVideoPage")
@@ -465,11 +482,13 @@
})
public ApiResponse<ZTBasePageResponse<ZTVideoInfoResponse>> getZhongTaiVideoPage(@RequestBody ZTContentListRequest ztContentListRequest) {
ztContentListRequest.setUserId(getMemberId()+"");
- ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
+ ztContentListRequest.setUserType(getUserType());
ZTBasePageResponse<ZTVideoInfoResponse> ztBasePageResponse= getZhongTaiDataService.getZhongTaiVideoPage(ztContentListRequest);
return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse);
}
+
+ @UserLoginRequired
@LoginRequired
@ApiOperation(value = "鍏ㄥ眿妗堜緥鍒嗛〉鍒楄〃 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
@PostMapping("/getZhongTaiWholecasePage")
@@ -478,11 +497,13 @@
})
public ApiResponse<ZTBasePageResponse<ZTCaseInfoResponse>> getZhongTaiWholecasePage(@RequestBody ZTContentListRequest ztContentListRequest) {
ztContentListRequest.setUserId(getMemberId()+"");
- ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
+ ztContentListRequest.setUserType(getUserType());
ZTBasePageResponse<ZTCaseInfoResponse> ztBasePageResponse= getZhongTaiDataService.getZhongTaiWholecasePage(ztContentListRequest);
return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse);
}
+
+ @UserLoginRequired
@LoginRequired
@ApiOperation(value = "蹇楄瑁呬慨鍒嗛〉鍒楄〃 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
@PostMapping("/getZhongTaiZbDecoPage")
@@ -491,66 +512,76 @@
})
public ApiResponse<ZTBasePageResponse<ZTZbDecoInfoResponse>> getZhongTaiZbDecoPage(@RequestBody ZTContentListRequest ztContentListRequest) {
ztContentListRequest.setUserId(getMemberId()+"");
- ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
+ ztContentListRequest.setUserType(getUserType());
ZTBasePageResponse<ZTZbDecoInfoResponse> ztBasePageResponse= getZhongTaiDataService.getZhongTaiZbDecoPage(ztContentListRequest);
return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse);
}
+
+ @UserLoginRequired
@LoginRequired
@ApiOperation(value = "鍏ㄥ眿妗堜緥璇︽儏 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
@GetMapping("/getWholecaseInfo")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
@ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true),
+ @ApiImplicitParam(paramType = "query", dataType = "String", name = "salesId", value = "瀵艰喘涓婚敭锛堜簩缁寸爜鍒嗕韩锛�", required = false),
})
- public ApiResponse<ZTCaseInfoResponse> getWholecaseInfo(@RequestParam String id) {
- ZTCaseInfoResponse ztCaseInfoResponse= getZhongTaiDataService.getWholecaseInfo(id,ZTConstants.CUSTOMER,getMemberId());
+ public ApiResponse<ZTCaseInfoResponse> getWholecaseInfo(@RequestParam String id,String salesId) {
+ ZTCaseInfoResponse ztCaseInfoResponse= getZhongTaiDataService.getWholecaseInfo(id,getUserType(),getMemberId(),salesId);
return ApiResponse.success("鏌ヨ鎴愬姛",ztCaseInfoResponse);
}
+
+ @UserLoginRequired
@LoginRequired
- @ApiOperation(value = "浜у搧璧勮璇︽儏 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
@GetMapping("/getProductNewsInfo")
+ @ApiOperation(value = "浜у搧璧勮璇︽儏 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
@ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true),
+ @ApiImplicitParam(paramType = "query", dataType = "String", name = "salesId", value = "瀵艰喘涓婚敭锛堜簩缁寸爜鍒嗕韩锛�", required = false),
})
- public ApiResponse<ZTProductNewsInfoResponse> getProductNewsInfo(@RequestParam String id) {
- ZTProductNewsInfoResponse ztProductNewsInfoResponse= getZhongTaiDataService.getProductNewsInfo(id,ZTConstants.CUSTOMER,getMemberId());
+ public ApiResponse<ZTProductNewsInfoResponse> getProductNewsInfo(@RequestParam String id,String salesId) {
+ ZTProductNewsInfoResponse ztProductNewsInfoResponse= getZhongTaiDataService.getProductNewsInfo(id,getUserType(),getMemberId(),salesId);
return ApiResponse.success("鏌ヨ鎴愬姛",ztProductNewsInfoResponse);
}
+
+ @UserLoginRequired
@LoginRequired
@ApiOperation(value = "瀹炴櫙妗堜緥 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
@GetMapping("/getRealcaseInfo")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
@ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true),
+ @ApiImplicitParam(paramType = "query", dataType = "String", name = "salesId", value = "瀵艰喘涓婚敭锛堜簩缁寸爜鍒嗕韩锛�", required = false),
})
- public ApiResponse<ZTRealcaseInfoResponse> getRealcaseInfo(@RequestParam String id) {
- ZTRealcaseInfoResponse ztRealcaseInfoResponse= getZhongTaiDataService.getRealcaseInfo(id,ZTConstants.CUSTOMER,getMemberId());
+ public ApiResponse<ZTRealcaseInfoResponse> getRealcaseInfo(@RequestParam String id,String salesId) {
+ ZTRealcaseInfoResponse ztRealcaseInfoResponse= getZhongTaiDataService.getRealcaseInfo(id,getUserType(),getMemberId(),salesId);
return ApiResponse.success("鏌ヨ鎴愬姛",ztRealcaseInfoResponse);
}
-
-
+ @UserLoginRequired
@LoginRequired
@ApiOperation(value = "浜у搧璇︽儏 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
@GetMapping("/getProductInfo")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
@ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true),
+ @ApiImplicitParam(paramType = "query", dataType = "String", name = "salesId", value = "瀵艰喘涓婚敭锛堜簩缁寸爜鍒嗕韩锛�", required = false),
})
- public ApiResponse<ZTProductInfoResponse> getProductInfo(@RequestParam String id) {
- ZTProductInfoResponse ztProductInfoResponse= getZhongTaiDataService.getProductInfo(id,ZTConstants.CUSTOMER,getMemberId());
+ public ApiResponse<ZTProductInfoResponse> getProductInfo(@RequestParam String id,String salesId) {
+ ZTProductInfoResponse ztProductInfoResponse= getZhongTaiDataService.getProductInfo(id,getUserType(),getMemberId(),salesId);
return ApiResponse.success("鏌ヨ鎴愬姛",ztProductInfoResponse);
}
+ @UserLoginRequired
@LoginRequired
@ApiOperation(value = "鎴戠殑鏀惰棌/鍠滄鍒楄〃 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
@PostMapping("/collectLikePage")
@@ -559,9 +590,8 @@
})
public ApiResponse<ZTBasePageResponse<ZTCollectLikeInfoResponse>> collectLikePage(@RequestBody ZTCollectLikeRequest ztCollectLikeRequest) {
ztCollectLikeRequest.setUserId(getMemberId()+"");
- ztCollectLikeRequest.setUserType(ZTConstants.CUSTOMER);
+ ztCollectLikeRequest.setUserType(getUserType());
ZTBasePageResponse<ZTCollectLikeInfoResponse> ztBasePageResponse= getZhongTaiDataService.collectLikePage(ztCollectLikeRequest);
return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse);
}
-
}
--
Gitblit v1.9.3