From 9a24f2802a3d6fe3e82c05e52f2880d65ad04dcf Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 29 四月 2019 08:59:47 +0800
Subject: [PATCH] Merge branch 'div_develop' into master_develop

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/goods/CommonGoodsService.java |   31 ++++++++++++++++++++++++++++++-
 1 files changed, 30 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/CommonGoodsService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/CommonGoodsService.java
index 382067d..50562ee 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/CommonGoodsService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/CommonGoodsService.java
@@ -1,5 +1,7 @@
 package com.yeshi.fanli.service.inter.goods;
 
+import java.util.List;
+
 import com.yeshi.fanli.entity.goods.CommonGoods;
 import com.yeshi.fanli.exception.goods.CommonGoodsException;
 
@@ -53,6 +55,33 @@
 	 * @param goodsType
 	 * @return
 	 */
-	CommonGoods getCommonGoodsByGoodsIdAndGoodsType(Long goodsId, int goodsType);
+	public CommonGoods getCommonGoodsByGoodsIdAndGoodsType(Long goodsId, int goodsType);
+
+	/**
+	 * 鎵归噺鏇存柊
+	 * @param listCommonGoods
+	 */
+	public void updateBatchCommonGoods(List<CommonGoods> listCommonGoods);
+
+
+	/**
+	 * 鎵归噺鎻掑叆
+	 * @param listCommonGoods
+	 */
+	public void addBatchCommonGoods(List<CommonGoods> listCommonGoods);
+	
+	/**
+	 *  鏍规嵁搴楅摵id鏌ヨ 鏈�鏂�5涓�
+	 * @param sellerId
+	 * @return
+	 */
+	public List<CommonGoods> listBySellerId(Long sellerId);
+
+	/**
+	 * 缁熻搴楅摵鍟嗗搧鏈夊埜鏁伴噺
+	 * @param sellerId
+	 * @return
+	 */
+	public long countBySellerIdAndHasCoupon(Long sellerId);
 
 }

--
Gitblit v1.8.0