From d126b83f5d65f612ec93475b976fc5b5e2d6132a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 24 五月 2019 17:35:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java | 37 ++++++++++++++++++++++++++++++++++---
1 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java
index 2d635e1..7d1dd53 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java
@@ -30,6 +30,7 @@
import com.yeshi.fanli.entity.system.BusinessSystem;
import com.yeshi.fanli.entity.system.SystemClientParams;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
+import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
import com.yeshi.fanli.entity.taobao.TaoBaoLink;
import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;
import com.yeshi.fanli.exception.ShareGoodsException;
@@ -680,6 +681,23 @@
long cid = dynamicInfo.getClassId();
if (cid == 1 || cid == 2) { // 1 鐑攢鍗曞搧 2 鎺ㄨ崘濂借揣
+ if (cid == 1) {
+ List<GoodsPicture> imgs = dynamicInfo.getImgs();
+ GoodsPicture goodsPicture = imgs.get(0);
+ if (goodsPicture.getGoodState() == 1) {
+ out.print(JsonUtil.loadFalseResult("璇ュ晢鍝佸凡涓嬫灦"));
+ return;
+ } else {
+ TaoBaoGoodsBriefExtra goods = goodsPicture.getGoods();
+ try {
+ TaoKeApiUtil.getSimpleGoodsInfo(goods.getAuctionId());
+ } catch (TaobaoGoodsDownException e) {
+ out.print(JsonUtil.loadFalseResult("璇ュ晢鍝佸凡涓嬫灦"));
+ return;
+ }
+ }
+ }
+
// 鍒嗕韩鏂囧瓧
String title = null;
List<ClientTextStyleVO> listTitle = dynamicInfo.getTitle();
@@ -777,7 +795,10 @@
} else { // 鏈夊浘鍒嗕韩
List<GoodsPicture> imgs = dynamicInfo.getImgs();
- String bgUrl = imgs.get(0).getUrlOriginal();
+
+ GoodsPicture goodsPicture = imgs.get(0);
+ String bgUrl = goodsPicture.getUrlOriginal();
+
if (StringUtil.isNullOrEmpty(bgUrl)) {
out.print(JsonUtil.loadFalseResult("鍥剧墖璺緞涓嶅瓨鍦�"));
return;
@@ -787,8 +808,18 @@
UserInfo userInfo = userInfoService.selectByPKey(uid);
String portrait = userInfo.getPortrait();
// 鐢婚個璇峰浘鐗�
- if (StringUtil.isNullOrEmpty(dynamicInfo.getInviteMaterialId())) {
- String imgLink = spreadUserImgService.drawInviteQrCodeNew(bgUrl, uid, portrait, inviteCode);
+
+ Long activityId = dynamicInfo.getActivityId();
+ if (activityId != null) {
+ Integer pX = goodsPicture.getPx();
+ ;
+ Integer pY = goodsPicture.getPy();
+ ;
+ Integer size = goodsPicture.getSize();
+
+ String imgLink = spreadUserImgService.drawInviteQrCodeNew(bgUrl, uid, portrait, pX, pY, size,
+ inviteCode);
+
data.put("imgLink", imgLink);
} else {
String title = imgs.get(0).getTitleOriginal();
--
Gitblit v1.8.0