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/impl/lable/QualityFactoryServiceImpl.java | 28 ++++++++++++----------------
1 files changed, 12 insertions(+), 16 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 48bbe5a..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,6 +32,7 @@
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.TaoKeApiUtil;
@@ -100,7 +101,7 @@
@Override
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
public void deleteByGoodsId(List<String> ids) throws QualityFactoryException {
if (ids != null && ids.size() > 0) {
@@ -151,7 +152,7 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
public void addBatchTaoBaoGoods(List<TaoBaoGoodsBrief> listTaoBaoGoods, String lableNames, AdminUser admin)
throws Exception {
@@ -277,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 {
@@ -318,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);
- }
/**
* 鑾峰彇缂撳瓨
@@ -338,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)) {
@@ -398,6 +390,7 @@
}
@Override
+ @Transactional
public void autoInsertOrUpadateStorage(BoutiqueAutoRule autoRule, List<TaoBaoGoodsBrief> goodsList, List<Label> listLabs) {
if (goodsList == null || goodsList.size() == 0) {
@@ -454,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);
+ }
// 閬嶅巻鍟嗗搧
--
Gitblit v1.8.0