From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/service/inter/goods/ShareGoodsService.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/ShareGoodsService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/ShareGoodsService.java
index be911cb..454de33 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/ShareGoodsService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/ShareGoodsService.java
@@ -3,7 +3,9 @@
import com.yeshi.fanli.entity.bus.share.UserShareGoodsHistory;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoLink;
-import com.yeshi.fanli.exception.ShareGoodsException;
+import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;
+import com.yeshi.fanli.exception.share.ShareGoodsException;
+import com.yeshi.fanli.exception.tlj.TaoLiJinCreateException;
public interface ShareGoodsService {
@@ -118,7 +120,7 @@
* @return
* @throws ShareGoodsException
*/
- public TaoBaoLink getTaoLiJinLinkForBuy(Long uid, String specialId, Long auctionId) throws ShareGoodsException;
+ public TaoBaoLink getTaoLiJinLinkForBuy(Long uid, String specialId, Long auctionId,String pid) throws ShareGoodsException;
/**
* 娣樼ぜ閲� 閾炬帴
@@ -139,6 +141,8 @@
* @return
* @throws ShareGoodsException
*/
- public TaoBaoLink getTaoLiJinLinkForBuyWithOutFanLi(Long uid, Long auctionId) throws ShareGoodsException;
+ public TaoBaoLink getTaoLiJinLinkForBuyWithOutFanLi(Long uid, Long auctionId,TaoKeAppInfo app) throws ShareGoodsException,TaoLiJinCreateException;
+
+ public String createTaoBaoToken(Long uid, TaoBaoGoodsBrief goods);
}
--
Gitblit v1.8.0