fanli-server.git

			@@ -2055,14 +2055,25 @@
			} else {
			tbShopInfo.setUserType("0");
			}

			String shopLink = tbShopInfo.getShopUrl();
			if (StringUtil.isNullOrEmpty(shopLink)) {
			tbShopInfo.setShopUrl(TaoBaoUtil.getShopLink(tbShopInfo.getUserId()));
			}
			}

			// 店铺
			if (("android".equalsIgnoreCase(acceptData.getPlatform()) && Integer.parseInt(acceptData.getVersion()) >= 40)
			\|\| ("ios".equalsIgnoreCase(acceptData.getPlatform())
			&& Integer.parseInt(acceptData.getVersion()) >= 49)) {
			TaoBaoShop shop = taoBaoShopService.getTaoBaoShop(goods.getAuctionId(), goods.getSellerId());
			if (shop != null)
			if (shop != null) {
			String shopLink = shop.getShopLink();
			if (StringUtil.isNullOrEmpty(shopLink)) {
			shop.setShopLink(TaoBaoUtil.getShopLink(shop.getId()));
			}
			goodsJson.put("shopInfo", shop);
			}
			} else {
			goodsJson.put("shopInfo", tbShopInfo);
			}

			@@ -800,10 +800,33 @@
			data.put("inviteLink", shortLink);
			data.put("inviteCode", inviteCode);
			data.put("helpLink", configService.get("invite_help_link"));
			// 邀请图片


			// 邀请背景图片
			List<GoodsPicture> imgs = dynamicInfo.getImgs();
			String imgLink = spreadUserImgService.getInviteImg(uid, imgs.get(0).getUrl(), inviteCode);
			data.put("imgLink", imgLink);
			String bgUrl = imgs.get(0).getUrl();
			// 用户信息
			UserInfo userInfo = userInfoService.selectByPKey(uid);
			String portrait = userInfo.getPortrait();
			// 画邀请图片
			if (StringUtil.isNullOrEmpty(dynamicInfo.getInviteMaterialId())) {
			String imgLink = spreadUserImgService.getInviteImg(bgUrl,uid, portrait, inviteCode);
			data.put("imgLink", imgLink);
			} else {

			String title ="";
			List<ClientTextStyleVO> listTitle = dynamicInfo.getTitle();
			if (listTitle != null && listTitle.size() > 0) {
			for (ClientTextStyleVO textStyleVO : listTitle) {
			title += textStyleVO.getContent();
			}
			}
			title = title.replace("【邀请码】", inviteCode);
			title = title.replace("【邀请链接】", UserUtil.getInviteShortLink(uid));

			String imgLink = spreadUserImgService.getInviteImgToGreet(bgUrl,uid, portrait, inviteCode, title, new Date());
			data.put("imgLink", imgLink);
			}

			// 邀请规则
			BusinessSystem system = new BusinessSystem();
			@@ -834,5 +857,4 @@
			e.printStackTrace();
			}
			}

			}

	fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java	30 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史