From 5e57deb4c7a53c3307f59b2267127b4dd7fd0b02 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期日, 29 九月 2024 15:05:10 +0800
Subject: [PATCH] ll
---
server/web/src/main/java/com/doumee/api/web/CustomerApi.java | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 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 ca83288..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;
@@ -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,10 +141,12 @@
})
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("鏇存柊鎴愬姛",member);
}
@@ -154,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("鍚屾鎴愬姛");
}
@@ -618,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