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/TaoBaoShopService.java |   33 ++++++++++++++++++++++++---------
 1 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/TaoBaoShopService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/TaoBaoShopService.java
index 3c52b32..6ec17a0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/TaoBaoShopService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/TaoBaoShopService.java
@@ -21,35 +21,50 @@
 
 	/**
 	 * 搴楅摵淇℃伅
+	 * 
 	 * @param id
 	 * @return
 	 */
 	public TaoBaoShop selectByPrimaryKey(Long id);
 
-	
+	/**
+	 * 鑾峰彇搴楅摵淇℃伅
+	 * 
+	 * @param auctionId
+	 * @param sellerId
+	 * @return
+	 */
+	public TaoBaoShop getTaoBaoShop(Long auctionId, Long sellerId);
+
 	public int insertSelective(TaoBaoShop record);
-	
-	
+
 	public int updateByPrimaryKeySelective(TaoBaoShop record);
 
 	/**
 	 * 淇敼搴楅摵淇℃伅
+	 * 
 	 * @param file
 	 * @param id
 	 * @param shopName
 	 */
-	public void changeInfo(MultipartFile file, Long id, String shopName);
-	
-	
+	public void changeInfo(MultipartFile file, Long id, String shopName,String key);
+
 	/**
 	 * 鏌ヨ搴楅摵淇℃伅銆佸苟杩斿洖閽�3涓晢鍝佹暟閲�
+	 * 
 	 * @param start
 	 * @param count
 	 * @param cid
 	 * @return
 	 */
 	public List<TaoBaoShopVO> listBrandShopinfo(long start, int count, Long cid);
-	
-	
-	long countBrandShopinfo(Long cid);
+
+	public long countBrandShopinfo(Long cid);
+
+	/**
+	 * 鏍规嵁搴楅摵鎼滅储鍏抽敭璇嶆煡鎵�
+	 * @param key
+	 * @return
+	 */
+	public List<TaoBaoShopVO> getShopByKey(String key);
 }

--
Gitblit v1.8.0