From b2d360d9113b6955287108ca9e90d76a1f3c1419 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期日, 29 九月 2024 15:05:11 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
server/web/src/main/java/com/doumee/api/web/CustomerApi.java | 49 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 38 insertions(+), 11 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 01b398d..07abd7e 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,6 +11,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
+import com.doumee.core.wx.SendWxMessage;
import com.doumee.dao.business.model.*;
import com.doumee.dao.web.reqeust.*;
import com.doumee.dao.web.response.AccountResponse;
@@ -88,10 +89,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),
+ @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 = "瀹㈡埛绔皬绋嬪簭")
@@ -122,11 +123,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
@@ -137,11 +141,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);
}
@@ -153,7 +160,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("鍚屾鎴愬姛");
}
@@ -218,6 +227,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)){
@@ -228,7 +240,8 @@
@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) {
@@ -264,6 +277,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));
}
@@ -612,4 +626,17 @@
ZTBasePageResponse<ZTCollectLikeInfoResponse> ztBasePageResponse= getZhongTaiDataService.collectLikePage(ztCollectLikeRequest);
return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse);
}
+
+ @ApiOperation(value = "娴嬭瘯鍙戦�佸井淇℃秷鎭�", notes = "瀹㈡埛绔皬绋嬪簭")
+ @GetMapping("/testSendWxMessage")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "query", dataType = "String", name = "openid", value = "灏忕▼搴廼d", required = true),
+ @ApiImplicitParam(paramType = "query", dataType = "String", name = "token", value = "token", required = true),
+ })
+ public ApiResponse testSendWxMessage(@RequestParam String openid,@RequestParam String token) {
+ SendWxMessage sendWxMessage = new SendWxMessage();
+ sendWxMessage.testMessage(openid,token);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
}
--
Gitblit v1.9.3