From f4a0f2acc63d7785eab108419a4e16f5f688cb95 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 18 一月 2020 12:06:27 +0800
Subject: [PATCH] 用户注册信息

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityFactoryServiceImpl.java |  107 +++++++----------------------------------------------
 1 files changed, 14 insertions(+), 93 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityFactoryServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityFactoryServiceImpl.java
index a6a4c43..27267b7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityFactoryServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityFactoryServiceImpl.java
@@ -23,7 +23,7 @@
 import com.yeshi.fanli.entity.bus.lable.QualityFlashSale;
 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.exception.taobao.TaobaoGoodsDownException;
 import com.yeshi.fanli.exception.taobao.TaobaoGoodsUpdateException;
 import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
@@ -32,9 +32,9 @@
 import com.yeshi.fanli.service.inter.lable.QualityFlashSaleService;
 import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
 import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
+import com.yeshi.fanli.util.RedisKeyEnum;
 import com.yeshi.fanli.util.RedisManager;
 import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.taobao.TaoBaoUtil;
 import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
 import com.yeshi.fanli.vo.quality.QualityFactoryVO;
 
@@ -101,7 +101,7 @@
 
 	
 	@Override
-	@Transactional
+	@Transactional(rollbackFor=Exception.class)
 	public void deleteByGoodsId(List<String> ids) throws QualityFactoryException {
 
 		if (ids != null && ids.size() > 0) {
@@ -152,7 +152,7 @@
 	}
 
 	@Override
-	@Transactional
+	@Transactional(rollbackFor=Exception.class)
 	public void addBatchTaoBaoGoods(List<TaoBaoGoodsBrief> listTaoBaoGoods, String lableNames, AdminUser admin)
 			throws Exception {
 
@@ -278,7 +278,7 @@
 	}
 
 	@Override
-	@Transactional
+	@Transactional(rollbackFor=Exception.class)
 	public void setWeightBatch(List<Long> idList, AdminUser admin, Integer weight, Integer weightSmall,
 			Integer weightLarge) throws Exception {
 
@@ -319,15 +319,6 @@
 		qualityFactoryMapper.updateWeight(weight, time);
 	}
 
-	@Override
-	public long queryNeedUpdateCount() {
-		return qualityFactoryMapper.countQueryNeedUpdate();
-	}
-
-	@Override
-	public List<Long> queryNeedUpdate(long start, int count, int hour) {
-		return qualityFactoryMapper.queryNeedUpdate(start, count, hour);
-	}
 
 	/**
 	 * 鑾峰彇缂撳瓨
@@ -339,7 +330,7 @@
 	 * @return
 	 */
 	public String getLabelIdByRedis(String key, String title) throws Exception {
-
+		key = RedisKeyEnum.getRedisKey(RedisKeyEnum.emptyKey, key);
 		String value = redisManager.getCommonString(key);
 
 		if (StringUtil.isNullOrEmpty(value)) {
@@ -399,6 +390,7 @@
 	}
 
 	@Override
+	@Transactional
 	public void autoInsertOrUpadateStorage(BoutiqueAutoRule autoRule, List<TaoBaoGoodsBrief> goodsList,	List<Label> listLabs) {
 
 		if (goodsList == null || goodsList.size() == 0) {
@@ -455,8 +447,11 @@
 		for (TaoBaoGoodsBrief goodsBrief : goodsList) {
 			listAuctionId.add(goodsBrief.getAuctionId());
 		}
-		List<Long> listHas = taoBaoGoodsBriefService.listExistById(listAuctionId);
-
+		
+		List<Long> listHas =  new ArrayList<Long>();
+		if (listAuctionId.size() > 0) {
+			listHas = taoBaoGoodsBriefService.listExistById(listAuctionId);
+		}
 		
 		
 		// 閬嶅巻鍟嗗搧
@@ -731,7 +726,6 @@
 			return;
 		} 
 		
-		
 		// 澶т簬100闇�瑕佸垎娈靛垹闄�
 		int start = 0;
 		int end = 100;
@@ -759,88 +753,15 @@
 	}
 	
 
-	/**
-	 * 鏌ヨ绮鹃�夊晢鍝佹暟鎹簲鐢ㄥ墠绔�
-	 * 
-	 * @param start
-	 * @param count
-	 * @param key
-	 * @param classId
-	 *            鍒嗙被id
-	 * @param labId
-	 *            鏍囩id
-	 * @return
-	 */
+
 	@Override
 	public List<QualityFactory> listQuery(long start, int count, String key, Long classId, Long labId) {
 		return qualityFactoryMapper.listQuery(start, count, key, classId, labId, null, null);
 	}
-
-	/**
-	 * 瀵瑰簲鏌ヨ绮鹃�夊晢鍝佹暟鎹簲鐢ㄥ墠绔粺璁�
-	 */
+	
 	@Override
 	public long countQuery(String key, Integer goodsSource, Long classId, Long labId) {
 		return qualityFactoryMapper.countQuery(key, classId, labId, null, null);
-	}
-
-	public LabelGoods screen9K9(TaoBaoGoodsBrief goodsBrief, Map<String, Label> map) {
-		// 璐翠笂鏂版爣绛�
-		LabelGoods lg = null;
-
-		/* 9k9 */
-		BigDecimal price9k9 = new BigDecimal(10);
-		/* 19k9 */
-		BigDecimal price19k9 = new BigDecimal(20);
-		/* 29.9 */
-		BigDecimal price29K9 = new BigDecimal(30);
-		/* 49.9 */
-		BigDecimal price49K9 = new BigDecimal(50);
-		/* 鍒稿悗浠�--璁$畻 */
-		BigDecimal couponPrice = TaoBaoUtil.getAfterUseCouplePrice(goodsBrief);
-
-		if (couponPrice.compareTo(price9k9) < 0) {
-			Label label = map.get("9.9");
-			if (label == null) {
-				return null;
-			}
-
-			lg = new LabelGoods();
-			lg.setLabel(label);
-
-		} else if (couponPrice.compareTo(price19k9) < 0) {
-			Label label = map.get("19.9");
-			if (label == null) {
-				return null;
-			}
-
-			lg = new LabelGoods();
-			lg.setLabel(label);
-		} else if (couponPrice.compareTo(price29K9) < 0) {
-			Label label = map.get("29.9");
-			if (label == null) {
-				return null;
-			}
-
-			lg = new LabelGoods();
-			lg.setLabel(label);
-		} else if (couponPrice.compareTo(price49K9) < 0) {
-			Label label = map.get("49.9");
-			if (label == null) {
-				return null;
-			}
-
-			lg = new LabelGoods();
-			lg.setLabel(label);
-		} else {
-			return null;
-		}
-
-		lg.setCreateUser(new AdminUser(2L));
-		lg.setCreatetime(new Date());
-		lg.setTaoBaoGoodsBrief(goodsBrief);
-
-		return lg;
 	}
 
 	@Override

--
Gitblit v1.8.0