From d8359ddb48dab5cc797a9d552e11fde571f4920c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 12:32:46 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityFactoryServiceImpl.java | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 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..b71bdaf 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
@@ -318,15 +318,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);
- }
/**
* 鑾峰彇缂撳瓨
@@ -398,6 +389,7 @@
}
@Override
+ @Transactional
public void autoInsertOrUpadateStorage(BoutiqueAutoRule autoRule, List<TaoBaoGoodsBrief> goodsList, List<Label> listLabs) {
if (goodsList == null || goodsList.size() == 0) {
@@ -454,8 +446,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