From be67478cae6bf9308f15949a21e7d0a57a3f0ecb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 16 七月 2020 15:37:31 +0800
Subject: [PATCH] dubbo集成修改
---
fanli/src/main/java/com/yeshi/fanli/service/manger/goods/ConvertLinkManager.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/manger/goods/ConvertLinkManager.java b/fanli/src/main/java/com/yeshi/fanli/service/manger/goods/ConvertLinkManager.java
index 1f941c8..4460c17 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/manger/goods/ConvertLinkManager.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/manger/goods/ConvertLinkManager.java
@@ -16,8 +16,8 @@
import com.yeshi.fanli.dto.pdd.PDDPromotionUrl;
import com.yeshi.fanli.dto.taobao.api.TaoKeOfficialActivityConvertResultDTO;
-import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
-import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;
+import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief;
+import com.yeshi.common.entity.taobao.TaoKeAppInfo;
import com.yeshi.fanli.exception.goods.ConvertLinkExceptionException;
import com.yeshi.fanli.service.inter.taobao.TaoBaoBuyRelationMapService;
import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;
@@ -163,6 +163,7 @@
if (StringUtil.isNullOrEmpty(relationId))
throw new Exception("娣樺疂鏈巿鏉�");
}
+
Set<String> tokenSet = new HashSet<>();
tokenSet.addAll(tokenList);
Map<String, String> tokenMap = new HashMap<>();
@@ -176,7 +177,7 @@
String link = null;
if (share) {
//鏆傛椂璋冪敤濂藉崟搴揂PI
- link=HaoDanKuApiUtil.getInstance().convertLink(auctionId, TaoBaoConstant.TAOBAO_RELATION_PID_DEFAULT, null);
+ link=HaoDanKuApiUtil.getInstance().convertLink(auctionId, TaoBaoConstant.TAOBAO_RELATION_PID_DEFAULT, null,null,relationId);
// TaoBaoGoodsBrief goods = TaoKeApiUtil.specialConvertCoupon(auctionId,
// new TaoKeAppInfo(TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET,
// TaoBaoConstant.TAOBAO_RELATION_PID_DEFAULT));
@@ -191,11 +192,14 @@
throw new Exception("鍟嗗搧杞摼澶辫触");
link += "&relationId=" + relationId;
} else {
+ String specialId=userExtraTaoBaoInfoService.getSpecialIdByUid(uid);
+
+
if (simpleGoods.getMaterialLibType() != null && simpleGoods.getMaterialLibType() == 1) {
TaoBaoGoodsBrief goods = TaoKeApiUtil.specialConvertCoupon(auctionId,
new TaoKeAppInfo(TaoBaoConstant.TAOBAO_AUTH_APPKEY,
TaoBaoConstant.TAOBAO_AUTH_APPSECRET,
- TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT));
+ TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT),specialId,null);
if (goods == null)
throw new Exception("鍟嗗搧杞摼澶辫触");
@@ -209,7 +213,7 @@
TaoBaoGoodsBrief goods = TaoKeApiUtil.specialConvertCoupon(auctionId,
new TaoKeAppInfo(TaoBaoConstant.TAOBAO_AUTH_APPKEY,
TaoBaoConstant.TAOBAO_AUTH_APPSECRET,
- TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID));
+ TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID),specialId,null);
if (goods == null)
throw new Exception("鍟嗗搧杞摼澶辫触");
--
Gitblit v1.8.0