From 5ca8157adb3236d7817b487a5ff6f4efa12006d2 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 25 十一月 2019 14:25:27 +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 | 18 ++++++------------
1 files changed, 6 insertions(+), 12 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 9577ea9..b5c1a18 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;
@@ -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);
- }
/**
* 鑾峰彇缂撳瓨
@@ -455,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