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/ScanHistoryV2Service.java |   70 +++++++++++++++++++++++++++++++++++
 1 files changed, 70 insertions(+), 0 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 ea60e6c..2195a5e 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
@@ -1,6 +1,10 @@
 package com.yeshi.fanli.service.inter.goods;
 
+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;
@@ -24,4 +28,70 @@
 	 * @throws ScanHistoryException
 	 */
 	public void addScanHistory(ScanHistoryV2 history) throws CommonGoodsException, ScanHistoryException;
+
+	/**
+	 * 鏍规嵁璁惧鎴栬�呯敤鎴稩D鑾峰彇娴忚璁板綍
+	 * 
+	 * @param uid
+	 * @param device
+	 * @param page
+	 * @param pageSize
+	 * @return
+	 */
+	public List<ScanHistoryV2> getScanHistoryByDeviceOrUid(Long uid, String device, int page, int pageSize, Integer source);
+
+	/**
+	 * 鏍规嵁璁惧鎴栬�呯敤鎴稩D鑾峰彇娴忚璁板綍鏁伴噺
+	 * 
+	 * @param uid
+	 * @param device
+	 * @return
+	 */
+	public long getCountByDeviceOrUid(Long uid, String device, Integer source);
+
+	/**
+	 * 鏍规嵁鐢ㄦ埛鎴栬�呰澶囧垹闄ゆ祻瑙堣褰�
+	 * 
+	 * @param uid
+	 * @param device
+	 */
+	public void deleteByDeviceOrUid(Long uid, String device);
+
+	/**
+	 * 鏍规嵁鐢ㄦ埛鎴栬�呰澶囧拰娣樺疂鍟嗗搧ID鍒犻櫎娴忚璁板綍
+	 * 
+	 * @param uid
+	 * @param device
+	 * @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