From 511983beb4ecf452f821fd85be497710959cb4cd Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 25 六月 2019 11:04:42 +0800
Subject: [PATCH] 调整淘礼金
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java | 195 +-----------------------------------------------
1 files changed, 4 insertions(+), 191 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 c6f232f..89652a9 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
@@ -153,199 +153,11 @@
// 鏄繑鍒╁晢鍝佸簱鐨勫晢鍝�
if (specialConvert) {
if (!StringUtil.isNullOrEmpty(specialId)) {
- taoBaoLink = shareGoodsService.getTaoBaoLinkForBuyWithSpecial(uid, specialId, auctionId);
- data.put("native", true);
- } else {
- 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);
- LogHelper.test("璐拱杞摼:榛樿PID杞摼-" + uid + "锛�" + auctionId);
- }
- } else {// 涓嶆槸杩斿埄搴撶殑鍟嗗搧锛岀敤鐗规畩PID鏇夸唬
- try {
- relationId = taoBaoBuyRelationMapService.getRelationId(uid);
- } catch (Exception e) {
- LogHelper.errorDetailInfo(e, "uid:" + uid, null);
- }
- if (!StringUtil.isNullOrEmpty(relationId)) {//
- taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(uid, auctionId, relationId,
- TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID);
- data.put("native", true);
- } else {
- if (pidType == PidUser.TYPE_FANLI_ANDROID)
- taoBaoLink = shareGoodsService.getTaoBaoLink(uid, auctionId,
- tbPidService.getAndroidDefault().getPid());
- else
- taoBaoLink = shareGoodsService.getTaoBaoLink(uid, auctionId,
- tbPidService.getIOSDefault().getPid());
-
- LogHelper.test("璐拱杞摼:榛樿PID杞摼-闈炶繑鍒╁簱鍟嗗搧-" + uid + "锛�" + auctionId);
- }
- }
- JSONObject link = new JSONObject();
- link.put("clickUrl", taoBaoLink.getClickUrl());
- link.put("couponUrl", taoBaoLink.getCouponLink());
- data.put("type", 1);
- data.put("link", link);
- out.print(JsonUtil.loadTrueResult(data));
-
- } catch (Exception e) {
- isNative = false;
- try {
- monitorService.addClientAPIMonitor(MonitorFactory.createClientAPI(request, 0, 0, "璐拱娣樺疂鍟嗗搧杞摼鍑洪敊"));
- } catch (Exception e1) {
- e1.printStackTrace();
- }
-
- TBPid tbPid = null;
- if (acceptData.getPlatform().equalsIgnoreCase("android")) {
- tbPid = tbPidService.getTBPid(uid, PidUser.TYPE_FANLI_ANDROID);
- } else {
- tbPid = tbPidService.getTBPid(uid, PidUser.TYPE_FANLI_IOS);
- }
-
- LogHelper.test("璐拱杞摼:榛樿PID杞摼-寮傚父鍟嗗搧-" + uid + "锛�" + auctionId);
-
- data.put("native", isNative);
-
- if (tbPid != null) {
-
- 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 + ""));
- }
-
- }
-
-
-
- /**
- * 鑾峰彇娣樺疂鐨勫垎浜摼鎺� 锛堟窐绀奸噾鏂板缓锛�
- *
- * @param acceptData
- * @param uid
- * -鐢ㄦ埛ID
- * @param auctionId-鍟嗗搧ID
- * @param out
- */
- @RequestMapping(value = "getTaoBaoGoodsLink")
- public void getTaoBaoGoodsLink(AcceptData acceptData, Long uid, Long auctionId, String from, HttpServletRequest request,
- PrintWriter out) {
- if (uid == null || uid <= 0) {
- out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛ID涓嶈兘涓虹┖"));
- return;
- }
-
- UserInfo user = userInfoService.getUserByIdWithMybatis(uid);
- if (user != null && user.getState() != UserInfo.STATE_NORMAL) {
- out.print(JsonUtil.loadFalseResult(Constant.CODE_FORBIDDEN_USER, Constant.FORBIDDEN_USER_REASON_DESC));
- return;
- }
-
- if (auctionId == null || auctionId <= 0) {
- out.print(JsonUtil.loadFalseResult(2, "鍟嗗搧ID涓嶈兘涓虹┖"));
- return;
- }
-
- TaoBaoGoodsBrief goods = null;
-
- try {
- goods = TaoKeApiUtil.getSimpleGoodsInfo(auctionId);
- } catch (TaobaoGoodsDownException e) {
- out.print(JsonUtil.loadFalseResult(3, "鍟嗗搧宸蹭笅鏋�"));
- return;
- } catch (Exception e) {
- try {
- LogHelper.errorDetailInfo(e, "鑾峰彇鍟嗗搧绠�鐗堣鎯呭嚭閿�", auctionId + "");
- } catch (Exception e1) {
- e1.printStackTrace();
- }
- }
-
- JSONObject data = new JSONObject();
- boolean isNative = false;
- String pid = null;
-
- boolean specialConvert = false;
-
- if (goods.getMaterialLibType() != null && goods.getMaterialLibType() == 1) {
- specialConvert = true;
- } else
- specialConvert = false;
-
- String specialId = null;
- String relationId = null;
- // 鏌ヨ鐢ㄦ埛ID鏄惁缁戝畾浜嗕細鍛樿繍钀D
- UserExtraTaoBaoInfo userInfo = userExtraTaoBaoInfoService.getByUid(uid);
- if (userInfo != null && !StringUtil.isNullOrEmpty(userInfo.getSpecialId()) && userInfo.getSpecialValid() != null
- && userInfo.getSpecialValid() == true) {
- specialId = userInfo.getSpecialId();
- relationId = userInfo.getRelationId();
- // 宸茬粡缁戝畾
- if (specialConvert) {
- isNative = true;
- } else
- isNative = false;
-
- pid = TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT;
-
- } else {// 灏氭湭缁戝畾
- isNative = true;
- }
-
- data.put("native", isNative);
-
- int pidType = PidUser.TYPE_FANLI_ANDROID;
- if (acceptData.getPlatform().equalsIgnoreCase("ios"))
- pidType = PidUser.TYPE_FANLI_IOS;
- try {
- TaoBaoLink taoBaoLink = null;
- // 鏄繑鍒╁晢鍝佸簱鐨勫晢鍝�
- if (specialConvert) {
- if (!StringUtil.isNullOrEmpty(specialId)) {
-
- if (from != null && from.equals("taolijin")) {
+ if (source != null && "taolijin".equals(source)) {
taoBaoLink = shareGoodsService.getTaoLiJinLinkForBuy(uid, specialId, auctionId);
} else {
taoBaoLink = shareGoodsService.getTaoBaoLinkForBuyWithSpecial(uid, specialId, auctionId);
}
-
data.put("native", true);
} else {
if (!specialConvert && !isNative) {
@@ -442,8 +254,9 @@
businessEmergent110Service.buyTaoBaoGoodsError(StringUtil.Md5(auctionId + ""));
}
-
- }
+ }
+
+
/**
--
Gitblit v1.8.0