From 5a42219c9f91fd8fa77ddd8c8945d03168250b68 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 29 七月 2024 19:26:09 +0800
Subject: [PATCH] 代码提交

---
 server/web/src/main/java/com/doumee/api/web/CustomerApi.java |   51 +++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 39 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 55e3fc4..01b398d 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
@@ -83,6 +83,7 @@
     @Autowired
     private ActionsService actionsService;
 
+
     @ApiOperation(value = "瀹㈡埛绔皬绋嬪簭鐧婚檰", notes = "瀹㈡埛绔皬绋嬪簭")
     @GetMapping("/wxLoginCustomer")
     @ApiImplicitParams({
@@ -91,6 +92,15 @@
     })
     public ApiResponse<AccountResponse> wxLoginCustomer(@RequestParam String code,String iamId) {
         return  ApiResponse.success(memberService.wxLogin(code,iamId));
+    }
+
+    @ApiOperation(value = "test瀹㈡埛绔皬绋嬪簭鐧婚檰", notes = "瀹㈡埛绔皬绋嬪簭")
+    @GetMapping("/testWxLoginCustomer")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "openid", value = "寰俊code", required = true),
+    })
+    public ApiResponse<AccountResponse> testWxLoginCustomer(@RequestParam String openid) {
+        return  ApiResponse.success(memberService.testLogin(openid));
     }
 
 
@@ -222,7 +232,16 @@
             @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
     })
     public ApiResponse<PageData<Shop>> shopPage (@RequestBody PageWrap<Shop> pageWrap) {
-        return ApiResponse.success(shopService.queryShopByLL(pageWrap));
+        PageData<Shop> pageData = shopService.queryShopByLL(pageWrap);
+        if(Objects.nonNull(pageWrap.getModel().getLatitude())&&Objects.nonNull(pageWrap.getModel().getLongitude())){
+            //鏇存柊浜哄憳缁忕含搴︿俊鎭�
+            EditMemberRequest editMemberRequest = new EditMemberRequest();
+            editMemberRequest.setId(getMemberId());
+            editMemberRequest.setLatitude(pageWrap.getModel().getLatitude());
+            editMemberRequest.setLongitude(pageWrap.getModel().getLongitude());
+            memberService.updMemberDetail(editMemberRequest);
+        }
+        return ApiResponse.success(pageData);
     }
 
 
@@ -328,6 +347,7 @@
 
 
 
+    @UserLoginRequired
     @LoginRequired
     @ApiOperation(value = "琛屼负鍐呭鎺ュ彛 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
     @GetMapping("/actionDo")
@@ -341,6 +361,7 @@
         return ApiResponse.success("鎿嶄綔鎴愬姛");
     }
 
+    @UserLoginRequired
     @LoginRequired
     @ApiOperation(value = "瀹氬埗鏈嶅姟鍒楄〃", notes = "瀹㈡埛绔皬绋嬪簭")
     @GetMapping("/getCustomizedNewsList")
@@ -351,6 +372,7 @@
         return ApiResponse.success("鏌ヨ鎴愬姛",newsService.getCustomizedNewsList(Constants.ONE,null,null));
     }
 
+    @UserLoginRequired
     @LoginRequired
     @ApiOperation(value = "瀹氬埗鏈嶅姟璇︽儏", notes = "瀹㈡埛绔皬绋嬪簭")
     @GetMapping("/getCustomizedNewsDetail")
@@ -433,6 +455,10 @@
         ZTBasePageResponse<ZTProductNewsInfoResponse>  ztBasePageResponse= getZhongTaiDataService.getZhongTaiProductNewsPage(ztContentListRequest);
         return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse);
     }
+
+
+
+
 
 
     @UserLoginRequired
@@ -518,9 +544,10 @@
     @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,getUserType(),getMemberId());
+    public ApiResponse<ZTCaseInfoResponse> getWholecaseInfo(@RequestParam String id,String salesId) {
+        ZTCaseInfoResponse ztCaseInfoResponse= getZhongTaiDataService.getWholecaseInfo(id,getUserType(),getMemberId(),salesId);
         return ApiResponse.success("鏌ヨ鎴愬姛",ztCaseInfoResponse);
     }
 
@@ -533,9 +560,10 @@
     @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,getUserType(),getMemberId());
+    public ApiResponse<ZTProductNewsInfoResponse> getProductNewsInfo(@RequestParam String id,String salesId) {
+        ZTProductNewsInfoResponse ztProductNewsInfoResponse= getZhongTaiDataService.getProductNewsInfo(id,getUserType(),getMemberId(),salesId);
         return ApiResponse.success("鏌ヨ鎴愬姛",ztProductNewsInfoResponse);
     }
 
@@ -549,14 +577,12 @@
     @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,getUserType(),getMemberId());
+    public ApiResponse<ZTRealcaseInfoResponse> getRealcaseInfo(@RequestParam String id,String salesId) {
+        ZTRealcaseInfoResponse ztRealcaseInfoResponse= getZhongTaiDataService.getRealcaseInfo(id,getUserType(),getMemberId(),salesId);
         return ApiResponse.success("鏌ヨ鎴愬姛",ztRealcaseInfoResponse);
     }
-
-
-
 
     @UserLoginRequired
     @LoginRequired
@@ -565,9 +591,10 @@
     @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,getUserType(),getMemberId());
+    public ApiResponse<ZTProductInfoResponse> getProductInfo(@RequestParam String id,String salesId) {
+        ZTProductInfoResponse ztProductInfoResponse= getZhongTaiDataService.getProductInfo(id,getUserType(),getMemberId(),salesId);
         return ApiResponse.success("鏌ヨ鎴愬姛",ztProductInfoResponse);
     }
 

--
Gitblit v1.9.3