From 97d6be7cafd8d75582876bbe066dc9cfbd5ba372 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期六, 15 十二月 2018 16:04:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java
index c5ef4fa..3f5cc91 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java
@@ -626,7 +626,6 @@
if (filter.getEndTkRate() > 0)
map.put("end_tk_rate", filter.getEndTkRate() + "");
-
if (filter.getStartKaTkRate() > 0)
map.put("start_ka_tk_rate", filter.getStartKaTkRate() + "");
@@ -960,6 +959,11 @@
* @return
*/
public static String getTKToken(String logo, String text, String url) {
+ if (text == null)
+ return null;
+ if (text.length() < 5)
+ text = "濂借揣锛�" + text;
+
Map<String, String> map = new HashMap<>();
map.put("method", "taobao.tbk.tpwd.create");
map.put("url", url);
--
Gitblit v1.8.0