From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/goods/ScanHistoryV2Service.java |   36 ++++++++++++++++++++++++++++++++++--
 1 files changed, 34 insertions(+), 2 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 9950d91..99fa359 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
@@ -2,7 +2,9 @@
 
 import java.util.List;
 
+import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
 import com.yeshi.fanli.entity.goods.ScanHistoryV2;
+import com.yeshi.fanli.entity.jd.JDGoods;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
 import com.yeshi.fanli.exception.goods.CommonGoodsException;
 import com.yeshi.fanli.exception.goods.ScanHistoryException;
@@ -36,7 +38,8 @@
 	 * @param pageSize
 	 * @return
 	 */
-	public List<ScanHistoryV2> getScanHistoryByDeviceOrUid(Long uid, String device, int page, int pageSize);
+	public List<ScanHistoryV2> getScanHistoryByDeviceOrUid(Long uid, String device, int page, int pageSize, 
+			Integer source, boolean notBackSuVip);
 
 	/**
 	 * 鏍规嵁璁惧鎴栬�呯敤鎴稩D鑾峰彇娴忚璁板綍鏁伴噺
@@ -45,7 +48,7 @@
 	 * @param device
 	 * @return
 	 */
-	public long getCountByDeviceOrUid(Long uid, String device);
+	public long getCountByDeviceOrUid(Long uid, String device, Integer source, boolean notBackSuVip);
 
 	/**
 	 * 鏍规嵁鐢ㄦ埛鎴栬�呰澶囧垹闄ゆ祻瑙堣褰�
@@ -63,4 +66,33 @@
 	 * @param auctionId
 	 */
 	public void deleteByAuctionIdAndDeviceOrUid(Long uid, String device, Long auctionId);
+
+	/**
+	 * 娣诲姞浜笢鍟嗗搧瓒宠抗璁板綍
+	 * @param uid
+	 * @param device
+	 * @param goods
+	 * @throws CommonGoodsException
+	 * @throws ScanHistoryException
+	 */
+	public void addJDScanHistory(Long uid, String device, JDGoods goods) throws CommonGoodsException, ScanHistoryException;
+
+	/**
+	 * 娣诲姞鎷煎澶氬晢鍝佽冻杩硅褰�
+	 * @param uid
+	 * @param device
+	 * @param pddGoods
+	 * @throws CommonGoodsException
+	 * @throws ScanHistoryException
+	 */
+	public void addPDDScanHistory(Long uid, String device, PDDGoodsDetail pddGoods)
+			throws CommonGoodsException, ScanHistoryException;
+
+	/**
+	 * 鏍规嵁绠�鐗堝晢鍝両D鍒犻櫎
+	 * @param uid
+	 * @param device
+	 * @param commonId
+	 */
+	public void deleteByCommonIdAndDeviceOrUid(Long uid, String device, Long commonId);
 }

--
Gitblit v1.8.0