From f894a228fa018a6affd3d08b72b57142b937a4ff Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 18 七月 2024 17:21:52 +0800
Subject: [PATCH] 代码提交

---
 server/web/src/main/java/com/doumee/api/web/CustomerApi.java |  246 ++++++++++++++++++++++++++++++++++---------------
 1 files changed, 170 insertions(+), 76 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 9649463..da00ef7 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
@@ -3,7 +3,9 @@
 import com.doumee.biz.system.SystemDictDataBiz;
 import com.doumee.biz.zbom.ZbomCRMService;
 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.ZTDataDetailRequest;
 import com.doumee.biz.zbom.model.zhongtai.response.*;
 import com.doumee.config.annotation.LoginRequired;
 import com.doumee.core.annotation.trace.Trace;
@@ -86,9 +88,10 @@
     @GetMapping("/wxLoginCustomer")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "query", dataType = "String", name = "code", value = "寰俊code", required = true),
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "iamId", value = "瀵艰喘涓婚敭", required = false),
     })
-    public ApiResponse<AccountResponse> wxLoginCustomer(@RequestParam String code) {
-        return  ApiResponse.success(memberService.wxLogin(code));
+    public ApiResponse<AccountResponse> wxLoginCustomer(@RequestParam String code,String iamId) {
+        return  ApiResponse.success(memberService.wxLogin(code,iamId));
     }
 
     @LoginRequired
@@ -295,6 +298,7 @@
     })
     public ApiResponse<PageData<CustomerLog>> customerLogPage(@RequestBody PageWrap<CustomerLog> pageWrap) {
         pageWrap.getModel().setCostomerId(getMemberId().toString());
+        pageWrap.getModel().setIsHiddenPhone(Constants.ZERO);
         return ApiResponse.success(customerLogService.findPage(pageWrap));
     }
 
@@ -325,82 +329,20 @@
         return ApiResponse.success("鏌ヨ鎴愬姛",ztTagInfoResponseList);
     }
 
-    @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) {
-        ztContentListRequest.setUserId(getMemberId()+"");
-        ztContentListRequest.setUserType(Constants.CUSTOMER);
-        ZTBasePageResponse<ZTContentListResponse>  ztBasePageResponse= getZhongTaiDataService.pageContentList(ztContentListRequest);
-        return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse);
-    }
+
 
     @LoginRequired
-    @ApiOperation(value = "鍐呭璇︽儏 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
-    @GetMapping("/getContentInfo")
+    @ApiOperation(value = "琛屼负鍐呭鎺ュ彛 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
+    @GetMapping("/actionDo")
     @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 = "actionType", value = "琛屼负绫诲瀷锛氭敹钘忥細collect;鍙栨秷鏀惰棌锛歝ollect_cancel;鍠滄锛歭ike;鍙栨秷鍠滄锛歭ike_cancel锛涙祻瑙堬細view;鍒嗕韩锛歴hare;涓嬭浇锛歞ownload", required = true),
     })
-    public ApiResponse<ZTContentInfoResponse> getContentInfo(@RequestParam String id) {
-        ZTContentInfoResponse ztContentInfoResponse= getZhongTaiDataService.getContentInfo(id,Constants.CUSTOMER,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.CUSTOMER,id);
+    public ApiResponse actionDo(@RequestParam String id,@RequestParam String actionType) {
+        getZhongTaiDataService.actionDo(getMemberId(),ZTConstants.CUSTOMER,id,actionType);
         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.CUSTOMER,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.CUSTOMER,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.CUSTOMER,id);
-        return ApiResponse.success("鎿嶄綔鎴愬姛");
-    }
-
 
     @LoginRequired
     @ApiOperation(value = "瀹氬埗鏈嶅姟鍒楄〃", notes = "瀹㈡埛绔皬绋嬪簭")
@@ -411,7 +353,6 @@
     public ApiResponse<List<News>> getCustomizedNewsList() {
         return ApiResponse.success("鏌ヨ鎴愬姛",newsService.getCustomizedNewsList(Constants.ONE,null,null));
     }
-
 
     @LoginRequired
     @ApiOperation(value = "瀹氬埗鏈嶅姟璇︽儏", notes = "瀹㈡埛绔皬绋嬪簭")
