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 |   40 ++++++++++++++++++++++++++++------------
 1 files changed, 28 insertions(+), 12 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 6e0ed45..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
@@ -285,13 +285,17 @@
         ztContentListRequest.setUserType(ztBaseInfoResponse.getUserType());
         ztContentListRequest.setId(id);
         ZTProductInfoResponse response = zbomZhongTaiService.getProductInfo(ztContentListRequest);
-        if(Objects.nonNull(response)&&userType.equals(ZTConstants.CUSTOMER)){
+        if(Objects.nonNull(response)){
             //鏌ヨ瀵艰喘淇℃伅 杩涜淇℃伅缁戝畾涓庤繑鍥�
-            if(StringUtils.isNotBlank(salesId)){
+            if(StringUtils.isNotBlank(salesId)&&userType.equals(ZTConstants.CUSTOMER)){
                 Users users = usersMapper.selectById(salesId);
                 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,userId,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,13 +342,17 @@
         ztContentListRequest.setUserType(ztBaseInfoResponse.getUserType());
         ztContentListRequest.setId(id);
         ZTCaseInfoResponse response = zbomZhongTaiService.getWholecaseInfo(ztContentListRequest);
-        if(Objects.nonNull(response)&&userType.equals(ZTConstants.CUSTOMER)){
+        if(Objects.nonNull(response)){
             //鏌ヨ瀵艰喘淇℃伅 杩涜淇℃伅缁戝畾涓庤繑鍥�
-            if(StringUtils.isNotBlank(salesId)){
+            if(StringUtils.isNotBlank(salesId)&&userType.equals(ZTConstants.CUSTOMER)){
                 Users users = usersMapper.selectById(salesId);
                 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,userId,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())){
@@ -385,13 +393,17 @@
         ztContentListRequest.setUserType(ztBaseInfoResponse.getUserType());
         ztContentListRequest.setId(id);
         ZTProductNewsInfoResponse response = zbomZhongTaiService.getProductNewsInfo(ztContentListRequest);
-        if(Objects.nonNull(response)&&userType.equals(ZTConstants.CUSTOMER)){
+        if(Objects.nonNull(response)){
             //鏌ヨ瀵艰喘淇℃伅 杩涜淇℃伅缁戝畾涓庤繑鍥�
-            if(StringUtils.isNotBlank(salesId)){
+            if(StringUtils.isNotBlank(salesId)&&userType.equals(ZTConstants.CUSTOMER)){
                 Users users = usersMapper.selectById(salesId);
                 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,userId,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())){
@@ -437,13 +449,17 @@
         ztContentListRequest.setUserType(ztBaseInfoResponse.getUserType());
         ztContentListRequest.setId(id);
         ZTRealcaseInfoResponse response = zbomZhongTaiService.getRealcaseInfo(ztContentListRequest);
-        if(Objects.nonNull(response)&&userType.equals(ZTConstants.CUSTOMER)){
+        if(Objects.nonNull(response)){
             //鏌ヨ瀵艰喘淇℃伅 杩涜淇℃伅缁戝畾涓庤繑鍥�
-            if(StringUtils.isNotBlank(salesId)){
+            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,users,userId,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())){

--
Gitblit v1.9.3