From 07cc9760a199375f82522c22423bfc375831cdd1 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 28 一月 2019 10:55:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/GoodsController.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 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 c17c6f4..9666c7a 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
@@ -74,12 +74,13 @@
JSONObject data = new JSONObject();
boolean isNative = false;
String pid = null;
-
+ String specialId = null;
// 鏌ヨ鐢ㄦ埛ID鏄惁缁戝畾浜嗕細鍛樿繍钀D
UserExtraTaoBaoInfo userInfo = userExtraTaoBaoInfoService.getByUid(uid);
if (userInfo != null && !StringUtil.isNullOrEmpty(userInfo.getSpecialId()) && userInfo.getSpecialValid() != null
&& userInfo.getSpecialValid() == true) {
+ specialId = userInfo.getSpecialId();
// 宸茬粡缁戝畾
try {
TaoBaoGoodsBrief goods = TaoKeApiUtil.getSimpleGoodsInfo(auctionId);
@@ -97,16 +98,19 @@
} else {// 灏氭湭缁戝畾
isNative = true;
}
-
- data.put("native", isNative);
-
try {
int pidType = PidUser.TYPE_FANLI_ANDROID;
if (acceptData.getPlatform().equalsIgnoreCase("ios"))
pidType = PidUser.TYPE_FANLI_IOS;
-
- TaoBaoLink taoBaoLink = shareGoodsService.getTaoBaoLinkForBuy(uid, auctionId, pidType);
+
+ TaoBaoLink taoBaoLink = null;
+ if (!StringUtil.isNullOrEmpty(specialId)) {
+ taoBaoLink = shareGoodsService.getTaoBaoLinkForBuyWithSpecial(uid, specialId, auctionId);
+ } else {
+ taoBaoLink = shareGoodsService.getTaoBaoLinkForBuy(uid, auctionId, pidType);
+ }
+
JSONObject link = new JSONObject();
link.put("clickUrl", taoBaoLink.getClickUrl());
link.put("couponUrl", taoBaoLink.getCouponLink());
@@ -115,6 +119,7 @@
out.print(JsonUtil.loadTrueResult(data));
} catch (Exception e) {
+ isNative = false;
try {
monitorService.addClientAPIMonitor(MonitorFactory.createClientAPI(request, 0, 0, "璐拱娣樺疂鍟嗗搧杞摼鍑洪敊"));
} catch (Exception e1) {
@@ -140,6 +145,7 @@
out.print(JsonUtil.loadFalseResult(1, "璇锋眰澶辫触"));
}
}
+ data.put("native", isNative);
}
--
Gitblit v1.8.0