From 221b5c8d0de3f6b17a00d543503a79c13b28ba12 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 十一月 2019 16:45:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 4c40bbc..baea60b 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
@@ -17,6 +17,7 @@
import org.yeshi.utils.JsonUtil;
import org.yeshi.utils.taobao.TbImgUtil;
+import com.fasterxml.jackson.core.util.VersionUtil;
import com.yeshi.fanli.controller.client.v2.ShareControllerV2;
import com.yeshi.fanli.dto.share.ShareGoodsRecordDTO;
import com.yeshi.fanli.entity.accept.AcceptData;
@@ -1073,10 +1074,20 @@
}
TaoBaoLink taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(uid, auctionId, relationId);
TaoBaoGoodsBrief goods = taoBaoLink.getGoods();
-
- data.put("clickUrl", ShareControllerV2.getERCodeContent(goods, taoBaoLink.getTaoToken()));
+ if (!com.yeshi.fanli.util.VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(),
+ acceptData.getVersion()))
+ data.put("clickUrl", ShareControllerV2.getERCodeContent(goods, taoBaoLink.getTaoToken()));
data.put("token", TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));
+ // 娴嬭瘯
+ List<String> commentTexts = new ArrayList<>();
+ commentTexts.add("鍙ｄ护1");
+ commentTexts.add("鍙ｄ护2鍙ｄ护鍙ｄ护娣樺彛浠ゅ彛浠ゅ彛浠ゆ窐鍙ｄ护");
+ commentTexts.add("鍙ｄ护3");
+ commentTexts.add("鍙ｄ护鍙ｄ护娣樺彛浠ゅ彛浠ゅ彛浠ゆ窐鍙ｄ护鍙ｄ护鍙ｄ护娣樺彛浠ゅ彛浠ゅ彛浠ゆ窐鍙ｄ护鍙ｄ护鍙ｄ护娣樺彛浠ゅ彛浠ゅ彛浠ゆ窐鍙ｄ护");
+ data.put("commentTexts", commentTexts);
+ data.put("wxErCode", ShareControllerV2.getERCodeContent(goods, taoBaoLink.getTaoToken()));
+
}
} else if (cid == 4) { // 閭�璇峰垎浜�
--
Gitblit v1.8.0