From 46a9e2d5bb4563b3a8194b7655ffcf4af5f6e19f Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 30 五月 2019 09:41:51 +0800
Subject: [PATCH] 动态时间修正
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java | 54 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 40 insertions(+), 14 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java
index 0aef1df..55ea116 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java
@@ -21,6 +21,7 @@
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.goods.ShareGoodsService;
+import com.yeshi.fanli.service.inter.monitor.BusinessEmergent110Service;
import com.yeshi.fanli.service.inter.monitor.MonitorService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoBuyRelationMapService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
@@ -59,6 +60,9 @@
@Resource
private TaoBaoBuyRelationMapService taoBaoBuyRelationMapService;
+
+ @Resource
+ private BusinessEmergent110Service businessEmergent110Service;
/**
* 鑾峰彇娣樺疂鐨勫垎浜摼鎺�
@@ -70,7 +74,7 @@
* @param out
*/
@RequestMapping(value = "gettaobaolink")
- public void getTaoBaoLink(AcceptData acceptData, Long uid, Long auctionId,String from, HttpServletRequest request,
+ public void getTaoBaoLink(AcceptData acceptData, Long uid, Long auctionId, String from, HttpServletRequest request,
PrintWriter out) {
if (uid == null || uid <= 0) {
out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛ID涓嶈兘涓虹┖"));
@@ -140,7 +144,6 @@
if (acceptData.getPlatform().equalsIgnoreCase("ios"))
pidType = PidUser.TYPE_FANLI_IOS;
try {
-
TaoBaoLink taoBaoLink = null;
// 鏄繑鍒╁晢鍝佸簱鐨勫晢鍝�
if (specialConvert) {
@@ -155,10 +158,10 @@
else
taoBaoLink = shareGoodsService.getTaoBaoLink(uid, auctionId,
tbPidService.getIOSDefault().getPid());
-
+
} else
taoBaoLink = shareGoodsService.getTaoBaoLinkForBuy(uid, auctionId, pidType);
- LogHelper.test("璐拱杞摼:榛樿PID杞摼-"+uid+"锛�"+auctionId);
+ LogHelper.test("璐拱杞摼:榛樿PID杞摼-" + uid + "锛�" + auctionId);
}
} else {// 涓嶆槸杩斿埄搴撶殑鍟嗗搧锛岀敤鐗规畩PID鏇夸唬
try {
@@ -177,8 +180,8 @@
else
taoBaoLink = shareGoodsService.getTaoBaoLink(uid, auctionId,
tbPidService.getIOSDefault().getPid());
-
- LogHelper.test("璐拱杞摼:榛樿PID杞摼-闈炶繑鍒╁簱鍟嗗搧-"+uid+"锛�"+auctionId);
+
+ LogHelper.test("璐拱杞摼:榛樿PID杞摼-闈炶繑鍒╁簱鍟嗗搧-" + uid + "锛�" + auctionId);
}
}
JSONObject link = new JSONObject();
@@ -202,22 +205,45 @@
} else {
tbPid = tbPidService.getTBPid(uid, PidUser.TYPE_FANLI_IOS);
}
-
- LogHelper.test("璐拱杞摼:榛樿PID杞摼-寮傚父鍟嗗搧-"+uid+"锛�"+auctionId);
+
+ LogHelper.test("璐拱杞摼:榛樿PID杞摼-寮傚父鍟嗗搧-" + uid + "锛�" + auctionId);
data.put("native", isNative);
if (tbPid != null) {
- String siteId = tbPid.getPid().split("_")[2];
- String adzoneId = tbPid.getPid().split("_")[3];
- TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);
- ClientTBPid clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);
- data.put("type", 2);
- data.put("tbPidInfo", clientTBPid);
+
+ try {
+ TaoBaoLink taoBaoLink = null;
+ if (pidType == PidUser.TYPE_FANLI_ANDROID)
+ taoBaoLink = shareGoodsService.getTaoBaoLink(uid, auctionId,
+ tbPidService.getAndroidDefault().getPid());
+ else
+ taoBaoLink = shareGoodsService.getTaoBaoLink(uid, auctionId,
+ tbPidService.getIOSDefault().getPid());
+
+ JSONObject link = new JSONObject();
+ link.put("clickUrl", taoBaoLink.getClickUrl());
+ link.put("couponUrl", taoBaoLink.getCouponLink());
+ data.put("type", 1);
+ data.put("link", link);
+ data.put("native", true);
+
+ } catch (Exception e1) {
+ String siteId = tbPid.getPid().split("_")[2];
+ String adzoneId = tbPid.getPid().split("_")[3];
+ TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);
+ ClientTBPid clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);
+ data.put("type", 2);
+ data.put("tbPidInfo", clientTBPid);
+ data.put("native", true);
+ }
+
out.print(JsonUtil.loadTrueResult(data));
} else {
out.print(JsonUtil.loadFalseResult(1, "璇锋眰澶辫触"));
}
+
+ businessEmergent110Service.buyTaoBaoGoodsError(StringUtil.Md5(auctionId + ""));
}
}
--
Gitblit v1.8.0