From 680028df90e18299ea72d242a28a3ddcd9a0441c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 24 七月 2024 13:45:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/web/src/main/java/com/doumee/api/web/CustomerApi.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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..d356e41 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;
@@ -91,8 +92,6 @@
public ApiResponse<AccountResponse> wxLoginCustomer(@RequestParam String code,String iamId) {
return ApiResponse.success(memberService.wxLogin(code,iamId));
}
-
-
@LoginRequired
@@ -210,7 +209,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);
}
@@ -361,6 +360,7 @@
return ApiResponse.success("鏌ヨ鎴愬姛",newsService.getCustomizedNewsDetail(id));
}
+ @UserLoginRequired
@LoginRequired
@ApiOperation(value = "淇濆瓨鎺ㄥ箍鍜ㄨ鍒嗕韩璁板綍", notes = "瀹㈡埛绔皬绋嬪簭")
@GetMapping("/saveShareRecord")
@@ -511,8 +511,8 @@
@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),
@@ -546,11 +546,12 @@
@ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true),
})
public ApiResponse<ZTProductInfoResponse> getProductInfo(@RequestParam String id) {
- ZTProductInfoResponse ztProductInfoResponse= getZhongTaiDataService.getProductInfo(id,ZTConstants.CUSTOMER,getMemberId());
+ ZTProductInfoResponse ztProductInfoResponse= getZhongTaiDataService.getProductInfo(id,getUserType(),getMemberId());
return ApiResponse.success("鏌ヨ鎴愬姛",ztProductInfoResponse);
}
+ @UserLoginRequired
@LoginRequired
@ApiOperation(value = "鎴戠殑鏀惰棌/鍠滄鍒楄〃 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
@PostMapping("/collectLikePage")
@@ -559,9 +560,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