From 15f831b6e153cedea957bd08802380759a234c6a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 08 十一月 2019 18:57:51 +0800
Subject: [PATCH] MQ日志调整
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 361f86b..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,8 +1074,9 @@
}
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()));
// 娴嬭瘯
@@ -1084,9 +1086,8 @@
commentTexts.add("鍙ｄ护3");
commentTexts.add("鍙ｄ护鍙ｄ护娣樺彛浠ゅ彛浠ゅ彛浠ゆ窐鍙ｄ护鍙ｄ护鍙ｄ护娣樺彛浠ゅ彛浠ゅ彛浠ゆ窐鍙ｄ护鍙ｄ护鍙ｄ护娣樺彛浠ゅ彛浠ゅ彛浠ゆ窐鍙ｄ护");
data.put("commentTexts", commentTexts);
- data.put("wxErCode", "杩欐槸寰俊鍒嗕韩浜岀淮鐮佸唴瀹�");
-
-
+ data.put("wxErCode", ShareControllerV2.getERCodeContent(goods, taoBaoLink.getTaoToken()));
+
}
} else if (cid == 4) { // 閭�璇峰垎浜�
--
Gitblit v1.8.0