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 | 151 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 127 insertions(+), 24 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 8c91401..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
@@ -10,10 +10,12 @@
import com.doumee.core.exception.BusinessException;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
+import com.doumee.dao.business.CustomerUserMapper;
import com.doumee.dao.business.IamInterfaceLogMapper;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.UsersMapper;
import com.doumee.dao.business.model.Member;
+import com.doumee.dao.business.model.Users;
import com.doumee.dao.web.response.ZSZXCatalogResponse;
import com.doumee.dao.web.response.ZTBaseInfoResponse;
import com.doumee.service.business.GetZhongTaiDataService;
@@ -48,6 +50,9 @@
@Autowired
private SystemDictDataBiz systemDictDataBiz;
+
+ @Autowired
+ private CustomerUserMapper customerUserMapper;
@Autowired
private RedisTemplate<String, Object> redisTemplate;
@@ -272,7 +277,7 @@
@Override
- public ZTProductInfoResponse getProductInfo(String id,String userType,Long userId){
+ public ZTProductInfoResponse getProductInfo(String id,String userType,Long userId,String salesId){
//鏌ヨ 涓彴 TOKEN
ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,userId,userType);
ZTContentInfoRequest ztContentListRequest = new ZTContentInfoRequest();
@@ -281,6 +286,26 @@
ztContentListRequest.setId(id);
ZTProductInfoResponse response = zbomZhongTaiService.getProductInfo(ztContentListRequest);
if(Objects.nonNull(response)){
+ //鏌ヨ瀵艰喘淇℃伅 杩涜淇℃伅缁戝畾涓庤繑鍥�
+ if(StringUtils.isNotBlank(salesId)&&userType.equals(ZTConstants.CUSTOMER)){
+ Users users = usersMapper.selectById(salesId);
+ 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>();
if (StringUtils.isNotBlank(response.getCoverImage())) {
stringList.add(response.getCoverImage());
@@ -311,7 +336,7 @@
}
@Override
- public ZTCaseInfoResponse getWholecaseInfo(String id,String userType,Long userId){
+ public ZTCaseInfoResponse getWholecaseInfo(String id,String userType,Long userId,String salesId){
//鏌ヨ 涓彴 TOKEN
ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,userId,userType);
ZTContentInfoRequest ztContentListRequest = new ZTContentInfoRequest();
@@ -319,30 +344,51 @@
ztContentListRequest.setUserType(ztBaseInfoResponse.getUserType());
ztContentListRequest.setId(id);
ZTCaseInfoResponse response = zbomZhongTaiService.getWholecaseInfo(ztContentListRequest);
- List<String> stringList = new ArrayList<String>();
- if (StringUtils.isNotBlank(response.getCoverImage())) {
- stringList.add(response.getCoverImage());
- }
- if(Objects.nonNull(response.getLayoutUlr())){
- stringList.add(response.getLayoutUlr());
- }
- APISpaceCaseVo[] apiSpaceCaseVoList = response.getApiSpaceCaseVos();
- if(Objects.nonNull(apiSpaceCaseVoList)){
- for (APISpaceCaseVo apiSpaceCaseVo:apiSpaceCaseVoList) {
- if(StringUtils.isNotBlank(apiSpaceCaseVo.getCoverImage())){
- stringList.add(apiSpaceCaseVo.getCoverImage());
+ if(Objects.nonNull(response)){
+ //鏌ヨ瀵艰喘淇℃伅 杩涜淇℃伅缁戝畾涓庤繑鍥�
+ if(StringUtils.isNotBlank(salesId)&&userType.equals(ZTConstants.CUSTOMER)){
+ Users users = usersMapper.selectById(salesId);
+ 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(Objects.nonNull(apiSpaceCaseVo.getImgList())){
- stringList.addAll(Arrays.asList(apiSpaceCaseVo.getImgList()));
+ 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>();
+ if (StringUtils.isNotBlank(response.getCoverImage())) {
+ stringList.add(response.getCoverImage());
+ }
+ if(Objects.nonNull(response.getLayoutUlr())){
+ stringList.add(response.getLayoutUlr());
+ }
+ APISpaceCaseVo[] apiSpaceCaseVoList = response.getApiSpaceCaseVos();
+ if(Objects.nonNull(apiSpaceCaseVoList)){
+ for (APISpaceCaseVo apiSpaceCaseVo:apiSpaceCaseVoList) {
+ if(StringUtils.isNotBlank(apiSpaceCaseVo.getCoverImage())){
+ stringList.add(apiSpaceCaseVo.getCoverImage());
+ }
+ if(Objects.nonNull(apiSpaceCaseVo.getImgList())){
+ stringList.addAll(Arrays.asList(apiSpaceCaseVo.getImgList()));
+ }
+ }
+ }
+ response.setImageurlList(stringList);
}
- response.setImageurlList(stringList);
return response;
}
@Override
- public ZTProductNewsInfoResponse getProductNewsInfo(String id,String userType,Long userId){
+ public ZTProductNewsInfoResponse getProductNewsInfo(String id,String userType,Long userId,String salesId){
//鏌ヨ 涓彴 TOKEN
ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,userId,userType);
ZTContentInfoRequest ztContentListRequest = new ZTContentInfoRequest();
@@ -351,6 +397,25 @@
ztContentListRequest.setId(id);
ZTProductNewsInfoResponse response = zbomZhongTaiService.getProductNewsInfo(ztContentListRequest);
if(Objects.nonNull(response)){
+ //鏌ヨ瀵艰喘淇℃伅 杩涜淇℃伅缁戝畾涓庤繑鍥�
+ if(StringUtils.isNotBlank(salesId)&&userType.equals(ZTConstants.CUSTOMER)){
+ Users users = usersMapper.selectById(salesId);
+ 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>();
if (StringUtils.isNotBlank(response.getCoverImage())) {
stringList.add(response.getCoverImage());
@@ -380,7 +445,7 @@
}
@Override
- public ZTRealcaseInfoResponse getRealcaseInfo(String id,String userType,Long userId){
+ public ZTRealcaseInfoResponse getRealcaseInfo(String id,String userType,Long userId,String salesId){
//鏌ヨ 涓彴 TOKEN
ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,userId,userType);
ZTContentInfoRequest ztContentListRequest = new ZTContentInfoRequest();
@@ -389,6 +454,25 @@
ztContentListRequest.setId(id);
ZTRealcaseInfoResponse response = zbomZhongTaiService.getRealcaseInfo(ztContentListRequest);
if(Objects.nonNull(response)){
+ //鏌ヨ瀵艰喘淇℃伅 杩涜淇℃伅缁戝畾涓庤繑鍥�
+ if(StringUtils.isNotBlank(salesId)&&userType.equals(ZTConstants.CUSTOMER)){
+ Users users = usersMapper.selectById(salesId);
+ 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>();
if (StringUtils.isNotBlank(response.getCoverImage())) {
stringList.add(response.getCoverImage());
@@ -425,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);
@@ -435,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