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 |  177 ++++++++++++++++++++++++++---------------------------------
 1 files changed, 78 insertions(+), 99 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 5619da1..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
@@ -1,6 +1,5 @@
 package com.yeshi.fanli.service.inter.lable;
 
-
 import java.util.List;
 import java.util.Map;
 
@@ -9,126 +8,82 @@
 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 {
-	
+
 	/**
 	 * 閫夋嫨鎬ф洿鏂板唴瀹光�斺�斾笉涓虹┖鍒欐洿鏂拌瀛楁
+	 * 
 	 * @param record
 	 * @return
 	 * @throws QualityFactoryException
 	 */
 	public int updateByPrimaryKeySelective(QualityFactory record) throws QualityFactoryException;
-	
-	
+
 	/**
 	 * 鏍规嵁id鏌ユ壘褰撳墠瀵硅薄
+	 * 
 	 * @param id
 	 * @return
 	 * @throws QualityFactoryException
 	 */
 	public QualityFactory selectByPrimaryKey(Long id) throws QualityFactoryException;
-	
-	
+
 	/**
 	 * 缁熻鍟嗗搧鏁伴噺
+	 * 
 	 * @return
 	 */
 	public Map<String, Object> getCountAll();
-	
+
 	/**
 	 * 鏍规嵁鍟嗗搧id 绉婚櫎绮惧搧搴�
+	 * 
 	 * @param ids
 	 * @throws QualityFactoryException
 	 */
 	public void deleteByGoodsId(List<String> ids) throws QualityFactoryException;
-	
-	/**
-	 * 鏍规嵁娣樺疂id 鍒犻櫎绮鹃�夊簱瀵瑰簲淇℃伅
-	 * @param gid
-	 * @throws QualityFactoryException
-	 */
-	public void deleteByTaoBaoGoodsId(Long gid) throws QualityFactoryException;
+
 
 	/**
 	 * 鏍规嵁娣樺疂id闆嗗悎 鎵归噺鍒犻櫎绮鹃�夊簱瀵瑰簲淇℃伅
+	 * 
 	 * @param listId
 	 * @throws QualityFactoryException
 	 */
-	public void deleteBatchByTaoBaoGoodsId(List<Long> listId) throws QualityFactoryException;
+	public void deleteBatchByTaoBaoGoodsId(List<Long> listId);
 
 	/**
 	 * 鏍规嵁娣樺疂id 鍒犻櫎
+	 * 
 	 * @param auctionId
 	 * @throws QualityFactoryException
 	 */
-	public void deleteByTbAuctionId(Long auctionId);
+	public void deleteByTaoBaoGoodsId(Long auctionId);
 
-	
 	/**
 	 * 缁熻鍟嗗搧id 鏄瓨鍦ㄧ簿鍝佸簱
+	 * 
 	 * @param goodsId
 	 * @return
 	 */
 	public Long queryCountByGoodsId(Long goodsId);
-	
-	/**
-	 * 鎵归噺鍏ュ簱--娣樺疂
-	 * @param auctionIdList
-	 * @param admin
-	 * @throws Exception
-	 */
-	public void addBatch(List<Long> auctionIdList, String las, AdminUser admin) throws Exception;
 
-	
+
 	/**
 	 * 绮鹃�夊簱鍟嗗搧绛涢��
-	 * @param start
-	 * @param count
-	 * @param key
-	 * @param totalSales
-	 * @param price
-	 * @param tkRate
-	 * @param goodsSource
-	 * @param days
-	 * @param startZkPrice
-	 * @param endZkPrice
-	 * @param startBiz30day
-	 * @param endBiz30day
-	 * @param startWeight
-	 * @param endWeight
-	 * @param startTkRate
-	 * @param endTkRate
-	 * @param startAmount
-	 * @param endAmount
-	 * @param hasCoupon
-	 * @param freeShipment
-	 * @param isPrepay
-	 * @param payRate30
-	 * @param goodRate
-	 * @param rfdRate
-	 * @return
+	 * 
 	 * @throws QualityFactoryException
 	 */
-	public List<QualityFactory> query(long start, int count, String key, Integer totalSales, Integer price,
-			Integer tkRate, Integer propor, Integer goodsSource, Integer days, Integer startZkPrice, Integer endZkPrice,
-			Integer startBiz30day, Integer endBiz30day, Integer startWeight, Integer endWeight, 
-			Integer startTkRate, Integer endTkRate, Integer startAmount, Integer endAmount,
-			Integer hasCoupon, Integer freeShipment, Integer isPrepay, Integer payRate30, 
-			Integer goodRate, Integer rfdRate,Integer startPropor, Integer endPropor,
-			Long gcid, Integer keyType) throws QualityFactoryException;
+	public List<QualityFactory> query(QualityFactoryVO qualityFactoryVO) throws QualityFactoryException;
 
-	public long queryCount(String key, Integer goodsSource, Integer days, Integer startZkPrice, 
-			Integer endZkPrice, Integer startBiz30day, Integer endBiz30day, Integer startWeight, 
-			Integer endWeight, Integer startTkRate, Integer endTkRate, Integer startAmount, 
-			Integer endAmount, Integer hasCoupon, Integer freeShipment, Integer isPrepay, 
-			Integer payRate30, Integer goodRate, Integer rfdRate,Integer startPropor, Integer endPropor,
-			Long gcid, Integer keyType) throws QualityFactoryException;
+	public long queryCount(QualityFactoryVO qualityFactoryVO) throws QualityFactoryException;
 
-	
 	/**
-	 *  鎵归噺璁剧疆鏉冮噸  +  闅忔満鏉冮噸
+	 * 鎵归噺璁剧疆鏉冮噸 + 闅忔満鏉冮噸
+	 * 
 	 * @param idList
 	 * @param admin
 	 * @param weight
@@ -136,16 +91,19 @@
 	 * @param weightLarge
 	 * @throws Exception
 	 */
-	public void setWeightBatch(List<Long> idList, AdminUser admin, Integer weight, Integer weightSmall, Integer weightLarge) throws Exception;
+	public void setWeightBatch(List<Long> idList, AdminUser admin, Integer weight, Integer weightSmall,
+			Integer weightLarge) throws Exception;
 
 	/**
 	 * 缁熻鎬昏鏁�
+	 * 
 	 * @return
 	 */
 	public Long countTotalRows(Integer days);
 
 	/**
 	 * 鏌ヨ鎵�鏈夋暟鎹�-鏃犳潯浠�
+	 * 
 	 * @param start
 	 * @param count
 	 * @return
@@ -154,66 +112,57 @@
 
 
 	/**
-	 * 鏌ヨ闇�瑕佹洿鏂扮殑绮鹃�夊簱鍟嗗搧id
-	 * @param count
-	 * @param hour
-	 * @return
-	 */
-	public List<Long> queryNeedUpdate(long start, int count, int hour);
-
-	/**
-	 * 缁熻鏇存柊鏁版嵁閲�
-	 * @return
-	 */
-	public long queryNeedUpdateCount();
-
-	/**
 	 * 鏌ヨ绮鹃�夊晢鍝佹暟鎹簲鐢ㄥ墠绔�
+	 * 
 	 * @param start
 	 * @param count
 	 * @param key
-	 * @param classId 鍒嗙被id
-	 * @param labId  鏍囩id
+	 * @param classId
+	 *            鍒嗙被id
+	 * @param labId
+	 *            鏍囩id
 	 * @return
 	 */
 	public List<QualityFactory> listQuery(long start, int count, String key, Long classId, Long labId);
-	
+
 	/**
 	 * 瀵瑰簲鏌ヨ绮鹃�夊晢鍝佹暟鎹簲鐢ㄥ墠绔粺璁�
-	 */ 
+	 */
 	public long countQuery(String key, Integer goodsSource, Long classId, Long labId);
-
-
 
 	/**
 	 * 鏇存柊绮鹃�夊簱鍟嗗搧
+	 * 
 	 * @param goodsList
 	 * @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鏌ユ敹绮鹃�夊簱
+	 * 
 	 * @param list
 	 * @return
 	 */
 	public List<QualityFactory> listQueryByAuctionId(List<Long> list);
 
-	
 	/**
 	 * 鏍规嵁鏃堕棿 鑾峰彇褰撳墠鏃堕棿涔嬪墠鍒涘缓鐨勫晢鍝佷俊鎭�
-	 * @param systemCid 绯荤粺鍒嗙被id
-	 * @param dateTime  绛涢�夋椂闂�
-	 * @param goodsSource  鍟嗗搧鏉ユ簮
+	 * 
+	 * @param systemCid
+	 *            绯荤粺鍒嗙被id
+	 * @param dateTime
+	 *            绛涢�夋椂闂�
+	 * @param goodsSource
+	 *            鍟嗗搧鏉ユ簮
 	 * @return
 	 */
-	public List<Long> getAuctionIdbyClassId(Long systemCid, Integer goodsSource, String dateTime) throws QualityFactoryException;
-	
+	public List<Long> getAuctionIdbyClassId(Long systemCid, Integer goodsSource, String dateTime);
+
 	/**
 	 * 鏇存柊鏉冮噸
+	 * 
 	 * @param weight
 	 * @param time
 	 * @return
@@ -222,8 +171,38 @@
 
 	/**
 	 * 鏍规嵁绮鹃�夊簱鍟嗗搧id 鏇存柊鍟嗗搧淇℃伅
-	 * @param listId  鍟嗗搧涓婚敭
+	 * 
+	 * @param gid
+	 *            鍟嗗搧涓婚敭
 	 */
-	public void updateGoodsFactory(List<Long> listId);
+	public void updateQualityGoods(Long goodsId);
+
+	/**
+	 * 鏍规嵁鏈�浣庨攢閲忔煡璇㈢簿閫夊簱锛堟寜鍒涘缓鏃堕棿鍊掑彊鎺掑垪锛�
+	 * 
+	 * @param salesCount
+	 * @param page
+	 * @param pageSize
+	 * @return
+	 */
+	public List<QualityFactory> listByMinSalesCountOrderByCreateTimeDesc(int salesCount, int page, int pageSize);
+
+	/**
+	 * 鎵归噺娣诲姞鍟嗗搧鑷崇簿閫夊簱 骞惰创涓婃爣绛�
+	 * @param listTaoBaoGoods
+	 * @param lableNames
+	 * @param admin
+	 * @throws Exception
+	 */
+	public void addBatchTaoBaoGoods(List<TaoBaoGoodsBrief> listTaoBaoGoods, String lableNames, AdminUser admin)
+			throws Exception;
+
+	/**
+	 * 鍒犻櫎鏁版嵁
+	 * @param systemCid
+	 * @param formatDate
+	 * @param source
+	 */
+	public void deleteNotUpdateGoods(Long systemCid, String formatDate, int source);
 
 }

--
Gitblit v1.8.0