From 35c25585cf6fea9e29574a75a03c57381cbe19e1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 05 八月 2019 16:35:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/pinduoduo/PinDuoDuoApiUtil.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/pinduoduo/PinDuoDuoApiUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/pinduoduo/PinDuoDuoApiUtil.java
index 5f5d0e5..f4d73c2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/pinduoduo/PinDuoDuoApiUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/pinduoduo/PinDuoDuoApiUtil.java
@@ -22,6 +22,7 @@
import com.yeshi.fanli.dto.pdd.PDDPromotionUrl;
import com.yeshi.fanli.dto.pdd.PDDSearchFilter;
import com.yeshi.fanli.entity.pdd.PDDOrder;
+import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
@@ -280,14 +281,14 @@
}
JSONArray resultArray = json.optJSONArray("goods_promotion_url_list");
if (resultArray != null && resultArray.size() > 0) {
- Type type = new TypeToken<PDDPromotionUrl>() {}.getType();
+ Type type = new TypeToken<PDDPromotionUrl>() {
+ }.getType();
Gson gson = new GsonBuilder().disableHtmlEscaping().create();
return gson.fromJson(resultArray.optJSONObject(0).toString(), type);
}
return null;
}
-
/**
* 鍟嗗搧杞摼
*
@@ -299,11 +300,11 @@
public static String getPromotionUrl(Long goodsId, String pid, String customParams) {
PDDPromotionUrl promotion = convert(goodsId, pid, customParams);
if (promotion != null) {
- return promotion.getUrl();
+ return promotion.getShortUrl();
}
return null;
}
-
+
public static void createPid() {
Map<String, String> map = new HashMap<>();
map.put("type", "pdd.ddk.goods.pid.generate");
--
Gitblit v1.8.0