From f7ed4e6bbe9be95d268481e66d70d90e70e07e12 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 28 一月 2019 19:45:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
index ee53c59..a0cf873 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
@@ -1694,6 +1694,7 @@
taoBaoGoods.setCouponStartFee(commonGoods.getCouponStartPrice());
taoBaoGoods.setCouponTotalCount(commonGoods.getCouponTotalCount());
taoBaoGoods.setPictUrl(commonGoods.getPicture());
+ taoBaoGoods.setPictUrlWhite(commonGoods.getPictureWhite());
taoBaoGoods.setSellerId(commonGoods.getSellerId());
taoBaoGoods.setShopTitle(commonGoods.getSellerName());
taoBaoGoods.setTitle(commonGoods.getTitle());
@@ -1715,13 +1716,14 @@
* @param uid-鐢ㄦ埛ID
* @return
*/
- public static String getTaoBaoUnionAuthUrl(String appKey, String callBackUrl, Long uid) {
+ public static String getTaoBaoUnionAuthUrl(String appKey, String callBackUrl, Long uid, String source) {
if (uid == null)
return null;
long timestamp = System.currentTimeMillis();
JSONObject json = new JSONObject();
json.put("u", uid);
json.put("t", timestamp);
+ json.put("s", source);
String url = null;
try {
url = String.format(
--
Gitblit v1.8.0