From 686f53edd64c21516001942d0265a55fefd1be15 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期三, 31 七月 2024 19:23:33 +0800 Subject: [PATCH] 代码提交 --- server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java | 70 +++++++++++++++++++++++++--------- 1 files changed, 51 insertions(+), 19 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..0144d88 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,10 +287,15 @@ 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(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()); + } + if(Objects.nonNull(users)&&Objects.nonNull(member)&&StringUtils.isNotBlank(member.getOpenid())){ + MemberServiceImpl.saveCustomerUser(zbomZhongTaiService,customerUserMapper,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())){ @@ -338,16 +343,16 @@ 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(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()); + } + if(Objects.nonNull(users)&&Objects.nonNull(member)&&StringUtils.isNotBlank(member.getOpenid())){ + MemberServiceImpl.saveCustomerUser(zbomZhongTaiService,customerUserMapper,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())){ @@ -390,10 +395,15 @@ 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(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()); + } + if(Objects.nonNull(users)&&Objects.nonNull(member)&&StringUtils.isNotBlank(member.getOpenid())){ + MemberServiceImpl.saveCustomerUser(zbomZhongTaiService,customerUserMapper,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())){ @@ -441,10 +451,15 @@ 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())){ + 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()); + } + MemberServiceImpl.saveCustomerUser(zbomZhongTaiService,customerUserMapper,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())){ @@ -502,6 +517,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