From 8ce648f125a026ef9d7272ddcc46ceb0e59d809b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 02 八月 2024 17:05:49 +0800
Subject: [PATCH] aa
---
server/service/src/main/java/com/doumee/service/business/impl/CustomerUserServiceImpl.java | 36 ++++++--
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTUserGetTokenResponse.java | 4 +
server/web/src/main/java/com/doumee/api/web/CustomerApi.java | 20 +++-
server/service/src/main/java/com/doumee/service/business/CustomerUserService.java | 4
server/service/src/main/java/com/doumee/dao/business/model/Member.java | 3
server/service/src/main/java/com/doumee/core/utils/Constants.java | 10 +-
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTBaseRequst.java | 3
server/service/src/main/java/com/doumee/biz/zbom/model/crm/response/CRMCustomerListResponse.java | 1
server/admin/src/main/java/com/doumee/timer/WeixinTokenJobBiz.java | 1
server/service/src/main/java/com/doumee/service/business/MemberService.java | 1
server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java | 9 +-
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 120 ++++++++++++++++-------------
12 files changed, 130 insertions(+), 82 deletions(-)
diff --git a/server/admin/src/main/java/com/doumee/timer/WeixinTokenJobBiz.java b/server/admin/src/main/java/com/doumee/timer/WeixinTokenJobBiz.java
index f4a34e1..3e73d7a 100644
--- a/server/admin/src/main/java/com/doumee/timer/WeixinTokenJobBiz.java
+++ b/server/admin/src/main/java/com/doumee/timer/WeixinTokenJobBiz.java
@@ -29,6 +29,7 @@
systemDictService.updWxMiniToken();
log.info("\n ======== 瀹氭椂浠诲姟宸叉墽琛岋細weixinTokenJob.========"+module);
} catch (Exception e) {
+ log.error("\n ======== 瀹氭椂浠诲姟宸叉墽琛岋細weixinTokenJob.========鍙戠敓寮傚父锛�"+e.getMessage());
e.printStackTrace();
}
}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/crm/response/CRMCustomerListResponse.java b/server/service/src/main/java/com/doumee/biz/zbom/model/crm/response/CRMCustomerListResponse.java
index 19cbcb6..b2ae53a 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/crm/response/CRMCustomerListResponse.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/crm/response/CRMCustomerListResponse.java
@@ -23,6 +23,7 @@
private String creationDate ;//鍒涘缓鏃堕棿
private String customerId ;//瀹㈡埛 id
private String platSourceId ;//浼犻�掑钩鍙� id
+ private String headPortrait ;//鐢ㄦ埛澶村儚鍦板潃
private String platSource ;//骞冲彴绫诲瀷 1 pad 绔� 2 灏忕▼搴忕
}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTBaseRequst.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTBaseRequst.java
index ec88038..d97a5ba 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTBaseRequst.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTBaseRequst.java
@@ -18,4 +18,7 @@
@ApiModelProperty(value = "鐢ㄦ埛涓婚敭" , hidden = true)
private String userId;
+ @ApiModelProperty(value = "涓彴鐢ㄦ埛涓婚敭锛堥拡瀵笴绔級" , hidden = true)
+ private String ztUserId;
+
}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTUserGetTokenResponse.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTUserGetTokenResponse.java
index 2be1a77..f3608bd 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTUserGetTokenResponse.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTUserGetTokenResponse.java
@@ -11,6 +11,10 @@
*/
private String token;
/**
+ *鐢ㄦ埛涓存椂绁ㄦ嵁
+ */
+ private String ztUserId;
+ /**
* 鏈夋晥鏈� 绉�
*/
private Long expire;
diff --git a/server/service/src/main/java/com/doumee/core/utils/Constants.java b/server/service/src/main/java/com/doumee/core/utils/Constants.java
index d1d5342..339211f 100644
--- a/server/service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/service/src/main/java/com/doumee/core/utils/Constants.java
@@ -495,15 +495,15 @@
StringBuffer stringBuffer = new StringBuffer();
for (int i = 0; i < arr.length; i++) {
if(i==0){
- stringBuffer.append( i + "瀹�");
+ stringBuffer.append( arr[i] + "瀹�");
}else if(i==1){
- stringBuffer.append( i + "鍘�");
+ stringBuffer.append( arr[i] + "鍘�");
}else if(i==2){
- stringBuffer.append( i + "鍘�");
+ stringBuffer.append( arr[i] + "鍘�");
}else if(i==3){
- stringBuffer.append( i + "鍗�");
+ stringBuffer.append( arr[i] + "鍗�");
}else if(i==4){
- stringBuffer.append( i + "闃�");
+ stringBuffer.append( arr[i] + "闃�");
}else {
break;
}
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Member.java b/server/service/src/main/java/com/doumee/dao/business/model/Member.java
index 36c57ea..1cc54b5 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Member.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Member.java
@@ -91,6 +91,9 @@
@ApiModelProperty(value = "涓彴涓存椂绁ㄦ嵁")
@ExcelColumn(name="涓彴涓存椂绁ㄦ嵁")
private String token;
+ @ApiModelProperty(value = "涓彴鐢ㄦ埛涓婚敭")
+ @ExcelColumn(name="涓彴鐢ㄦ埛涓婚敭")
+ private String ztUserId;
@ApiModelProperty(value = "鎬у埆 1鐢� 2濂�", example = "1")
@ExcelColumn(name="鎬у埆 1鐢� 2濂�")
diff --git a/server/service/src/main/java/com/doumee/service/business/CustomerUserService.java b/server/service/src/main/java/com/doumee/service/business/CustomerUserService.java
index 4a0be92..7ee39c7 100644
--- a/server/service/src/main/java/com/doumee/service/business/CustomerUserService.java
+++ b/server/service/src/main/java/com/doumee/service/business/CustomerUserService.java
@@ -3,6 +3,8 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.CustomerUser;
+import com.doumee.dao.business.model.Member;
+
import java.util.List;
/**
@@ -97,5 +99,5 @@
void syncYesterday(String date);
- void syncByPhone(String phone);
+ void syncByPhone(Member member);
}
diff --git a/server/service/src/main/java/com/doumee/service/business/MemberService.java b/server/service/src/main/java/com/doumee/service/business/MemberService.java
index b7c357e..6a21c7e 100644
--- a/server/service/src/main/java/com/doumee/service/business/MemberService.java
+++ b/server/service/src/main/java/com/doumee/service/business/MemberService.java
@@ -132,7 +132,6 @@
Member getMemberInfo(Long memberId);
-
/**
* 鐢ㄦ埛娉ㄩ攢
* @param memberId
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CustomerUserServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CustomerUserServiceImpl.java
index ae2149c..1a3b88f 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CustomerUserServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CustomerUserServiceImpl.java
@@ -182,21 +182,24 @@
request.setPageSize(100);
request.setTiming(Constants.ONE+"");
request.setCreationDate(date);
- this.syncData(request);
+ this.syncData(request,null);
}
@Override
@Transactional
- public void syncByPhone(String phone) {
+ public void syncByPhone(Member member) {
+ if(member ==null){
+ return;
+ }
CrmDaogouBindListRequest request = new CrmDaogouBindListRequest();
request.setPage(0);
request.setPageSize(100);
request.setTiming(Constants.ZERO+"");
- request.setKeyWords(phone);
- this.syncData(request);
+ request.setKeyWords(member.getPhone());
+ this.syncData(request,member);
}
- public void syncData(CrmDaogouBindListRequest request){
+ public void syncData(CrmDaogouBindListRequest request,Member member){
boolean hasMore = true;
int currentNum = 0;
Date cdate = new Date();
@@ -221,29 +224,33 @@
hasMore = false;
}
}
- dealSyncDataBiz(cdate,allList);
+ dealSyncDataBiz(cdate,allList,member);
}
- private void dealSyncDataBiz(Date date,List<CRMDaogouBindListResponse> list) {
+ private void dealSyncDataBiz(Date date,List<CRMDaogouBindListResponse> list,Member member) {
if(list ==null && list.size()==0){
return;
}
List<CustomerUser> addList = new ArrayList<>();
List<String> phoneList = new ArrayList<>();
+ List<Long> memberIds = new ArrayList<>();
for(CRMDaogouBindListResponse data : list){
if(StringUtils.isBlank(data.getCustomerPhone())){
continue;
}
- Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda()
- .eq(Member::getPhone,data.getCustomerPhone() )
- .eq(Member::getIsdeleted,Constants.ZERO)
- .last("limit 1" ));
+ if(member == null){
+ member = memberMapper.selectOne(new QueryWrapper<Member>().lambda()
+ .eq(Member::getPhone,data.getCustomerPhone() )
+ .eq(Member::getIsdeleted,Constants.ZERO)
+ .last("limit 1" ));
+ }
Users user = usersMapper.selectOne(new QueryWrapper<Users>().lambda()
.eq(Users::getIamId,data.getIamId() )
.last("limit 1" ));
if(member == null){
continue;
}
+ memberIds.add(member.getId());
phoneList.add(data.getCustomerPhone());
CustomerUser model = new CustomerUser();
@@ -288,6 +295,13 @@
customerUserMapper.insert(addList.subList(temp,index));
temp = index;
}
+ Member update = new Member();
+ update.setAuthStatus(Constants.TWO);
+ update.setEditDate(new Date());
+ memberMapper.update(null,new UpdateWrapper<Member>().lambda().
+ set(Member::getAuthStatus,Constants.TWO).
+ set(Member::getEditDate,new Date())
+ .in(Member::getId,memberIds));
}
}
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java
index 5769170..38d963a 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java
@@ -295,7 +295,8 @@
systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.MEMBER).getCode() + member.getImgurl());
}
if(Objects.nonNull(users)&&Objects.nonNull(member)&&StringUtils.isNotBlank(member.getOpenid())){
- MemberServiceImpl.saveCustomerUser(zbomZhongTaiService,customerUserMapper,users,member);
+ //鏇存柊瀵艰喘缁戝畾淇℃伅
+ MemberServiceImpl.saveCustomerUser(zbomZhongTaiService,customerUserMapper,memberMapper,users,member);
String prefix = StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.RESOURCE_PATH).getCode()) +
StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.USERS_FILE).getCode());
if(StringUtils.isNotBlank(users.getImgurl())){
@@ -352,7 +353,7 @@
systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.MEMBER).getCode() + member.getImgurl());
}
if(Objects.nonNull(users)&&Objects.nonNull(member)&&StringUtils.isNotBlank(member.getOpenid())){
- MemberServiceImpl.saveCustomerUser(zbomZhongTaiService,customerUserMapper,users,member);
+ MemberServiceImpl.saveCustomerUser(zbomZhongTaiService,customerUserMapper,memberMapper,users,member);
String prefix = StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.RESOURCE_PATH).getCode()) +
StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.USERS_FILE).getCode());
if(StringUtils.isNotBlank(users.getImgurl())){
@@ -403,7 +404,7 @@
systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.MEMBER).getCode() + member.getImgurl());
}
if(Objects.nonNull(users)&&Objects.nonNull(member)&&StringUtils.isNotBlank(member.getOpenid())){
- MemberServiceImpl.saveCustomerUser(zbomZhongTaiService,customerUserMapper,users,member);
+ MemberServiceImpl.saveCustomerUser(zbomZhongTaiService,customerUserMapper,memberMapper,users,member);
String prefix = StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.RESOURCE_PATH).getCode()) +
StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.USERS_FILE).getCode());
if(StringUtils.isNotBlank(users.getImgurl())){
@@ -459,7 +460,7 @@
member.setImgurl(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode() +
systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.MEMBER).getCode() + member.getImgurl());
}
- MemberServiceImpl.saveCustomerUser(zbomZhongTaiService,customerUserMapper,users,member);
+ MemberServiceImpl.saveCustomerUser(zbomZhongTaiService,customerUserMapper,memberMapper,users,member);
String prefix = StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.RESOURCE_PATH).getCode()) +
StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.USERS_FILE).getCode());
if(StringUtils.isNotBlank(users.getImgurl())){
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 e512566..a7bc725 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
@@ -276,7 +276,7 @@
if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isBlank(openId)) {
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鑾峰彇openid澶辫触锛佽鑱旂郴绠＄悊鍛�");
}
-// String openId = code;
+// String openId = code;
Member member = memberMapper.selectOne(new QueryWrapper<Member>().eq("OPENID", openId)
.last(" limit 1 "));
Users users = null;
@@ -291,23 +291,31 @@
member.setOpenid(openId);
member.setType(Constants.ZERO);
//濡傛灉缁戝畾浜嗗璐� 鍒欑洿鎺ヤ娇鐢ㄥ凡缁戝畾瀵艰喘淇℃伅 璺宠繃鎵嬫満鍙风粦瀹氱殑鐘舵��
- if(Objects.nonNull(users)){
- member.setAuthStatus(Constants.TWO);
- }else{
- member.setAuthStatus(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());
+ member.setZtUserId(StringUtils.defaultString(ztUserGetTokenResponse.getZtUserId(),ztUserGetTokenResponse.getToken()));
+ MemberServiceImpl.saveCustomerUser(zbomZhongTaiService,customerUserMapper,null,users,member);
}
memberMapper.insert(member);
- MemberServiceImpl.saveCustomerUser(zbomZhongTaiService,customerUserMapper,users,member);
}else{
ZTUserGetTokenResponse ztUserGetTokenResponse = this.syncZhongTaiUser(member);
if(!Objects.isNull(ztUserGetTokenResponse)){
member.setToken(ztUserGetTokenResponse.getToken());
+ member.setZtUserId(StringUtils.defaultString(ztUserGetTokenResponse.getZtUserId(),ztUserGetTokenResponse.getToken()));
+ Member update = new Member();
+ update.setZtUserId(StringUtils.defaultString(ztUserGetTokenResponse.getZtUserId(),ztUserGetTokenResponse.getToken()));
+ update.setToken(member.getToken());
+ update.setId(member.getId());
+ update.setAuthStatus(member.getAuthStatus());
+ MemberServiceImpl.saveCustomerUser(zbomZhongTaiService,customerUserMapper,null,users,member);
+ memberMapper.updateById(update);//缂撳瓨涓彴token淇℃伅
}
- MemberServiceImpl.saveCustomerUser(zbomZhongTaiService,customerUserMapper,users,member);
member = this.getMemberInfo(member.getId());
}
String token = JwtTokenUtil.generateTokenForZb(member.getId(),ZTConstants.CUSTOMER, JSONObject.toJSON(member).toString(),redisTemplate);
@@ -340,12 +348,14 @@
ZTUserGetTokenResponse ztUserGetTokenResponse = this.syncZhongTaiUser(member);
if(!Objects.isNull(ztUserGetTokenResponse)){
member.setToken(ztUserGetTokenResponse.getToken());
+ member.setZtUserId(StringUtils.defaultString(ztUserGetTokenResponse.getZtUserId(),ztUserGetTokenResponse.getToken()));
}
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()));
memberMapper.updateById(member);
}
member = this.getMemberInfo(member.getId());
@@ -416,7 +426,7 @@
// }
- public static void saveCustomerUser(ZbomZhongTaiService zbomZhongTaiService, CustomerUserMapper customerUserMapper, Users users, Member member) {
+ public static void saveCustomerUser(ZbomZhongTaiService zbomZhongTaiService, CustomerUserMapper customerUserMapper, MemberMapper memberMapper,Users users, Member member) {
if (Objects.nonNull(users) && Objects.nonNull(member.getId())) {
CustomerUser customerUser = customerUserMapper.selectOne(new QueryWrapper<CustomerUser>().lambda()
.eq(CustomerUser::getIsdeleted, Constants.ZERO)
@@ -437,45 +447,37 @@
customerUser.setUsername(users.getIamUsername());
customerUser.setAddr(users.getShopAddress());
}
+ ZTBaseResponse ztBaseResponse = null;
+ if ( !Constants.equalsInteger(customerUser.getZtStatus(),Constants.ONE)) {
+ ztBaseResponse = syncZtCustomerUserSendRequest(zbomZhongTaiService,memberMapper,member, users,customerUser);
+ }
//鏈粦瀹氳繃
if (Objects.isNull(customerUser.getId())) {
- ZTBaseResponse ztBaseResponse = MemberServiceImpl.syncZtCustomerUser(zbomZhongTaiService,member, users);
- if (Objects.nonNull(ztBaseResponse)) {
- if (ztBaseResponse.getSuccess()) {
- customerUser.setZtStatus(1);
- customerUser.setZtDate(new Date());
- } else {
- customerUser.setZtStatus(2);
- customerUser.setZtDate(new Date());
- customerUser.setZtInfo(JSONObject.toJSONString(ztBaseResponse));
- }
- } else {
- customerUser.setZtStatus(2);
- customerUser.setZtDate(new Date());
- customerUser.setZtInfo(JSONObject.toJSONString(ztBaseResponse));
- }
customerUserMapper.insert(customerUser);
- } else {
- if (!Constants.equalsInteger(customerUser.getZtStatus(),Constants.ONE)) {
- ZTBaseResponse ztBaseResponse = MemberServiceImpl.syncZtCustomerUser(zbomZhongTaiService,member, users);
- if (Objects.nonNull(ztBaseResponse)) {
- if (ztBaseResponse.getSuccess()) {
- customerUser.setZtStatus(1);
- customerUser.setZtDate(new Date());
- } else {
- customerUser.setZtStatus(2);
- customerUser.setZtDate(new Date());
- customerUser.setZtInfo(JSONObject.toJSONString(ztBaseResponse));
- }
- } else {
- customerUser.setZtStatus(2);
- customerUser.setZtDate(new Date());
- customerUser.setZtInfo(JSONObject.toJSONString(ztBaseResponse));
- }
- customerUserMapper.updateById(customerUser);
- }
+ } else if(ztBaseResponse !=null) {
+ customerUserMapper.updateById(customerUser);
}
}
+ }
+
+ private static ZTBaseResponse syncZtCustomerUserSendRequest(ZbomZhongTaiService zbomZhongTaiService,MemberMapper memberMapper, Member member, Users users,CustomerUser customerUser) {
+ ZTBaseResponse ztBaseResponse = MemberServiceImpl.syncZtCustomerUser(zbomZhongTaiService,member, users);
+ customerUser.setZtStatus(2);
+ customerUser.setZtInfo(JSONObject.toJSONString(ztBaseResponse));
+ if (Objects.nonNull(ztBaseResponse) && ztBaseResponse.getSuccess()) {
+ customerUser.setZtStatus(1);//鍚屾鎴愬姛
+ member.setAuthStatus(Constants.TWO);//鐢ㄦ埛瀵艰喘缁戝畾鐘舵��
+ if(memberMapper!=null){
+ //濡傛灉闇�瑕佹洿鏂扮敤鎴风粦瀹氬璐姸鎬�
+ Member update = new Member();
+ update.setAuthStatus(Constants.TWO);
+ update.setEditDate(new Date());
+ update.setId(member.getId());
+ memberMapper.updateById(update);//鏇存柊鐢ㄦ埛鍚屾鐘舵��
+ }
+
+ }
+ return ztBaseResponse;
}
@@ -530,12 +532,13 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
BeanUtils.copyProperties(editMemberRequest,member);
- memberMapper.updateById(member);
//鍚屾涓彴鐢ㄦ埛淇℃伅
ZTUserGetTokenResponse ztUserGetTokenResponse = this.syncZhongTaiUser(member);
if(!Objects.isNull(ztUserGetTokenResponse)){
member.setToken(ztUserGetTokenResponse.getToken());
+ member.setZtUserId(StringUtils.defaultString(ztUserGetTokenResponse.getZtUserId(),ztUserGetTokenResponse.getToken()));
}
+ memberMapper.updateById(member);
return this.getMemberInfo(member.getId());
}
@@ -556,12 +559,13 @@
Member memberDto = new Member();
BeanUtils.copyProperties(editMemberRequest,memberDto);
memberDto.setOpenid(member.getOpenid());
-// ZTUserGetTokenResponse ztUserGetTokenResponse = this.syncZhongTaiUser(memberDto);
-// if(Objects.isNull(ztUserGetTokenResponse)){
+ ZTUserGetTokenResponse ztUserGetTokenResponse = this.syncZhongTaiUser(memberDto);
+ if(Objects.isNull(ztUserGetTokenResponse)){
// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴鏈嶅姟璋冭捣澶辫触!");
-// }else{
-// member.setToken(ztUserGetTokenResponse.getToken());
-// }
+ }else{
+ member.setToken(ztUserGetTokenResponse.getToken());
+ member.setToken(StringUtils.defaultString(ztUserGetTokenResponse.getZtUserId(),ztUserGetTokenResponse.getToken()));
+ }
memberMapper.updateById(memberDto);
return this.getMemberInfo(member.getId());
}
@@ -633,7 +637,7 @@
String prefix = systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode() +
systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.MEMBER).getCode();
member.setPrefix(prefix);
- if( customerUserMapper.selectCount(new QueryWrapper<CustomerUser>()
+ /* if( customerUserMapper.selectCount(new QueryWrapper<CustomerUser>()
.lambda().eq(CustomerUser::getIsdeleted,Constants.ZERO).eq(CustomerUser::getZtStatus,Constants.ONE).eq(CustomerUser::getMemberId,member.getId()))>0){
member.setAuthStatus(Constants.TWO);
}else{
@@ -642,7 +646,7 @@
}else{
member.setAuthStatus(Constants.ONE);
}
- }
+ }*/
return member;
}
@@ -660,19 +664,27 @@
ztBaseInfoResponse.setUserType(ZTConstants.CUSTOMER);
ztBaseInfoResponse.setOpenId(member.getOpenid());
//濡傛灉鏃犳湁鏁堟湡/宸茶繃鏈� 閲嶆柊鑾峰彇
- if(Objects.isNull(member.getTokenDate()) || member.getTokenDate().getTime()<=System.currentTimeMillis() ){
+ if(Objects.isNull(member.getZtUserId()) ||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 = syncZhongTaiUserNew(member,systemDictDataBiz,zbomZhongTaiService);
-// ZTUserGetTokenResponse ztUserGetTokenResponse = zbomZhongTaiService.getUserToken(param);
+ ZTUserGetTokenResponse ztUserGetTokenResponse =null;
+ if(StringUtils.isNotBlank(member.getZtUserId())){
+ //濡傛灉鏄凡鍚屾鐨勭敤鎴�
+ ztUserGetTokenResponse = zbomZhongTaiService.getUserToken(param);
+ }
+ if(ztUserGetTokenResponse == null){
+ //濡傛灉鑾峰彇澶辫触锛屽皾璇曢噸鏂板悓姝ラ噸鏂拌幏鍙�
+ ztUserGetTokenResponse = syncZhongTaiUserNew(member,systemDictDataBiz,zbomZhongTaiService);
+ }
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::getZtUserId,StringUtils.defaultString(ztUserGetTokenResponse.getZtUserId(),ztUserGetTokenResponse.getToken()))
// .set(Member::getTokenDate,date)//榛樿鏈夋晥鏈熶负涓ゅ皬鏃�
.eq(Member::getId,member.getId()));
ztBaseInfoResponse.setToken(ztUserGetTokenResponse.getToken());
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..2cb5b22 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
@@ -122,11 +122,16 @@
})
public ApiResponse<Member> editMember(@RequestBody EditMemberRequest editMemberRequest) {
editMemberRequest.setId(getMemberId());
+ String phone = editMemberRequest.getPhone();
+// if(StringUtils.isNotBlank(editMemberRequest.getPhone())){
+// customerUserService.syncByPhone(editMemberRequest.getPhone());
+// }
//鍚屾瀵艰喘缁戝畾淇℃伅
- if(StringUtils.isNotBlank(editMemberRequest.getPhone())){
- customerUserService.syncByPhone(editMemberRequest.getPhone());
+ Member member =memberService.updMemberDetail(editMemberRequest);
+ if(StringUtils.isNotBlank(phone)){
+ customerUserService.syncByPhone(member);
}
- return ApiResponse.success("鏇存柊鎴愬姛",memberService.updMemberDetail(editMemberRequest));
+ return ApiResponse.success("鏇存柊鎴愬姛",member);
}
@LoginRequired
@@ -137,10 +142,11 @@
})
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);
}
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("鍚屾鎴愬姛");
}
--
Gitblit v1.9.3