From 1770eb0a01b3f2ef92f416b67d25160d3ced9625 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期四, 06 十二月 2018 18:09:46 +0800
Subject: [PATCH] Merge branch 'dev1'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/goods/CommonGoodsService.java |   29 ++++++++++++++++++++++++++++-
 1 files changed, 28 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 321b354..eb28442 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,7 +1,9 @@
 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;
-import com.yeshi.fanli.goods.CommonGoods;
 
 /**
  * 甯歌鍟嗗搧搴�
@@ -19,6 +21,16 @@
 	 * @throws CommonGoodsException
 	 */
 	public CommonGoods addOrUpdateCommonGoods(CommonGoods commonGoods) throws CommonGoodsException;
+	
+	
+	/**
+	 * 娣诲姞鍟嗗搧锛堟棤灏辨坊鍔狅紝鏈夊垯杩斿洖锛�
+	 * 
+	 * @param commonGoods
+	 * @return
+	 * @throws CommonGoodsException
+	 */
+	public CommonGoods addCommonGoods(CommonGoods commonGoods) throws CommonGoodsException;
 
 	/**
 	 * 鏇存柊鍟嗗搧淇℃伅
@@ -36,4 +48,19 @@
 	 */
 	public void offlineCommonGoods(Long goodsId, int goodsType);
 
+	/**
+	 * 鏍规嵁鍟嗗搧ID鍜屽晢鍝佺被鍨嬫煡璇㈠簱鍟嗗搧
+	 * 
+	 * @param goodsId
+	 * @param goodsType
+	 * @return
+	 */
+	public CommonGoods getCommonGoodsByGoodsIdAndGoodsType(Long goodsId, int goodsType);
+
+	/**
+	 * 鎵归噺鏇存柊
+	 * @param listCommonGoods
+	 */
+	public void updateBatchCommonGoods(List<CommonGoods> listCommonGoods);
+
 }

--
Gitblit v1.8.0