From c0cb31a27522f2b480d7f98784eef37c2fb75f2d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 30 七月 2024 09:10:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/web/src/main/java/com/doumee/api/web/CustomerApi.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 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 74fd760..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
@@ -94,6 +94,15 @@
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));
+ }
+
@LoginRequired
@ApiOperation(value = "鑾峰彇鎵嬫満鍙�", notes = "瀹㈡埛绔皬绋嬪簭")
@@ -223,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);
}
--
Gitblit v1.9.3