From 9a82179d24ec670ba1aefef6906b8acadf58da6e Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期六, 03 八月 2019 12:13:31 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/util/pinduoduo/PinDuoDuoApiUtil.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 c79e33c..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;
}
-
/**
* 鍟嗗搧杞摼
*
@@ -303,7 +304,7 @@
}
return null;
}
-
+
public static void createPid() {
Map<String, String> map = new HashMap<>();
map.put("type", "pdd.ddk.goods.pid.generate");
--
Gitblit v1.8.0