From 2cfe454c309a65f02e89063d8306ff71f86b7f5c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 17 七月 2025 15:41:37 +0800
Subject: [PATCH] 前端
---
server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 46 ++++++++++++++++++++++++++++------------------
1 files changed, 28 insertions(+), 18 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 9620e6f..6602688 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -261,11 +261,11 @@
if(StringUtils.isBlank(code)){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
-// try {
+ try {
//鑾峰彇寰俊鏁忔劅鏁版嵁
-// WxMaJscode2SessionResult session = WxMiniConfig.wxMaService.getUserService().getSessionInfo(code);
- String openId = code ;//session.getOpenid();
-// String unionId = session.getUnionid();
+ WxMaJscode2SessionResult session = WxMiniConfig.wxMaService.getUserService().getSessionInfo(code);
+ String openId = session.getOpenid();
+ String unionId = session.getUnionid();
if (StringUtils.isBlank(openId)) {
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "鑾峰彇openid澶辫触锛佽鑱旂郴绠＄悊鍛�");
}
@@ -278,9 +278,9 @@
accountResponse.setToken(jwtTokenUtil.generateToken(member));
accountResponse.setMember(member);
return accountResponse;
-// } catch (WxErrorException e) {
-// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "寰俊鐧诲綍寮傚父锛佽鑱旂郴绠＄悊鍛�");
-// }
+ } catch (WxErrorException e) {
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "寰俊鐧诲綍寮傚父锛佽鑱旂郴绠＄悊鍛�");
+ }
}
@@ -288,30 +288,30 @@
@Override
public AccountResponse wxAuthPhone(WxPhoneRequest wxPhoneRequest) {
+ if(Objects.isNull(wxPhoneRequest)
+ || StringUtils.isBlank(wxPhoneRequest.getCode())
+ || StringUtils.isBlank(wxPhoneRequest.getOpenid())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
try {
- if(Objects.isNull(wxPhoneRequest)
- || StringUtils.isBlank(wxPhoneRequest.getCode())
- || StringUtils.isBlank(wxPhoneRequest.getOpenid())){
- throw new BusinessException(ResponseStatus.BAD_REQUEST);
- }
WxMaPhoneNumberInfo userPhoneInfo = WxMiniConfig.wxMaService.getUserService().getPhoneNumber(wxPhoneRequest.getCode());
String mobile = userPhoneInfo.getPhoneNumber();
if(Objects.isNull(mobile)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈幏鍙栧埌鎵嬫満鍙�");
}
Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getTelephone,mobile).last("limit 1"));
- member.setOpenid(wxPhoneRequest.getOpenid());
if(Objects.nonNull(member)){
memberMapper.update(new UpdateWrapper<Member>().lambda().set(Member::getTelephone,mobile)
.set(Member::getOpenid,wxPhoneRequest.getOpenid()).set(Member::getUpdateTime,new Date()).eq(Member::getId,member.getId()));
}else{
member = new Member();
member.setCreateTime(new Date());
+ member.setUpdateTime(member.getCreateTime());
member.setDeleted(Constants.ZERO);
member.setOpenid(wxPhoneRequest.getOpenid());
member.setTelephone(mobile);
member.setNickName(mobile);
- member.setCoverImage("");
+ member.setCoverImage("1.png");
member.setWorkerIdentity(Constants.ZERO);
member.setDriverIdentity(Constants.ZERO);
member.setChefIdentity(Constants.ZERO);
@@ -324,6 +324,7 @@
member.setPublishNum(Constants.ZERO.longValue());
member.setAutoReceiveStatus(Constants.ONE);
member.setUseIdentity(Constants.ZERO);
+ member.setOpenid(wxPhoneRequest.getOpenid());
memberMapper.insert(member);
}
AccountResponse accountResponse = new AccountResponse();
@@ -402,10 +403,6 @@
userCenterVO.setTaskingTotal(acceptOrders.stream().filter(i->Constants.equalsInteger(i.getStatus(),Constants.ordersStatus.accept.getKey())).collect(Collectors.toList()).size());
userCenterVO.setDoneTotal(releaseOrders.stream().filter(i->Constants.equalsInteger(i.getStatus(),Constants.ordersStatus.doing.getKey())).collect(Collectors.toList()).size());
}
-
- userCenterVO.setAboutUs(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.ABOUT_US).getCode()));
- userCenterVO.setFeeStandards(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.FEE_STANDARDS).getCode()));
- userCenterVO.setServerIntroduce(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SERVER_INTRODUCE).getCode()));
member.setUserCenterVO(userCenterVO);
return member;
}
@@ -413,6 +410,19 @@
+ @Override
+ public UserCenterVO getPlatformAboutUs(){
+ UserCenterVO userCenterVO = new UserCenterVO();
+ userCenterVO.setAboutUs(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.ABOUT_US).getCode()));
+ userCenterVO.setFeeStandards(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.FEE_STANDARDS).getCode()));
+ userCenterVO.setServerIntroduce(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SERVER_INTRODUCE).getCode()));
+ userCenterVO.setServerPhone(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SERVER_PHONE).getCode()));
+ userCenterVO.setUserAgreement(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.USER_AGREEMENT).getCode()));
+ userCenterVO.setPrivacyAgreement(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.PRIVACY_AGREEMENT).getCode()));
+ return userCenterVO;
+ }
+
+
}
--
Gitblit v1.9.3