From 86f415c76ab9f5b48960ff1086f996fa47733d46 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 17 七月 2024 17:36:07 +0800
Subject: [PATCH] 代码提交
---
server/web/src/main/java/com/doumee/api/web/CustomerApi.java | 88 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 76 insertions(+), 12 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 e5a1451..9649463 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
@@ -11,10 +11,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
-import com.doumee.dao.business.model.CustomerLog;
-import com.doumee.dao.business.model.Member;
-import com.doumee.dao.business.model.Shop;
-import com.doumee.dao.business.model.Users;
+import com.doumee.dao.business.model.*;
import com.doumee.dao.web.reqeust.*;
import com.doumee.dao.web.response.AccountResponse;
import com.doumee.dao.web.response.BjParamConfigResponse;
@@ -33,6 +30,7 @@
import javax.imageio.ImageIO;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
+import java.beans.Customizer;
import java.io.InputStream;
import java.util.List;
@@ -48,9 +46,6 @@
@RequestMapping("/web/customer")
@Slf4j
public class CustomerApi extends ApiController{
-
-
-
@Autowired
private MemberService memberService;
@@ -74,11 +69,18 @@
@Autowired
private CustomerUserService customerUserService;
+
@Autowired
private SystemDictDataBiz systemDictDataBiz;
@Autowired
private CustomerLogService customerLogService;
+
+ @Autowired
+ private NewsService newsService;
+
+ @Autowired
+ private ActionsService actionsService;
@ApiOperation(value = "瀹㈡埛绔皬绋嬪簭鐧婚檰", notes = "瀹㈡埛绔皬绋嬪簭")
@GetMapping("/wxLoginCustomer")
@@ -187,7 +189,7 @@
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
- @LoginRequired
+ /* @LoginRequired
@ApiOperation(value = "娴嬭瘯瑁呬慨椋庢牸", notes = "瀹㈡埛绔皬绋嬪簭")
@PostMapping("/saveTestTrimStyle")
@ApiImplicitParams({
@@ -196,15 +198,15 @@
public ApiResponse saveTestTrimStyle(@RequestBody TestTrimStyleDTO testTrimStyleDTO) {
testTrimStyleDTO.setMemberId(getMemberId());
CustomerLog customerLog = customerService.saveTestTrimStyle(testTrimStyleDTO);
-// zbomCRMService.dealCustomerLogData(customerLog);
+ zbomCRMService.dealCustomerLogData(customerLog);
return ApiResponse.success("鎿嶄綔鎴愬姛");
- }
+ }*/
@LoginRequired
@ApiOperation(value = "鐢ㄦ埛娉ㄩ攢", notes = "瀹㈡埛绔皬绋嬪簭")
@GetMapping("/logOff")
public ApiResponse logOff() {
- memberService.logOff(getMemberId());
+ getZhongTaiDataService.userLogout(memberService.logOff(getMemberId()));
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
@@ -286,7 +288,7 @@
}
@LoginRequired
- @ApiOperation(value = "鎴戠殑棰勭害鍒嗛〉鏌ヨ",notes = "瀹㈡埛绔皬绋嬪簭")
+ @ApiOperation(value = "鎴戠殑棰勭害 鍒嗛〉鏌ヨ",notes = "瀹㈡埛绔皬绋嬪簭")
@PostMapping("/customerLogPage")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
@@ -400,4 +402,66 @@
}
+ @LoginRequired
+ @ApiOperation(value = "瀹氬埗鏈嶅姟鍒楄〃", notes = "瀹㈡埛绔皬绋嬪簭")
+ @GetMapping("/getCustomizedNewsList")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse<List<News>> getCustomizedNewsList() {
+ return ApiResponse.success("鏌ヨ鎴愬姛",newsService.getCustomizedNewsList(Constants.ONE,null,null));
+ }
+
+
+ @LoginRequired
+ @ApiOperation(value = "瀹氬埗鏈嶅姟璇︽儏", notes = "瀹㈡埛绔皬绋嬪簭")
+ @GetMapping("/getCustomizedNewsDetail")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ @ApiImplicitParam(paramType = "query", dataType = "Long", name = "id", value = "涓氬姟鏁版嵁涓婚敭", required = true),
+ })
+ public ApiResponse<News> getCustomizedNewsDetail(@RequestParam Long id) {
+ return ApiResponse.success("鏌ヨ鎴愬姛",newsService.getCustomizedNewsDetail(id));
+ }
+
+ @LoginRequired
+ @ApiOperation(value = "淇濆瓨鎺ㄥ箍鍜ㄨ鍒嗕韩璁板綍", notes = "瀹㈡埛绔皬绋嬪簭")
+ @GetMapping("/saveShareRecord")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ @ApiImplicitParam(paramType = "query", dataType = "Long", name = "id", value = "鎺ㄥ箍鍜ㄨ涓婚敭", required = true),
+ })
+ public ApiResponse saveShareRecord(@RequestParam Long id) {
+ newsService.saveShareRecord(id,getMemberId());
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+ @LoginRequired
+ @ApiOperation(value = "鎴戠殑鍠滄鍒楄〃", notes = "瀹㈡埛绔皬绋嬪簭")
+ @PostMapping("/getZhongTaiCusFavorite")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse<ZTBasePageResponse<ZTCusFavoritesInfoResponse>> getZhongTaiCusFavorite(@RequestBody ZTContentListRequest ztContentListRequest) {
+ ztContentListRequest.setUserId(getMemberId()+"");
+ ztContentListRequest.setUserType(Constants.CUSTOMER);
+ ZTBasePageResponse<ZTCusFavoritesInfoResponse> ztBasePageResponse = getZhongTaiDataService.getZhongTaiCusFavorite(ztContentListRequest);
+ return ApiResponse.success("鑾峰彇鎴愬姛",ztBasePageResponse);
+ }
+
+
+
+ @LoginRequired
+ @ApiOperation(value = "杞挱鍥惧垪琛�", notes = "瀹㈡埛绔皬绋嬪簭")
+ @PostMapping("/getZhongTaiCarouselImage")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse<ZTBasePageResponse<ZTCusCarouselImageResponse>> getZhongTaiCarouselImage(@RequestBody ZTContentListRequest ztContentListRequest) {
+ ztContentListRequest.setUserId(getMemberId()+"");
+ ztContentListRequest.setUserType(Constants.CUSTOMER);
+ ZTBasePageResponse<ZTCusCarouselImageResponse> ztBasePageResponse = getZhongTaiDataService.getZhongTaiCarouselImage(ztContentListRequest);
+ return ApiResponse.success("鑾峰彇鎴愬姛",ztBasePageResponse);
+ }
+
}
--
Gitblit v1.9.3