From ad9fbd2c18f280ef9bba47f28353d367cf2d94e8 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:28:03 +0800
Subject: [PATCH] Merge branch 'div_12'

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityGoodsServiceImpl.java |   27 +++++++++++++++++++--------
 1 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityGoodsServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityGoodsServiceImpl.java
index dc1b368..eecdd3d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityGoodsServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityGoodsServiceImpl.java
@@ -5,10 +5,10 @@
 
 import javax.annotation.Resource;
 
-import net.sf.json.JSONArray;
-
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
+import org.yeshi.utils.JsonUtil;
+import org.yeshi.utils.taobao.TbImgUtil;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -16,7 +16,6 @@
 import com.yeshi.fanli.dao.mybatis.lable.LabelGoodsMapper;
 import com.yeshi.fanli.dao.mybatis.lable.QualityFactoryMapper;
 import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoGoodsBriefMapper;
-import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoGoodsBriefRecordMapper;
 import com.yeshi.fanli.entity.bus.lable.Label;
 import com.yeshi.fanli.entity.bus.lable.LabelGoods;
 import com.yeshi.fanli.entity.bus.lable.QualityFactory;
@@ -29,8 +28,7 @@
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.taobao.TaoBaoUtil;
 
-import org.yeshi.utils.JsonUtil;
-import org.yeshi.utils.taobao.TbImgUtil;
+import net.sf.json.JSONArray;
 
 @Service
 public class QualityGoodsServiceImpl implements QualityGoodsService {
@@ -49,9 +47,6 @@
 	private TaoBaoGoodsBriefMapper taoBaoGoodsBriefMapper;
 	@Resource
 	private TaoBaoUnionConfigService taoBaoUnionConfigService;
-
-	@Resource
-	private TaoBaoGoodsBriefRecordMapper taoBaoGoodsBriefRecordMapper;
 
 	@Resource
 	private TaoBaoClassRelationMapper taoBaoClassRelationMapper;
@@ -83,6 +78,12 @@
 	public long countQueryByFlashSale() {
 		return qualityFactoryMapper.countQueryByFlashSale();
 	}
+	
+	@Override
+	public List<QualityFactory> listFlashSaleRandGoods() {
+		return qualityFactoryMapper.listFlashSaleRandGoods();
+	}
+	
 	
 	/**
 	 * 浠婃棩蹇呮姠 - 9k9
@@ -387,4 +388,14 @@
 		return qualityFactoryMapper.countFreeGoods(tkRate, lableName);
 	}
 	
+	@Override
+	public List<QualityFactory> listByShopId(long start, int count, Long shopId) {
+		return qualityFactoryMapper.listByShopId(start, count, shopId);
+	}
+	
+	@Override
+	public long countByShopId(Long shopId) {
+		return qualityFactoryMapper.countByShopId(shopId);
+	}
+	
 }

--
Gitblit v1.8.0