From f56dad374e59b881566d8179ecf068492167dfbc Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 07 八月 2024 10:21:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 50 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 35 insertions(+), 15 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 4c43371..9c643d6 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
@@ -291,12 +291,8 @@
member.setOpenid(openId);
member.setType(Constants.ZERO);
member.setAuthStatus(Constants.ZERO);
+ member.setStatus(Constants.ZERO);
//濡傛灉缁戝畾浜嗗璐� 鍒欑洿鎺ヤ娇鐢ㄥ凡缁戝畾瀵艰喘淇℃伅 璺宠繃鎵嬫満鍙风粦瀹氱殑鐘舵��
-// if(Objects.nonNull(users)){
-// member.setAuthStatus(Constants.TWO);
-// }else{
-// member.setAuthStatus(Constants.ZERO);
-// }
ZTUserGetTokenResponse ztUserGetTokenResponse = this.syncZhongTaiUser(member);
if(!Objects.isNull(ztUserGetTokenResponse)){
member.setToken(ztUserGetTokenResponse.getToken());
@@ -305,12 +301,14 @@
}
memberMapper.insert(member);
}else{
- ZTUserGetTokenResponse ztUserGetTokenResponse = this.syncZhongTaiUser(member);
- if(!Objects.isNull(ztUserGetTokenResponse)){
- member.setToken(ztUserGetTokenResponse.getToken());
- member.setZtUserId(StringUtils.defaultString(ztUserGetTokenResponse.getZtUserId(),ztUserGetTokenResponse.getToken()));
+ ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,
+ member.getId(),ZTConstants.CUSTOMER);
+ if(!Objects.isNull(ztBaseInfoResponse)){
+ member.setToken(ztBaseInfoResponse.getToken());
+ member.setZtUserId(StringUtils.defaultString(ztBaseInfoResponse.getZtUserId(),ztBaseInfoResponse.getToken()));
Member update = new Member();
- update.setZtUserId(StringUtils.defaultString(ztUserGetTokenResponse.getZtUserId(),ztUserGetTokenResponse.getToken()));
+ update.setZtUserId(StringUtils.defaultString(ztBaseInfoResponse.getZtUserId(),ztBaseInfoResponse.getToken()));
+ update.setToken(member.getToken());
update.setToken(member.getToken());
update.setId(member.getId());
update.setAuthStatus(member.getAuthStatus());
@@ -454,7 +452,9 @@
//鏈粦瀹氳繃
if (Objects.isNull(customerUser.getId())) {
customerUserMapper.insert(customerUser);
+ member.setAuthStatus(Constants.TWO);
} else if(ztBaseResponse !=null) {
+ member.setAuthStatus(Constants.TWO);
customerUserMapper.updateById(customerUser);
}
}
@@ -542,7 +542,9 @@
if(!Constants.equalsInteger(member.getPhone().length(),11)){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鎵嬫満鍙烽敊璇�!");
}
- member.setAuthStatus(Constants.ONE);
+ if(Constants.equalsInteger(member.getAuthStatus(),Constants.ZERO)){
+ member.setAuthStatus(Constants.ONE);
+ }
}
memberMapper.updateById(member);
return this.getMemberInfo(member.getId());
@@ -568,9 +570,11 @@
ZTUserGetTokenResponse ztUserGetTokenResponse = this.syncZhongTaiUser(memberDto);
if(!Objects.isNull(ztUserGetTokenResponse)){
member.setToken(ztUserGetTokenResponse.getToken());
- member.setToken(StringUtils.defaultString(ztUserGetTokenResponse.getZtUserId(),ztUserGetTokenResponse.getToken()));
+ member.setZtUserId(StringUtils.defaultString(ztUserGetTokenResponse.getZtUserId(),ztUserGetTokenResponse.getToken()));
}
- memberDto.setAuthStatus(Constants.ONE);
+ if(Constants.equalsInteger(member.getAuthStatus(),Constants.ZERO)){
+ memberDto.setAuthStatus(Constants.ONE);
+ }
memberMapper.updateById(memberDto);
return this.getMemberInfo(member.getId());
}
@@ -585,7 +589,14 @@
ztUserInfoUpdateRequest.setPhone(member.getPhone());
ztUserInfoUpdateRequest.setName(member.getName());
ztUserInfoUpdateRequest.setNickName(member.getNickname());
-// ztUserInfoUpdateRequest.setAddress(member.getProvinceName()+member.getCityName()+member.getAreaName());
+ if(StringUtils.isNotBlank(member.getProvinceName())
+ && StringUtils.isNotBlank(member.getCityName())
+ && StringUtils.isNotBlank(member.getAreaName())){
+ ztUserInfoUpdateRequest.setAddress(member.getProvinceName()+member.getCityName()+member.getAreaName());
+ }
+ ztUserInfoUpdateRequest.setProvince(member.getProvinceCode());
+ ztUserInfoUpdateRequest.setCity(member.getCityCode());
+ ztUserInfoUpdateRequest.setCounty(member.getAreaCode());
ztUserInfoUpdateRequest.setFullAddress(member.getAddress());
String prefix = systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode() +
systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.MEMBER).getCode();
@@ -613,7 +624,16 @@
ztUserInfoUpdateRequest.setPhone(member.getPhone());
ztUserInfoUpdateRequest.setName(member.getName());
ztUserInfoUpdateRequest.setNickName(member.getNickname());
-// ztUserInfoUpdateRequest.setAddress(member.getProvinceName()+member.getCityName()+member.getAreaName());
+
+ if(StringUtils.isNotBlank(member.getProvinceName())
+ && StringUtils.isNotBlank(member.getCityName())
+ && StringUtils.isNotBlank(member.getAreaName())){
+ ztUserInfoUpdateRequest.setAddress(member.getProvinceName()+member.getCityName()+member.getAreaName());
+ }
+ ztUserInfoUpdateRequest.setProvince(member.getProvinceCode());
+ ztUserInfoUpdateRequest.setCity(member.getCityCode());
+ ztUserInfoUpdateRequest.setCounty(member.getAreaCode());
+
ztUserInfoUpdateRequest.setFullAddress(member.getAddress());
String prefix = systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode() +
systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.MEMBER).getCode();
--
Gitblit v1.9.3