From b2d360d9113b6955287108ca9e90d76a1f3c1419 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期日, 29 九月 2024 15:05:11 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java | 83 ++++++++++++++++++++++++++++++-----------
1 files changed, 61 insertions(+), 22 deletions(-)
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 a57de5b..7e2137b 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
@@ -287,16 +287,23 @@
ZTProductInfoResponse response = zbomZhongTaiService.getProductInfo(ztContentListRequest);
if(Objects.nonNull(response)){
//鏌ヨ瀵艰喘淇℃伅 杩涜淇℃伅缁戝畾涓庤繑鍥�
- if(StringUtils.isNotBlank(salesId)){
+ if(StringUtils.isNotBlank(salesId)&&userType.equals(ZTConstants.CUSTOMER)){
Users users = usersMapper.selectById(salesId);
- if(Objects.nonNull(users)){
- MemberServiceImpl.saveCustomerUser(customerUserMapper,users,userId);
+ Member member = memberMapper.selectById(userId);
+ if(Objects.nonNull(users)&&Objects.nonNull(member)&&StringUtils.isNotBlank(member.getOpenid())){
+ //鏇存柊瀵艰喘缁戝畾淇℃伅
+ 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())){
users.setImgurlFull(prefix + users.getImgurl());
}
response.setUsers(users);
+ memberMapper.updateById(member);
+ }
+ if(StringUtils.isNotBlank(member.getImgurl())){
+ member.setImgurl(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode() +
+ systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.MEMBER).getCode() + member.getImgurl());
}
}
List<String> stringList = new ArrayList<String>();
@@ -338,22 +345,23 @@
ztContentListRequest.setId(id);
ZTCaseInfoResponse response = zbomZhongTaiService.getWholecaseInfo(ztContentListRequest);
if(Objects.nonNull(response)){
-// if(StringUtils.isNotBlank(response.getPanorama())){
-// response.setPanorama(
-// response.getPanorama().replace("https://720.","https://720-3.").replace("https://720-2.","https://720-3.")
-// );
-// }
//鏌ヨ瀵艰喘淇℃伅 杩涜淇℃伅缁戝畾涓庤繑鍥�
- if(StringUtils.isNotBlank(salesId)){
+ if(StringUtils.isNotBlank(salesId)&&userType.equals(ZTConstants.CUSTOMER)){
Users users = usersMapper.selectById(salesId);
- if(Objects.nonNull(users)){
- MemberServiceImpl.saveCustomerUser(customerUserMapper,users,userId);
+ Member member = memberMapper.selectById(userId);
+ if(Objects.nonNull(users)&&Objects.nonNull(member)&&StringUtils.isNotBlank(member.getOpenid())){
+ 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())){
users.setImgurlFull(prefix + users.getImgurl());
}
response.setUsers(users);
+ memberMapper.updateById(member);
+ }
+ if(StringUtils.isNotBlank(member.getImgurl())){
+ member.setImgurl(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode() +
+ systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.MEMBER).getCode() + member.getImgurl());
}
}
List<String> stringList = new ArrayList<String>();
@@ -390,16 +398,22 @@
ZTProductNewsInfoResponse response = zbomZhongTaiService.getProductNewsInfo(ztContentListRequest);
if(Objects.nonNull(response)){
//鏌ヨ瀵艰喘淇℃伅 杩涜淇℃伅缁戝畾涓庤繑鍥�
- if(StringUtils.isNotBlank(salesId)){
+ if(StringUtils.isNotBlank(salesId)&&userType.equals(ZTConstants.CUSTOMER)){
Users users = usersMapper.selectById(salesId);
- if(Objects.nonNull(users)){
- MemberServiceImpl.saveCustomerUser(customerUserMapper,users,userId);
+ Member member = memberMapper.selectById(userId);
+ if(Objects.nonNull(users)&&Objects.nonNull(member)&&StringUtils.isNotBlank(member.getOpenid())){
+ 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())){
users.setImgurlFull(prefix + users.getImgurl());
}
response.setUsers(users);
+ memberMapper.updateById(member);
+ }
+ if(StringUtils.isNotBlank(member.getImgurl())){
+ member.setImgurl(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode() +
+ systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.MEMBER).getCode() + member.getImgurl());
}
}
List<String> stringList = new ArrayList<String>();
@@ -441,16 +455,22 @@
ZTRealcaseInfoResponse response = zbomZhongTaiService.getRealcaseInfo(ztContentListRequest);
if(Objects.nonNull(response)){
//鏌ヨ瀵艰喘淇℃伅 杩涜淇℃伅缁戝畾涓庤繑鍥�
- if(StringUtils.isNotBlank(salesId)){
+ if(StringUtils.isNotBlank(salesId)&&userType.equals(ZTConstants.CUSTOMER)){
Users users = usersMapper.selectById(salesId);
- if(Objects.nonNull(users)){
- MemberServiceImpl.saveCustomerUser(customerUserMapper,users,userId);
+ Member member = memberMapper.selectById(userId);
+ if(Objects.nonNull(users)&&Objects.nonNull(member)&&StringUtils.isNotBlank(member.getOpenid())){
+ 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())){
users.setImgurlFull(prefix + users.getImgurl());
}
response.setUsers(users);
+ memberMapper.updateById(member);
+ }
+ if(StringUtils.isNotBlank(member.getImgurl())){
+ member.setImgurl(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode() +
+ systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.MEMBER).getCode() + member.getImgurl());
}
}
List<String> stringList = new ArrayList<String>();
@@ -489,8 +509,7 @@
public void batchAddLike(ZTBatchAddListRequest ztBatchAddListRequest){
if(Objects.isNull(ztBatchAddListRequest)
|| StringUtils.isBlank(ztBatchAddListRequest.getArticleIds())
- || StringUtils.isBlank(ztBatchAddListRequest.getCustomerId())
- || StringUtils.isBlank(ztBatchAddListRequest.getPlatSourceId())
+ || StringUtils.isBlank(ztBatchAddListRequest.getPlatId())
|| StringUtils.isBlank(ztBatchAddListRequest.getPlatSource())
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
@@ -499,9 +518,29 @@
ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,
Long.valueOf(ztBatchAddListRequest.getUserId()),ztBatchAddListRequest.getUserType());
ztBatchAddListRequest.setToken(ztBaseInfoResponse.getToken());
- zbomZhongTaiService.batchAddLike(ztBatchAddListRequest);
+ ZTBaseResponse result = zbomZhongTaiService.batchAddLike(ztBatchAddListRequest);
+ if(result ==null || !Constants.equalsInteger( result.getCode(),ZTConstants.CODE_SUCCESS)){
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鍒嗕韩缁戝畾澶辫触鍝︼紒");
+ }
}
-
-
+ @Override
+ public void customerBinDingUsers(ZTCustomerBindingUsersRequest ztCustomerBindingUsersRequest){
+ if(Objects.isNull(ztCustomerBindingUsersRequest)
+ || StringUtils.isBlank(ztCustomerBindingUsersRequest.getOpenId())
+ || StringUtils.isBlank(ztCustomerBindingUsersRequest.getUserId())
+ || StringUtils.isBlank(ztCustomerBindingUsersRequest.getSourceCustomerId())
+ || StringUtils.isBlank(ztCustomerBindingUsersRequest.getDaoGouAccount())
+ || StringUtils.isBlank(ztCustomerBindingUsersRequest.getDaoGouType())
+ || StringUtils.isBlank(ztCustomerBindingUsersRequest.getDaoGouUserId())
+ || StringUtils.isBlank(ztCustomerBindingUsersRequest.getUserName())
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ //鏌ヨ 涓彴
+ ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,
+ Long.valueOf(ztCustomerBindingUsersRequest.getUserId()),ztCustomerBindingUsersRequest.getUserType());
+ ztCustomerBindingUsersRequest.setToken(ztBaseInfoResponse.getToken());
+ zbomZhongTaiService.customerBinDingUsers(ztCustomerBindingUsersRequest);
+ }
}
--
Gitblit v1.9.3