From 9a50f2b681bb89336eed8100b2ffa36fed4e2639 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 17 七月 2024 10:12:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 235 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 175 insertions(+), 60 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 18e6aa8..941c288 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -8,6 +8,7 @@
import com.doumee.biz.zbom.model.zhongtai.ZTBaseRequst;
import com.doumee.biz.zbom.model.zhongtai.ZTUserGetTokenRequest;
import com.doumee.biz.zbom.model.zhongtai.ZTUserInfoUpdateRequest;
+import com.doumee.biz.zbom.model.zhongtai.response.ZTBaseResponse;
import com.doumee.biz.zbom.model.zhongtai.response.ZTUserGetTokenResponse;
import com.doumee.config.Jwt.JwtPayLoad;
import com.doumee.config.Jwt.JwtTokenUtil;
@@ -16,26 +17,36 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.oss.FileModel;
-import com.doumee.core.utils.CodeVerifyUtils;
-import com.doumee.core.utils.Constants;
-import com.doumee.core.utils.Utils;
+import com.doumee.core.utils.*;
import com.doumee.core.wx.WxMiniConfig;
+import com.doumee.dao.business.CustomerUserMapper;
import com.doumee.dao.business.MemberMapper;
+import com.doumee.dao.business.UsersMapper;
+import com.doumee.dao.business.model.CustomerUser;
import com.doumee.dao.business.model.InterfaceLog;
import com.doumee.dao.business.model.Member;
+import com.doumee.dao.business.model.Users;
+import com.doumee.dao.system.model.SystemDictData;
import com.doumee.dao.web.reqeust.EditMemberRequest;
import com.doumee.dao.web.reqeust.WxPhoneRequest;
import com.doumee.dao.web.response.AccountResponse;
+import com.doumee.dao.web.response.ZTBaseInfoResponse;
+import com.doumee.service.business.CustomerService;
import com.doumee.service.business.MemberService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hikvision.artemis.sdk.util.HttpUtils;
import me.chanjar.weixin.common.error.WxErrorException;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.Response;
+import org.apache.catalina.User;
import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.util.ThreadContext;
+import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
@@ -44,6 +55,7 @@
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.util.*;
+import java.util.Date;
import java.util.concurrent.TimeUnit;
/**
@@ -56,6 +68,12 @@
@Autowired
private MemberMapper memberMapper;
+
+ @Autowired
+ private UsersMapper usersMapper;
+
+ @Autowired
+ private CustomerUserMapper customerUserMapper;
@Autowired
private SystemDictDataBiz systemDictDataBiz;
@@ -273,8 +291,25 @@
member.setNickname("寰俊鐢ㄦ埛"+ CodeVerifyUtils.createVerificationCode(4));
member.setCreateDate(new Date());
member.setIsdeleted(Constants.ZERO);
+ member.setOpenid(openId);
member.setType(Constants.ZERO);
+ member.setAuthStatus(Constants.ZERO);
+ ZTUserGetTokenResponse ztUserGetTokenResponse = this.syncZhongTaiUser(member);
+ if(Objects.isNull(ztUserGetTokenResponse)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴鏈嶅姟璋冭捣澶辫触!");
+ }else{
+ member.setToken(ztUserGetTokenResponse.getToken());
+ }
memberMapper.insert(member);
+ member = this.getMemberInfo(member.getId());
+ }else{
+ ZTUserGetTokenResponse ztUserGetTokenResponse = this.syncZhongTaiUser(member);
+ if(Objects.isNull(ztUserGetTokenResponse)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴鏈嶅姟璋冭捣澶辫触!");
+ }else{
+ member.setToken(ztUserGetTokenResponse.getToken());
+ }
+ member = this.getMemberInfo(member.getId());
}
//鍒涘缓token
JwtPayLoad payLoad = new JwtPayLoad(member.getId(),Constants.ZERO);
@@ -307,50 +342,83 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏇存柊鎵嬫満鍙峰け璐�");
}
+
@Override
- public void updMemberDetail(EditMemberRequest editMemberRequest){
- Member member = memberMapper.selectById(editMemberRequest.getMemberId());
+ public Member updMemberDetail(EditMemberRequest editMemberRequest){
+ Member member = memberMapper.selectById(editMemberRequest.getId());
+ if(Objects.isNull(member)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if(Objects.isNull(editMemberRequest)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ Member memberDto = new Member();
+ BeanUtils.copyProperties(editMemberRequest,memberDto);
+ memberDto.setOpenid(member.getOpenid());
+// ZTUserGetTokenResponse ztUserGetTokenResponse = this.syncZhongTaiUser(memberDto);
+// if(Objects.isNull(ztUserGetTokenResponse)){
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴鏈嶅姟璋冭捣澶辫触!");
+// }else{
+// member.setToken(ztUserGetTokenResponse.getToken());
+// }
+ memberMapper.updateById(memberDto);
+ return this.getMemberInfo(member.getId());
+ }
+
+
+
+ @Override
+ public Member updMemberPhone(EditMemberRequest editMemberRequest){
+ if(Objects.isNull(editMemberRequest)||StringUtils.isBlank(editMemberRequest.getPhone())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ Member member = memberMapper.selectById(editMemberRequest.getId());
+ if(Objects.isNull(member)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ Member memberDto = new Member();
+ BeanUtils.copyProperties(editMemberRequest,memberDto);
+ memberDto.setOpenid(member.getOpenid());
+// ZTUserGetTokenResponse ztUserGetTokenResponse = this.syncZhongTaiUser(memberDto);
+// if(Objects.isNull(ztUserGetTokenResponse)){
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴鏈嶅姟璋冭捣澶辫触!");
+// }else{
+// member.setToken(ztUserGetTokenResponse.getToken());
+// }
+ memberMapper.updateById(memberDto);
+ return this.getMemberInfo(member.getId());
+ }
+
+
+ public ZTUserGetTokenResponse syncZhongTaiUser(Member member){
ZTUserInfoUpdateRequest ztUserInfoUpdateRequest = new ZTUserInfoUpdateRequest();
- ztUserInfoUpdateRequest.setOpenid(member.getOpenid());
+ ztUserInfoUpdateRequest.setOpenId(member.getOpenid());
String appId = systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_APPID_CUSTOMER).getCode();
ztUserInfoUpdateRequest.setAppId(appId);
ztUserInfoUpdateRequest.setPlatform(Constants.PLATFORM);
- ztUserInfoUpdateRequest.setPhone(editMemberRequest.getPhone());
- ztUserInfoUpdateRequest.setName(editMemberRequest.getName());
- ztUserInfoUpdateRequest.setAddress(editMemberRequest.getProvinceName()+editMemberRequest.getCityName()+editMemberRequest.getAreaName());
- ztUserInfoUpdateRequest.setFullAddress(editMemberRequest.getAddress());
+ ztUserInfoUpdateRequest.setPhone(member.getPhone());
+ ztUserInfoUpdateRequest.setName(member.getNickname());
+// ztUserInfoUpdateRequest.setAddress(member.getProvinceName()+member.getCityName()+member.getAreaName());
+ ztUserInfoUpdateRequest.setFullAddress(member.getAddress());
String prefix = systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode() +
systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.MEMBER).getCode();
- if(StringUtils.isNotBlank(editMemberRequest.getImgurl())){
- ztUserInfoUpdateRequest.setAvatarUrl(prefix + editMemberRequest.getImgurl());
+ if(StringUtils.isNotBlank(member.getImgurl())){
+ ztUserInfoUpdateRequest.setAvatarUrl(prefix + member.getImgurl());
}
- ztUserInfoUpdateRequest.setUptown(editMemberRequest.getDistrict());
- ztUserInfoUpdateRequest.setHouseArea(editMemberRequest.getHousearea().toString());
- ztUserInfoUpdateRequest.setHouseLayout(Constants.getHouseLayout(editMemberRequest.getHousetype()));
- ZTUserGetTokenResponse userUpdateInfo = zbomZhongTaiService.userUpdateInfo(ztUserInfoUpdateRequest);
- if(Objects.isNull(userUpdateInfo)){
+ ztUserInfoUpdateRequest.setUptown(member.getDistrict());
+ if(Objects.nonNull(member.getHousearea())){
+ ztUserInfoUpdateRequest.setHouseArea(member.getHousearea().toString());
+ }
+ ztUserInfoUpdateRequest.setHouseLayout(Constants.getHouseLayout(member.getHousetype()));
+ ZTBaseResponse userUpdateInfo = zbomZhongTaiService.userUpdateInfo(ztUserInfoUpdateRequest);
+ if(Objects.isNull(userUpdateInfo)||userUpdateInfo.getCode()!=200){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴淇℃伅鏇存柊澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
- memberMapper.update(new UpdateWrapper<Member>()
- .lambda()
- .set(StringUtils.isNotBlank(editMemberRequest.getImgurl()),Member::getImgurl,editMemberRequest.getImgurl())
- .set(StringUtils.isNotBlank(editMemberRequest.getName()),Member::getName,editMemberRequest.getName())
- .set(StringUtils.isNotBlank(editMemberRequest.getPhone()),Member::getPhone,editMemberRequest.getPhone())
- .set(StringUtils.isNotBlank(editMemberRequest.getProvinceName()),Member::getProvinceName,editMemberRequest.getProvinceName())
- .set(StringUtils.isNotBlank(editMemberRequest.getProvinceCode()),Member::getProvinceCode,editMemberRequest.getProvinceCode())
- .set(StringUtils.isNotBlank(editMemberRequest.getCityCode()),Member::getCityCode,editMemberRequest.getCityCode())
- .set(StringUtils.isNotBlank(editMemberRequest.getCityName()),Member::getCityName,editMemberRequest.getCityName())
- .set(StringUtils.isNotBlank(editMemberRequest.getAreaCode()),Member::getAreaCode,editMemberRequest.getAreaCode())
- .set(StringUtils.isNotBlank(editMemberRequest.getAreaName()),Member::getAreaName,editMemberRequest.getAreaName())
- .set(StringUtils.isNotBlank(editMemberRequest.getAddress()),Member::getAddress,editMemberRequest.getAddress())
- .set(StringUtils.isNotBlank(editMemberRequest.getDistrict()),Member::getDistrict,editMemberRequest.getDistrict())
- .set(Objects.nonNull(editMemberRequest.getHousearea()),Member::getHousearea,editMemberRequest.getHousearea())
- .set(StringUtils.isNotBlank(editMemberRequest.getHousetype()),Member::getHousetype,editMemberRequest.getHousetype())
- .set(Objects.nonNull(editMemberRequest.getLatitude()),Member::getLatitude,editMemberRequest.getLatitude())
- .set(Objects.nonNull(editMemberRequest.getLongitude()),Member::getLongitude,editMemberRequest.getLongitude())
- .set(Member::getToken,userUpdateInfo.getToken())
- .eq(Member::getId,editMemberRequest.getMemberId()));
+ ZTUserGetTokenResponse ztUserGetTokenResponse = (ZTUserGetTokenResponse) userUpdateInfo.getData();
+ return ztUserGetTokenResponse;
}
+
+
@Override
public Member getMemberInfo(Long memberId){
@@ -361,33 +429,78 @@
String prefix = systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode() +
systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.MEMBER).getCode();
member.setPrefix(prefix);
- return member;
+ return member;
}
- /**
- * 鏇存柊涓彴token淇℃伅
- * @param member
- */
- public void updUserZTToken(Member member){
- //濡傛灉鏃犳湁鏁堟湡/宸茶繃鏈� 閲嶆柊鑾峰彇
- if(Objects.isNull(member.getTokenDate()) || member.getTokenDate().getTime()<=System.currentTimeMillis() ){
- ZTUserGetTokenRequest param = new ZTUserGetTokenRequest();
- //鏌ヨAPPID
- String appId = systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_APPID_CUSTOMER).getCode();
- param.setAppId(appId);
- param.setOpenId(member.getOpenid());
- ZTUserGetTokenResponse ztUserGetTokenResponse = zbomZhongTaiService.getUserToken(param);
- if(Objects.nonNull(ztUserGetTokenResponse)){
- member.setToken(ztUserGetTokenResponse.getToken());
- //TODO 鏆傛棤杩囨湡鏃ユ湡
- memberMapper.update(new UpdateWrapper<Member>().lambda().set(Member::getToken,ztUserGetTokenResponse.getToken())
- .eq(Member::getId,member.getId()));
- }else{
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴TOKEN鑾峰彇澶辫触锛岃鑱旂郴绠＄悊鍛�");
+
+
+ public static ZTBaseInfoResponse getZTToken(ZbomZhongTaiService zbomZhongTaiService,
+ MemberMapper memberMapper, UsersMapper usersMapper, SystemDictDataBiz systemDictDataBiz, Long id, String userType){
+ ZTBaseInfoResponse ztBaseInfoResponse = new ZTBaseInfoResponse();
+ if(userType.equals(Constants.CUSTOMER)){
+ Member member = memberMapper.selectById(id);
+ if(Objects.isNull(member)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
- };
+ ztBaseInfoResponse.setUserType(Constants.CUSTOMER);
+ ztBaseInfoResponse.setOpenId(member.getOpenid());
+ //濡傛灉鏃犳湁鏁堟湡/宸茶繃鏈� 閲嶆柊鑾峰彇
+ if(Objects.isNull(member.getTokenDate()) || member.getTokenDate().getTime()<=System.currentTimeMillis() ){
+ ZTUserGetTokenRequest param = new ZTUserGetTokenRequest();
+ //鏌ヨAPPID
+ String appId = systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_APPID_CUSTOMER).getCode();
+ param.setAppId(appId);
+ param.setOpenId(member.getOpenid());
+ ZTUserGetTokenResponse ztUserGetTokenResponse = zbomZhongTaiService.getUserToken(param);
+ if(Objects.nonNull(ztUserGetTokenResponse)){
+ Date date =new Date(System.currentTimeMillis()+(Constants.formatLongNum(ztUserGetTokenResponse.getExpire())<=0?2*60*60*1000:ztUserGetTokenResponse.getExpire()*1000));
+ member.setToken(ztUserGetTokenResponse.getToken());
+ memberMapper.update(new UpdateWrapper<Member>().lambda()
+ .set(Member::getToken,ztUserGetTokenResponse.getToken())
+ .set(Member::getTokenDate,date)//榛樿鏈夋晥鏈熶负涓ゅ皬鏃�
+ .eq(Member::getId,member.getId()));
+ ztBaseInfoResponse.setToken(ztUserGetTokenResponse.getToken());
+ }else{
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴TOKEN鑾峰彇澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ }
+ ztBaseInfoResponse.setToken(member.getToken());
+ return ztBaseInfoResponse;
+ }else if(userType.equals(Constants.BUSINESS)){
+ Users users = usersMapper.selectById(id);
+ if(Objects.isNull(users)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ ztBaseInfoResponse.setUserType(Constants.BUSINESS);
+ ztBaseInfoResponse.setOpenId(users.getOpenid());
+ if(Objects.isNull(users.getTokenDate()) || users.getTokenDate().getTime()<=System.currentTimeMillis() ){
+ ZTUserGetTokenRequest param = new ZTUserGetTokenRequest();
+ //鏌ヨAPPID
+ String appId = systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_APPID_CUSTOMER).getCode();
+ param.setAppId(appId);
+ param.setOpenId(users.getOpenid());
+ ZTUserGetTokenResponse ztUserGetTokenResponse = zbomZhongTaiService.getUserToken(param);
+ if(Objects.nonNull(ztUserGetTokenResponse)){
+ users.setToken(ztUserGetTokenResponse.getToken());
+ Date date =new Date(System.currentTimeMillis()+(Constants.formatLongNum(ztUserGetTokenResponse.getExpire())<=0?2*60*60*1000:ztUserGetTokenResponse.getExpire()*1000));
+ usersMapper.update(new UpdateWrapper<Users>().lambda().set(Users::getToken,ztUserGetTokenResponse.getToken())
+ .set(Users::getTokenDate,date)//榛樿鏈夋晥鏈熶负涓ゅ皬鏃�
+ .eq(Users::getId,users.getId()));
+ ztBaseInfoResponse.setToken(ztUserGetTokenResponse.getToken());
+ return ztBaseInfoResponse;
+ }else{
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴TOKEN鑾峰彇澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ }
+ ztBaseInfoResponse.setToken(users.getToken());
+// return ztBaseInfoResponse;
+ }else{
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍙傛暟閿欒");
+ }
+ return ztBaseInfoResponse;
}
+
@@ -401,11 +514,11 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸叉敞閿�");
}
//鏍￠獙鐢ㄦ埛token淇℃伅
- this.updUserZTToken(member);
+ MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,member.getId(),Constants.CUSTOMER);
//璋冭捣涓彴娉ㄩ攢鎺ュ彛
ZTBaseRequst ztBaseRequst = new ZTBaseRequst();
ztBaseRequst.setUserType(Constants.CUSTOMER);
- ztBaseRequst.setOpenid(member.getOpenid());
+ ztBaseRequst.setOpenId(member.getOpenid());
ztBaseRequst.setToken(member.getToken());
Boolean logoutFlag = zbomZhongTaiService.userLogout(ztBaseRequst);
if(logoutFlag){
@@ -420,4 +533,6 @@
}
+
+
}
--
Gitblit v1.9.3