@@ -444,7 +385,7 @@
     })
     public ApiResponse<ZTBasePageResponse<ZTCusFavoritesInfoResponse>> getZhongTaiCusFavorite(@RequestBody ZTContentListRequest ztContentListRequest) {
         ztContentListRequest.setUserId(getMemberId()+"");
-        ztContentListRequest.setUserType(Constants.CUSTOMER);
+        ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
         ZTBasePageResponse<ZTCusFavoritesInfoResponse> ztBasePageResponse = getZhongTaiDataService.getZhongTaiCusFavorite(ztContentListRequest);
         return ApiResponse.success("鑾峰彇鎴愬姛",ztBasePageResponse);
     }
@@ -457,11 +398,164 @@
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
     })
-    public ApiResponse<ZTBasePageResponse<ZTCusCarouselImageResponse>> getZhongTaiCarouselImage(@RequestBody ZTContentListRequest ztContentListRequest) {
+    public ApiResponse<List<ZTCusCarouselImageResponse>> getZhongTaiCarouselImage(@RequestBody ZTContentListRequest ztContentListRequest) {
         ztContentListRequest.setUserId(getMemberId()+"");
-        ztContentListRequest.setUserType(Constants.CUSTOMER);
-        ZTBasePageResponse<ZTCusCarouselImageResponse> ztBasePageResponse = getZhongTaiDataService.getZhongTaiCarouselImage(ztContentListRequest);
-        return ApiResponse.success("鑾峰彇鎴愬姛",ztBasePageResponse);
+        ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
+        List<ZTCusCarouselImageResponse> ztCusCarouselImageResponseList = getZhongTaiDataService.getZhongTaiCarouselImage(ztContentListRequest);
+        return ApiResponse.success("鑾峰彇鎴愬姛",ztCusCarouselImageResponseList);
     }
 
+
+
+    @LoginRequired
+    @ApiOperation(value = "杞挱鍥捐鎯�", notes = "瀹㈡埛绔皬绋嬪簭")
+    @PostMapping("/getZhongTaiCarouselImageDetail")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+    })
+    public ApiResponse<ZTCusCarouselImageResponse> getZhongTaiCarouselImageDetail(@RequestBody ZTDataDetailRequest ztDataDetailRequest) {
+        ztDataDetailRequest.setUserId(getMemberId()+"");
+        ztDataDetailRequest.setUserType(ZTConstants.CUSTOMER);
+        ZTCusCarouselImageResponse ztCusCarouselImageResponse = getZhongTaiDataService.getZhongTaiCarouselImageDetail(ztDataDetailRequest);
+        return ApiResponse.success("鑾峰彇鎴愬姛",ztCusCarouselImageResponse);
+    }
+
+
+    @LoginRequired
+    @ApiOperation(value = "鍜ㄨ鍒嗛〉鍒楄〃 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
+    @PostMapping("/getZhongTaiProductNewsPage")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+    })
+    public ApiResponse<ZTBasePageResponse<ZTProductNewsInfoResponse>> getZhongTaiProductNewsPage(@RequestBody ZTContentListRequest ztContentListRequest) {
+        ztContentListRequest.setUserId(getMemberId()+"");
+        ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
+        ZTBasePageResponse<ZTProductNewsInfoResponse>  ztBasePageResponse= getZhongTaiDataService.getZhongTaiProductNewsPage(ztContentListRequest);
+        return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse);
+    }
+
+
+    @LoginRequired
+    @ApiOperation(value = "浜у搧鍒嗛〉鍒楄〃 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
+    @PostMapping("/getZhongTaiProductPage")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+    })
+    public ApiResponse<ZTBasePageResponse<ZTProductInfoResponse>> getZhongTaiProductPage(@RequestBody ZTContentListRequest ztContentListRequest) {
+        ztContentListRequest.setUserId(getMemberId()+"");
+        ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
+        ZTBasePageResponse<ZTProductInfoResponse>  ztBasePageResponse= getZhongTaiDataService.getZhongTaiProductPage(ztContentListRequest);
+        return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse);
+    }
+
+    @LoginRequired
+    @ApiOperation(value = "瀹炴櫙鍒嗛〉鍒楄〃 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
+    @PostMapping("/getZhongTaiRealcasePage")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+    })
+    public ApiResponse<ZTBasePageResponse<ZTRealcaseInfoResponse>> getZhongTaiRealcasePage(@RequestBody ZTContentListRequest ztContentListRequest) {
+        ztContentListRequest.setUserId(getMemberId()+"");
+        ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
+        ZTBasePageResponse<ZTRealcaseInfoResponse>  ztBasePageResponse= getZhongTaiDataService.getZhongTaiRealcasePage(ztContentListRequest);
+        return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse);
+    }
+
+    @LoginRequired
+    @ApiOperation(value = "瑙嗛鍒嗛〉鍒楄〃 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
+    @PostMapping("/getZhongTaiVideoPage")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+    })
+    public ApiResponse<ZTBasePageResponse<ZTVideoInfoResponse>> getZhongTaiVideoPage(@RequestBody ZTContentListRequest ztContentListRequest) {
+        ztContentListRequest.setUserId(getMemberId()+"");
+        ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
+        ZTBasePageResponse<ZTVideoInfoResponse>  ztBasePageResponse= getZhongTaiDataService.getZhongTaiVideoPage(ztContentListRequest);
+        return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse);
+    }
+
+    @LoginRequired
+    @ApiOperation(value = "鍏ㄥ眿妗堜緥鍒嗛〉鍒楄〃 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
+    @PostMapping("/getZhongTaiWholecasePage")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+    })
+    public ApiResponse<ZTBasePageResponse<ZTCaseInfoResponse>> getZhongTaiWholecasePage(@RequestBody ZTContentListRequest ztContentListRequest) {
+        ztContentListRequest.setUserId(getMemberId()+"");
+        ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
+        ZTBasePageResponse<ZTCaseInfoResponse>  ztBasePageResponse= getZhongTaiDataService.getZhongTaiWholecasePage(ztContentListRequest);
+        return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse);
+    }
+
+    @LoginRequired
+    @ApiOperation(value = "蹇楄瑁呬慨鍒嗛〉鍒楄〃 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
+    @PostMapping("/getZhongTaiZbDecoPage")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+    })
+    public ApiResponse<ZTBasePageResponse<ZTZbDecoInfoResponse>> getZhongTaiZbDecoPage(@RequestBody ZTContentListRequest ztContentListRequest) {
+        ztContentListRequest.setUserId(getMemberId()+"");
+        ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
+        ZTBasePageResponse<ZTZbDecoInfoResponse>  ztBasePageResponse= getZhongTaiDataService.getZhongTaiZbDecoPage(ztContentListRequest);
+        return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse);
+    }
+
+
+    @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),
+    })
+    public ApiResponse<ZTCaseInfoResponse> getWholecaseInfo(@RequestParam String id) {
+        ZTCaseInfoResponse ztCaseInfoResponse= getZhongTaiDataService.getWholecaseInfo(id,ZTConstants.CUSTOMER,getMemberId());
+        return ApiResponse.success("鏌ヨ鎴愬姛",ztCaseInfoResponse);
+    }
+
+
+    @LoginRequired
+    @ApiOperation(value = "浜у搧璧勮璇︽儏 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
+    @GetMapping("/getProductNewsInfo")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true),
+    })
+    public ApiResponse<ZTProductNewsInfoResponse> getProductNewsInfo(@RequestParam String id) {
+        ZTProductNewsInfoResponse ztProductNewsInfoResponse= getZhongTaiDataService.getProductNewsInfo(id,ZTConstants.CUSTOMER,getMemberId());
+        return ApiResponse.success("鏌ヨ鎴愬姛",ztProductNewsInfoResponse);
+    }
+
+
+
+    @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),
+    })
+    public ApiResponse<ZTRealcaseInfoResponse> getRealcaseInfo(@RequestParam String id) {
+        ZTRealcaseInfoResponse ztRealcaseInfoResponse= getZhongTaiDataService.getRealcaseInfo(id,ZTConstants.CUSTOMER,getMemberId());
+        return ApiResponse.success("鏌ヨ鎴愬姛",ztRealcaseInfoResponse);
+    }
+
+
+
+    @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),
+    })
+    public ApiResponse<ZTProductInfoResponse> getProductInfo(@RequestParam String id) {
+        ZTProductInfoResponse ztProductInfoResponse= getZhongTaiDataService.getProductInfo(id,ZTConstants.CUSTOMER,getMemberId());
+        return ApiResponse.success("鏌ヨ鎴愬姛",ztProductInfoResponse);
+    }
+
+
+
+
+
 }

--
Gitblit v1.9.3