From c0cb31a27522f2b480d7f98784eef37c2fb75f2d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 30 七月 2024 09:10:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java | 130 +++++++++++++++++++++++++++++++++++--------
1 files changed, 105 insertions(+), 25 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..6e0ed45 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();
@@ -280,7 +285,21 @@
ztContentListRequest.setUserType(ztBaseInfoResponse.getUserType());
ztContentListRequest.setId(id);
ZTProductInfoResponse response = zbomZhongTaiService.getProductInfo(ztContentListRequest);
- if(Objects.nonNull(response)){
+ if(Objects.nonNull(response)&&userType.equals(ZTConstants.CUSTOMER)){
+ //鏌ヨ瀵艰喘淇℃伅 杩涜淇℃伅缁戝畾涓庤繑鍥�
+ if(StringUtils.isNotBlank(salesId)){
+ 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,users,userId,member.getOpenid());
+ 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);
+ }
+ }
List<String> stringList = new ArrayList<String>();
if (StringUtils.isNotBlank(response.getCoverImage())) {
stringList.add(response.getCoverImage());
@@ -311,7 +330,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 +338,46 @@
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(apiSpaceCaseVo.getImgList())){
- stringList.addAll(Arrays.asList(apiSpaceCaseVo.getImgList()));
+ if(Objects.nonNull(response)&&userType.equals(ZTConstants.CUSTOMER)){
+ //鏌ヨ瀵艰喘淇℃伅 杩涜淇℃伅缁戝畾涓庤繑鍥�
+ if(StringUtils.isNotBlank(salesId)){
+ 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,users,userId,member.getOpenid());
+ 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);
}
}
+ 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();
@@ -350,7 +385,21 @@
ztContentListRequest.setUserType(ztBaseInfoResponse.getUserType());
ztContentListRequest.setId(id);
ZTProductNewsInfoResponse response = zbomZhongTaiService.getProductNewsInfo(ztContentListRequest);
- if(Objects.nonNull(response)){
+ if(Objects.nonNull(response)&&userType.equals(ZTConstants.CUSTOMER)){
+ //鏌ヨ瀵艰喘淇℃伅 杩涜淇℃伅缁戝畾涓庤繑鍥�
+ if(StringUtils.isNotBlank(salesId)){
+ 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,users,userId,member.getOpenid());
+ 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);
+ }
+ }
List<String> stringList = new ArrayList<String>();
if (StringUtils.isNotBlank(response.getCoverImage())) {
stringList.add(response.getCoverImage());
@@ -380,7 +429,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();
@@ -388,7 +437,21 @@
ztContentListRequest.setUserType(ztBaseInfoResponse.getUserType());
ztContentListRequest.setId(id);
ZTRealcaseInfoResponse response = zbomZhongTaiService.getRealcaseInfo(ztContentListRequest);
- if(Objects.nonNull(response)){
+ if(Objects.nonNull(response)&&userType.equals(ZTConstants.CUSTOMER)){
+ //鏌ヨ瀵艰喘淇℃伅 杩涜淇℃伅缁戝畾涓庤繑鍥�
+ if(StringUtils.isNotBlank(salesId)){
+ 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,users,userId,member.getOpenid());
+ 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);
+ }
+ }
List<String> stringList = new ArrayList<String>();
if (StringUtils.isNotBlank(response.getCoverImage())) {
stringList.add(response.getCoverImage());
@@ -438,6 +501,23 @@
zbomZhongTaiService.batchAddLike(ztBatchAddListRequest);
}
-
-
+ @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