From d92226ce9f81c44fd0e159662d928767ce423b83 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 29 四月 2019 08:57:02 +0800
Subject: [PATCH] 淘宝用于自购的渠道ID存储
---
fanli/src/main/java/com/yeshi/fanli/controller/client/GoodsController.java | 52 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 39 insertions(+), 13 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 8db2e64..c2eb367 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
@@ -22,6 +22,7 @@
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.goods.ShareGoodsService;
import com.yeshi.fanli.service.inter.monitor.MonitorService;
+import com.yeshi.fanli.service.inter.taobao.TaoBaoBuyRelationMapService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
import com.yeshi.fanli.service.inter.user.TBPidService;
import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;
@@ -56,6 +57,9 @@
@Resource
private UserInfoService userInfoService;
+ @Resource
+ private TaoBaoBuyRelationMapService taoBaoBuyRelationMapService;
+
/**
* 鑾峰彇娣樺疂鐨勫垎浜摼鎺�
*
@@ -66,7 +70,7 @@
* @param out
*/
@RequestMapping(value = "gettaobaolink")
- public void getTaobaoShareLink(AcceptData acceptData, Long uid, Long auctionId, HttpServletRequest request,
+ public void getTaoBaoLink(AcceptData acceptData, Long uid, Long auctionId, HttpServletRequest request,
PrintWriter out) {
if (uid == null || uid <= 0) {
out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛ID涓嶈兘涓虹┖"));
@@ -111,13 +115,13 @@
specialConvert = false;
String specialId = null;
- String relationId=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();
+ relationId = userInfo.getRelationId();
// 宸茬粡缁戝畾
if (specialConvert) {
isNative = true;
@@ -131,26 +135,48 @@
}
data.put("native", isNative);
+
+ int pidType = PidUser.TYPE_FANLI_ANDROID;
+ if (acceptData.getPlatform().equalsIgnoreCase("ios"))
+ pidType = PidUser.TYPE_FANLI_IOS;
try {
- int pidType = PidUser.TYPE_FANLI_ANDROID;
- if (acceptData.getPlatform().equalsIgnoreCase("ios"))
- pidType = PidUser.TYPE_FANLI_IOS;
TaoBaoLink taoBaoLink = null;
- if (!StringUtil.isNullOrEmpty(specialId) && specialConvert) {
- taoBaoLink = shareGoodsService.getTaoBaoLinkForBuyWithSpecial(uid, specialId, auctionId);
- } else {
- if (!specialConvert && !isNative) {
+ // 鏄繑鍒╁晢鍝佸簱鐨勫晢鍝�
+ 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);
+ }
+ } 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());
- } else
- taoBaoLink = shareGoodsService.getTaoBaoLinkForBuy(uid, auctionId, pidType);
+ }
}
-
JSONObject link = new JSONObject();
link.put("clickUrl", taoBaoLink.getClickUrl());
link.put("couponUrl", taoBaoLink.getCouponLink());
--
Gitblit v1.8.0