From 0d4ff0b2396e202a028a6f952b088d19b5545550 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期四, 25 七月 2024 17:13:47 +0800 Subject: [PATCH] 代码提交 --- server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java | 99 +++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 79 insertions(+), 20 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..10cdaf7 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,19 @@ ztContentListRequest.setId(id); ZTProductInfoResponse response = zbomZhongTaiService.getProductInfo(ztContentListRequest); if(Objects.nonNull(response)){ + //鏌ヨ瀵艰喘淇℃伅 杩涜淇℃伅缁戝畾涓庤繑鍥� + if(StringUtils.isNotBlank(salesId)){ + Users users = usersMapper.selectById(salesId); + if(Objects.nonNull(users)){ + MemberServiceImpl.saveCustomerUser(customerUserMapper,users,userId); + 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 +329,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 +337,45 @@ 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)){ + //鏌ヨ瀵艰喘淇℃伅 杩涜淇℃伅缁戝畾涓庤繑鍥� + if(StringUtils.isNotBlank(salesId)){ + Users users = usersMapper.selectById(salesId); + if(Objects.nonNull(users)){ + MemberServiceImpl.saveCustomerUser(customerUserMapper,users,userId); + 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(); @@ -351,6 +384,19 @@ ztContentListRequest.setId(id); ZTProductNewsInfoResponse response = zbomZhongTaiService.getProductNewsInfo(ztContentListRequest); if(Objects.nonNull(response)){ + //鏌ヨ瀵艰喘淇℃伅 杩涜淇℃伅缁戝畾涓庤繑鍥� + if(StringUtils.isNotBlank(salesId)){ + Users users = usersMapper.selectById(salesId); + if(Objects.nonNull(users)){ + MemberServiceImpl.saveCustomerUser(customerUserMapper,users,userId); + 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 +426,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 +435,19 @@ ztContentListRequest.setId(id); ZTRealcaseInfoResponse response = zbomZhongTaiService.getRealcaseInfo(ztContentListRequest); if(Objects.nonNull(response)){ + //鏌ヨ瀵艰喘淇℃伅 杩涜淇℃伅缁戝畾涓庤繑鍥� + if(StringUtils.isNotBlank(salesId)){ + Users users = usersMapper.selectById(salesId); + if(Objects.nonNull(users)){ + MemberServiceImpl.saveCustomerUser(customerUserMapper,users,userId); + 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()); -- Gitblit v1.9.3