From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/dataoke/DaTaoKeGoodsDetailService.java |   53 ++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/dataoke/DaTaoKeGoodsDetailService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/dataoke/DaTaoKeGoodsDetailService.java
index cc749b0..8afde2b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/dataoke/DaTaoKeGoodsDetailService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/dataoke/DaTaoKeGoodsDetailService.java
@@ -1,7 +1,9 @@
 package com.yeshi.fanli.service.inter.taobao.dataoke;
 
+import java.math.BigDecimal;
 import java.util.List;
 
+import com.yeshi.fanli.dto.dataoke.DingDongQiangDTO;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
 import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetail;
 
@@ -49,10 +51,21 @@
 	 */
 	public List<DaTaoKeDetail> listByIds(List<Long> idList);
 
-	/**
+	/**
+	 * 鏌ヨ涓�绫诲叏閮�
+	 * 
+	 * @param cid
+	 * @param listId
+	 * @param count
+	 * @return
+	 */
+	public List<DaTaoKeDetail> getGoodsNotInList(Long cid, List<Long> listId, int count);
+
+	/*
 	 * 鏍规嵁鏍囬鏌ヨ
 	 * 
 	 * @param dtitle
+	 * 
 	 * @return
 	 */
 	public List<DaTaoKeDetail> listByDtitle(String dtitle);
@@ -79,14 +92,40 @@
 	 */
 	public Long countSearchByTitleWithCid(String title, Long cid);
 
-	/*
-	 * 鏌ヨ涓�绫诲叏閮�
+	/**
+	 * 鏍规嵁鍒嗙被ID涓庢渶澶у埜鍚庝环妫�绱�
+	 * 
 	 * @param cid
-	 * @param listId
-	 * @param count
+	 * @param maxPrice
+	 * @param page
+	 * @param pageSize
 	 * @return
 	 */
-	public List<DaTaoKeDetail> getGoodsNotInList(Long cid, List<Long> listId, int count);
-
+	public List<DaTaoKeDetail> listByCidAndMaxPrice(Integer cid, BigDecimal maxPrice, int page, int pageSize);
 
+	/**
+	 * 鏍规嵁鍒嗙被ID涓庢渶澶у埜鍚庝环妫�绱㈡暟閲�
+	 * 
+	 * @param cid
+	 * @param maxPrice
+	 * @return
+	 */
+	public Long countByCidAndMaxPrice(Integer cid, BigDecimal maxPrice);
+
+	/**
+	 * 鑾峰彇鍙挌鍛涙暟鎹�
+	 * 
+	 * @return
+	 */
+	public List<DingDongQiangDTO> getDingDongQiangData();
+	
+	/**
+	 * 鏍规嵁鏃堕棿鏌ヨ
+	 * @param time  0712 琛ㄧず7鍙�12鐐�
+	 * @return
+	 */
+	public List<DaTaoKeDetail> getDingDongQiangData(String time);
+	
+	
+	
 }

--
Gitblit v1.8.0