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/lable/QualityFactoryService.java |   49 ++++++++++++-------------------------------------
 1 files changed, 12 insertions(+), 37 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/lable/QualityFactoryService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/lable/QualityFactoryService.java
index fb737e6..15b8dc2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/lable/QualityFactoryService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/lable/QualityFactoryService.java
@@ -8,7 +8,7 @@
 import com.yeshi.fanli.entity.bus.lable.QualityFactory;
 import com.yeshi.fanli.entity.common.AdminUser;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
-import com.yeshi.fanli.exception.QualityFactoryException;
+import com.yeshi.fanli.exception.goods.quality.QualityFactoryException;
 import com.yeshi.fanli.vo.quality.QualityFactoryVO;
 
 public interface QualityFactoryService {
@@ -46,13 +46,6 @@
 	 */
 	public void deleteByGoodsId(List<String> ids) throws QualityFactoryException;
 
-	/**
-	 * 鏍规嵁娣樺疂id 鍒犻櫎绮鹃�夊簱瀵瑰簲淇℃伅
-	 * 
-	 * @param gid
-	 * @throws QualityFactoryException
-	 */
-	public void deleteByTaoBaoGoodsId(Long gid) throws QualityFactoryException;
 
 	/**
 	 * 鏍规嵁娣樺疂id闆嗗悎 鎵归噺鍒犻櫎绮鹃�夊簱瀵瑰簲淇℃伅
@@ -60,7 +53,7 @@
 	 * @param listId
 	 * @throws QualityFactoryException
 	 */
-	public void deleteBatchByTaoBaoGoodsId(List<Long> listId) throws QualityFactoryException;
+	public void deleteBatchByTaoBaoGoodsId(List<Long> listId);
 
 	/**
 	 * 鏍规嵁娣樺疂id 鍒犻櫎
@@ -68,7 +61,7 @@
 	 * @param auctionId
 	 * @throws QualityFactoryException
 	 */
-	public void deleteByTbAuctionId(Long auctionId);
+	public void deleteByTaoBaoGoodsId(Long auctionId);
 
 	/**
 	 * 缁熻鍟嗗搧id 鏄瓨鍦ㄧ簿鍝佸簱
@@ -117,21 +110,6 @@
 	 */
 	public List<QualityFactory> queryAll(long start, int count, Integer days);
 
-	/**
-	 * 鏌ヨ闇�瑕佹洿鏂扮殑绮鹃�夊簱鍟嗗搧id
-	 * 
-	 * @param count
-	 * @param hour
-	 * @return
-	 */
-	public List<Long> queryNeedUpdate(long start, int count, int hour);
-
-	/**
-	 * 缁熻鏇存柊鏁版嵁閲�
-	 * 
-	 * @return
-	 */
-	public long queryNeedUpdateCount();
 
 	/**
 	 * 鏌ヨ绮鹃�夊晢鍝佹暟鎹簲鐢ㄥ墠绔�
@@ -159,8 +137,7 @@
 	 * @param systemCid
 	 * @param labels
 	 */
-	public void autoInsertOrUpadateStorage(List<TaoBaoGoodsBrief> goodsList, List<Label> listLabs,
-			BoutiqueAutoRule autoRule) throws Exception;
+	public void autoInsertOrUpadateStorage(BoutiqueAutoRule autoRule, List<TaoBaoGoodsBrief> goodsList, List<Label> listLabs);
 
 	/**
 	 * AuctionId鏌ユ敹绮鹃�夊簱
@@ -181,8 +158,7 @@
 	 *            鍟嗗搧鏉ユ簮
 	 * @return
 	 */
-	public List<Long> getAuctionIdbyClassId(Long systemCid, Integer goodsSource, String dateTime)
-			throws QualityFactoryException;
+	public List<Long> getAuctionIdbyClassId(Long systemCid, Integer goodsSource, String dateTime);
 
 	/**
 	 * 鏇存柊鏉冮噸
@@ -196,10 +172,10 @@
 	/**
 	 * 鏍规嵁绮鹃�夊簱鍟嗗搧id 鏇存柊鍟嗗搧淇℃伅
 	 * 
-	 * @param listId
+	 * @param gid
 	 *            鍟嗗搧涓婚敭
 	 */
-	public void updateGoodsFactory(List<Long> listId);
+	public void updateQualityGoods(Long goodsId);
 
 	/**
 	 * 鏍规嵁鏈�浣庨攢閲忔煡璇㈢簿閫夊簱锛堟寜鍒涘缓鏃堕棿鍊掑彊鎺掑垪锛�
@@ -222,12 +198,11 @@
 			throws Exception;
 
 	/**
-	 * 鏍规嵁娣樺疂id鑾峰彇璇︽儏鎻掑叆绮鹃�夊簱
-	 * @param listTaoBaoId
-	 * @param lableNames
-	 * @param admin
-	 * @throws Exception
+	 * 鍒犻櫎鏁版嵁
+	 * @param systemCid
+	 * @param formatDate
+	 * @param source
 	 */
-	public void addBatchGoodsByTaoBaoId(List<Long> listTaoBaoId, String lableNames, AdminUser admin) throws Exception;
+	public void deleteNotUpdateGoods(Long systemCid, String formatDate, int source);
 
 }

--
Gitblit v1.8.0