From 2c08a98f7e85ec7c9376f27a7933e75e44d672f7 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 27 八月 2024 15:52:59 +0800
Subject: [PATCH] ll
---
server/web/src/main/java/com/doumee/api/web/CustomerApi.java | 91 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 68 insertions(+), 23 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 dd85290..05a0f8e 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,14 +83,24 @@
@Autowired
private ActionsService actionsService;
+
@ApiOperation(value = "瀹㈡埛绔皬绋嬪簭鐧婚檰", notes = "瀹㈡埛绔皬绋嬪簭")
@GetMapping("/wxLoginCustomer")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "query", dataType = "String", name = "code", value = "寰俊code", required = true),
- @ApiImplicitParam(paramType = "query", dataType = "String", name = "iamId", value = "瀵艰喘涓婚敭", required = false),
+ @ApiImplicitParam(paramType = "query", dataType = "String", name = "userId", value = "瀵艰喘涓婚敭", required = false),
})
- public ApiResponse<AccountResponse> wxLoginCustomer(@RequestParam String code,String iamId) {
- return ApiResponse.success(memberService.wxLogin(code,iamId));
+ public ApiResponse<AccountResponse> wxLoginCustomer(@RequestParam String code,String userId) {
+ return ApiResponse.success(memberService.wxLogin(code,userId));
+ }
+
+ @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));
}
@@ -112,11 +122,14 @@
})
public ApiResponse<Member> editMember(@RequestBody EditMemberRequest editMemberRequest) {
editMemberRequest.setId(getMemberId());
+ String phone = editMemberRequest.getPhone();
//鍚屾瀵艰喘缁戝畾淇℃伅
- if(StringUtils.isNotBlank(editMemberRequest.getPhone())){
- customerUserService.syncByPhone(editMemberRequest.getPhone());
+ Member member =memberService.updMemberDetail(editMemberRequest);
+ if(StringUtils.isNotBlank(phone)){
+ customerUserService.syncByPhone(member);
+ member = memberService.getMemberInfo(member.getId());
}
- return ApiResponse.success("鏇存柊鎴愬姛",memberService.updMemberDetail(editMemberRequest));
+ return ApiResponse.success("鏇存柊鎴愬姛",member);
}
@LoginRequired
@@ -127,11 +140,14 @@
})
public ApiResponse<Member> binDingPhone(@RequestBody EditMemberRequest editMemberRequest) {
editMemberRequest.setId(getMemberId());
+ String phone =editMemberRequest.getPhone();
+ Member member = memberService.updMemberPhone(editMemberRequest);
//鍚屾瀵艰喘缁戝畾淇℃伅
- if(StringUtils.isNotBlank(editMemberRequest.getPhone())){
- customerUserService.syncByPhone(editMemberRequest.getPhone());
+ if(StringUtils.isNotBlank(phone)){
+ customerUserService.syncByPhone(member);
+ member = memberService.getMemberInfo(getMemberId());
}
- return ApiResponse.success("鏇存柊鎴愬姛",memberService.updMemberPhone(editMemberRequest));
+ return ApiResponse.success("鏇存柊鎴愬姛",member);
}
@@ -143,7 +159,9 @@
@ApiImplicitParam(paramType = "query", dataType = "String", name = "phone", value = "鎵嬫満鍙蜂俊鎭�", required = true),
})
public ApiResponse syncCustomerUser(@RequestParam String phone) {
- customerUserService.syncByPhone(phone);
+ if(StringUtils.isNotBlank(getLoginMemberInfo().getPhone())){
+ customerUserService.syncByPhone(getLoginMemberInfo());
+ }
return ApiResponse.success("鍚屾鎴愬姛");
}
@@ -208,6 +226,9 @@
@LoginRequired
@ApiOperation(value = "鐢ㄦ埛娉ㄩ攢", notes = "瀹㈡埛绔皬绋嬪簭")
@GetMapping("/logOff")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ })
public ApiResponse logOff() {
ZTBaseRequst ztBaseRequst = memberService.logOff(getUserId(),getToken());
if(Objects.nonNull(ztBaseRequst)){
@@ -218,11 +239,21 @@
@LoginRequired
@ApiOperation(value = "闂ㄥ簵鍒楄〃", notes = "瀹㈡埛绔皬绋嬪簭")
- @PostMapping("/shopPage") @ApiImplicitParams({
+ @PostMapping("/shopPage")
+ @ApiImplicitParams({
@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);
}
@@ -245,6 +276,7 @@
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
})
public ApiResponse<PageData<Users>> myUserPage (@RequestBody PageWrap<Users> pageWrap) {
+ pageWrap.getModel().setMemberId(getMemberId());
return ApiResponse.success(usersService.findPage(pageWrap));
}
@@ -408,6 +440,7 @@
+ @UserLoginRequired
@LoginRequired
@ApiOperation(value = "杞挱鍥捐鎯�", notes = "瀹㈡埛绔皬绋嬪簭")
@PostMapping("/getZhongTaiCarouselImageDetail")
@@ -437,6 +470,10 @@
}
+
+
+
+
@UserLoginRequired
@LoginRequired
@ApiOperation(value = "浜у搧鍒嗛〉鍒楄〃 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
@@ -450,6 +487,7 @@
ZTBasePageResponse<ZTProductInfoResponse> ztBasePageResponse= getZhongTaiDataService.getZhongTaiProductPage(ztContentListRequest);
return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse);
}
+
@UserLoginRequired
@LoginRequired
@@ -465,6 +503,7 @@
return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse);
}
+
@UserLoginRequired
@LoginRequired
@ApiOperation(value = "瑙嗛鍒嗛〉鍒楄〃 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
@@ -479,6 +518,7 @@
return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse);
}
+
@UserLoginRequired
@LoginRequired
@ApiOperation(value = "鍏ㄥ眿妗堜緥鍒嗛〉鍒楄〃 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
@@ -492,6 +532,7 @@
ZTBasePageResponse<ZTCaseInfoResponse> ztBasePageResponse= getZhongTaiDataService.getZhongTaiWholecasePage(ztContentListRequest);
return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse);
}
+
@UserLoginRequired
@LoginRequired
@@ -508,6 +549,7 @@
}
+
@UserLoginRequired
@LoginRequired
@ApiOperation(value = "鍏ㄥ眿妗堜緥璇︽儏 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
@@ -515,11 +557,13 @@
@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);
}
+
@UserLoginRequired
@@ -529,11 +573,13 @@
@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);
}
+
@@ -544,13 +590,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
@@ -559,9 +604,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);
}
@@ -579,5 +625,4 @@
ZTBasePageResponse<ZTCollectLikeInfoResponse> ztBasePageResponse= getZhongTaiDataService.collectLikePage(ztCollectLikeRequest);
return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse);
}
-
}
--
Gitblit v1.9.3