Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia

liukangdong

2024-08-07 b0a4d23b83b9cdbdee15263acdd4e7353a8286a1

 server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java

@@ -290,10 +290,6 @@
            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,memberMapper,users,member);
@@ -303,6 +299,11 @@
                        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>();
@@ -348,10 +349,6 @@
            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,memberMapper,users,member);
                    String prefix = StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.RESOURCE_PATH).getCode()) +
@@ -360,6 +357,11 @@
                        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>();
@@ -399,10 +401,6 @@
            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,memberMapper,users,member);
                    String prefix = StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.RESOURCE_PATH).getCode()) +
@@ -411,6 +409,11 @@
                        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>();
@@ -456,10 +459,6 @@
                Users users = usersMapper.selectById(salesId);
                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,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());
@@ -467,6 +466,11 @@
                        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>();