直接上级不返回上级昵称

yujian

2020-05-17 8310380a7adbe8fd6ab8e1361fd808b7647ad8f9

直接上级不返回上级昵称

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java

@@ -1105,8 +1105,16 @@
            return;

        }



        // 上级

        UserInfo boss = userInfoService.selectByPKey(threeSale.getBoss().getId());

        // 非直接邀请关系

        String bossNickName = null;

        if (uid.longValue() != threeSale.getBoss().getId().longValue()) {

            UserInfo boss = userInfoService.selectByPKey(threeSale.getBoss().getId());

            if (boss != null) {

                bossNickName = boss.getNickName();

            }

        }

		
		
        

        JSONArray tagArray = new JSONArray();

        String memoName = user.getNickName();

@@ -1124,7 +1132,7 @@
            }

        }



        data.put("bossNickName", boss.getNickName());

        data.put("bossNickName", bossNickName);

        data.put("nickName", user.getNickName());

        data.put("phone", phone);

        data.put("phoneCopy", phoneCopy);


 fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushGoodsServiceImpl.java

@@ -233,8 +233,10 @@
            List<ImgInfo> imgList = goodsEvaluate.getImgList();

            if (imgList != null && imgList.size() > 0) {

                for (ImgInfo imgInfo: imgList) {

                    if (imgInfo.getType() == ImgEnum.img && !StringUtil.isNullOrEmpty(imgInfo.getUrl())) {

                    if (!StringUtil.isNullOrEmpty(imgInfo.getUrl())  && StringUtil.isNullOrEmpty(picUrl)

                            && (imgInfo.getType() == ImgEnum.img || imgInfo.getType() == ImgEnum.activity)) {

                        picUrl = imgInfo.getUrl();

                        break;

                    }

                }

            }