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/service/impl/goods/ShareGoodsServiceImpl.java | 35 ++++++++++++++++++++++++++++++-----
1 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsServiceImpl.java
index c43d107..f474455 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsServiceImpl.java
@@ -458,15 +458,32 @@
if (tbPid == null) {
throw new ShareGoodsException(3, "鑾峰彇鎺ㄥ箍浣嶅け璐�");
}
- String appId = tbPid.getPid().split("_")[2];
- String adzoneId = tbPid.getPid().split("_")[3];
+ return getTaoBaoLink(uid, auctionId, tbPid.getPid());
+ }
+
+ public TaoBaoLink getTaoBaoLink(Long uid, Long auctionId, String pid) throws ShareGoodsException {
+
+ if (uid == null || uid <= 0) {
+ throw new ShareGoodsException(1, "鐢ㄦ埛ID涓嶈兘涓虹┖");
+ }
+
+ if (auctionId == null || auctionId <= 0) {
+ throw new ShareGoodsException(2, "鍟嗗搧ID涓嶈兘涓虹┖");
+ }
+
+ if (StringUtil.isNullOrEmpty(pid)) {
+ throw new ShareGoodsException(3, "鏃犳帹骞夸綅");
+ }
+
+ String appId = pid.split("_")[2];
+ String adzoneId = pid.split("_")[3];
TaoBaoUnionConfig taoBaoUnionConfig = taoBaoUnionConfigService.getConfigByAppIdCache(appId);
TaoKeAppInfo info = new TaoKeAppInfo();
info.setAdzoneId(adzoneId);
info.setAppKey(taoBaoUnionConfig.getAppKey());
info.setAppSecret(taoBaoUnionConfig.getAppSecret());
- info.setPid(tbPid.getPid());
+ info.setPid(pid);
TaoBaoGoodsBrief goods = null;
try {
goods = TaoKeApiUtil.searchGoodsDetailForConvert(auctionId, info);
@@ -479,7 +496,7 @@
}
if (StringUtil.isNullOrEmpty(goods.getCouponLink()) && !goods.getAuctionUrl().contains("s.click.taobao.com")) {
- TaoBaoLink taoBaoLink = TaoBaoUtil.getTbLinkForShare(auctionId, tbPid.getPid(), taoBaoUnionConfig);
+ TaoBaoLink taoBaoLink = TaoBaoUtil.getTbLinkForShare(auctionId, pid, taoBaoUnionConfig);
if (taoBaoLink == null) {
throw new ShareGoodsException(201, "鍟嗗搧杞摼澶辫触");
}
@@ -498,7 +515,15 @@
@Override
public TaoBaoLink getTaoBaoLinkForBuyWithSpecial(Long uid, String specialId, Long auctionId)
throws ShareGoodsException {
- return null;
+ if (uid == null || uid <= 0) {
+ throw new ShareGoodsException(1, "鐢ㄦ埛ID涓嶈兘涓虹┖");
+ }
+
+ if (auctionId == null || auctionId <= 0) {
+ throw new ShareGoodsException(2, "鍟嗗搧ID涓嶈兘涓虹┖");
+ }
+
+ return getTaoBaoLink(uid, auctionId, Constant.TAOBAO_SPECIAL_PID_DEFAULT);
}
}
--
Gitblit v1.8.0