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/dao/mybatis/goods/CommonGoodsMapper.java |   31 +++++++++++++++++++------------
 1 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/goods/CommonGoodsMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/goods/CommonGoodsMapper.java
index b05cab7..fb767b5 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/goods/CommonGoodsMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/goods/CommonGoodsMapper.java
@@ -1,22 +1,29 @@
 package com.yeshi.fanli.dao.mybatis.goods;
 
+import java.util.List;
+
 import org.apache.ibatis.annotations.Param;
 
-import com.yeshi.fanli.goods.CommonGoods;
+import com.yeshi.fanli.dao.BaseMapper;
+import com.yeshi.fanli.entity.goods.CommonGoods;
 
-public interface CommonGoodsMapper {
+public interface CommonGoodsMapper extends BaseMapper<CommonGoods> {
 
-	int deleteByPrimaryKey(Long id);
-
-	int insert(CommonGoods record);
-
-	int insertSelective(CommonGoods record);
-
-	CommonGoods selectByPrimaryKey(Long id);
 
 	CommonGoods selectByGoodsIdAndGoodsType(@Param("goodsId") Long goodsId, @Param("goodsType") int goodsType);
 
-	int updateByPrimaryKeySelective(CommonGoods record);
-
-	int updateByPrimaryKey(CommonGoods record);
+	
+	/**
+	 * 鏍规嵁搴楅摵id鏌ヨ 鏈�鏂�5涓�
+	 * @param goodsId
+	 * @return
+	 */
+	List<CommonGoods> listBySellerId(@Param("sellerId") Long sellerId);
+	
+	/**
+	 * 缁熻搴楅摵鍟嗗搧鏈夊埜鏁伴噺
+	 * @param sellerId
+	 * @return
+	 */
+	long countBySellerIdAndHasCoupon(@Param("sellerId") Long sellerId);
 }
\ No newline at end of file

--
Gitblit v1.8.0