From bbb7a538df960f2f47b0af8c3db03622fca08d99 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 22 五月 2020 13:54:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/goods/ScanHistoryV2Service.java |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/ScanHistoryV2Service.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/ScanHistoryV2Service.java
index 96dbdf3..50a4784 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/ScanHistoryV2Service.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/ScanHistoryV2Service.java
@@ -3,6 +3,7 @@
 import java.util.List;
 
 import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
+import com.yeshi.fanli.dto.vip.goods.VIPGoodsInfo;
 import com.yeshi.fanli.entity.goods.ScanHistoryV2;
 import com.yeshi.fanli.entity.jd.JDGoods;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
@@ -55,7 +56,7 @@
 	 * @param uid
 	 * @param device
 	 */
-	public void deleteByDeviceOrUid(Long uid, String device, Integer goodsType);
+	public void deleteByDeviceOrUid(Long uid, String device);
 
 	/**
 	 * 鏍规嵁鐢ㄦ埛鎴栬�呰澶囧拰娣樺疂鍟嗗搧ID鍒犻櫎娴忚璁板綍
@@ -86,6 +87,22 @@
 	 */
 	public void addPDDScanHistory(Long uid, String device, PDDGoodsDetail pddGoods)
 			throws CommonGoodsException, ScanHistoryException;
+	
+	
+	/**
+	 * 鍞搧浼氭祻瑙堣褰�
+	 * @Title: addVIPScanHistory
+	 * @Description: 
+	 * @param uid
+	 * @param device
+	 * @param pddGoods
+	 * @throws CommonGoodsException
+	 * @throws ScanHistoryException 
+	 * void 杩斿洖绫诲瀷
+	 * @throws
+	 */
+	public void addVIPScanHistory(Long uid, String device, VIPGoodsInfo pddGoods)
+			throws CommonGoodsException, ScanHistoryException;
 
 	/**
 	 * 鏍规嵁绠�鐗堝晢鍝両D鍒犻櫎

--
Gitblit v1.8.0