From 7cd9b440cb4f6f3df0272e38d9cd3ada56c0cdb3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 二月 2019 12:14:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/GoodsController.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/GoodsController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/GoodsController.java
index cd35db8..0286b5a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/GoodsController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/GoodsController.java
@@ -75,6 +75,8 @@
boolean isNative = false;
String pid = null;
+ boolean specialConvert = false;
+
String specialId = null;
// 鏌ヨ鐢ㄦ埛ID鏄惁缁戝畾浜嗕細鍛樿繍钀D
UserExtraTaoBaoInfo userInfo = userExtraTaoBaoInfoService.getByUid(uid);
@@ -86,6 +88,7 @@
TaoBaoGoodsBrief goods = TaoKeApiUtil.getSimpleGoodsInfo(auctionId);
if (goods.getMaterialLibType() != null && goods.getMaterialLibType() == 1) {
isNative = true;
+ specialConvert = true;
} else
isNative = false;
} catch (TaobaoGoodsDownException e) {
@@ -106,10 +109,18 @@
pidType = PidUser.TYPE_FANLI_IOS;
TaoBaoLink taoBaoLink = null;
- if (!StringUtil.isNullOrEmpty(specialId)) {
+ if (!StringUtil.isNullOrEmpty(specialId) && specialConvert) {
taoBaoLink = shareGoodsService.getTaoBaoLinkForBuyWithSpecial(uid, specialId, auctionId);
} else {
- taoBaoLink = shareGoodsService.getTaoBaoLinkForBuy(uid, auctionId, pidType);
+ if (!specialConvert && !isNative) {
+ if (pidType == PidUser.TYPE_FANLI_ANDROID)
+ taoBaoLink = shareGoodsService.getTaoBaoLink(uid, auctionId,
+ tbPidService.getAndroidDefault().getPid());
+ else
+ taoBaoLink = shareGoodsService.getTaoBaoLink(uid, auctionId,
+ tbPidService.getIOSDefault().getPid());
+ } else
+ taoBaoLink = shareGoodsService.getTaoBaoLinkForBuy(uid, auctionId, pidType);
}
JSONObject link = new JSONObject();
--
Gitblit v1.8.0