From e4a56b57d3e10b9b46eaefe5194bbf98fcc45698 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 11 七月 2019 18:41:09 +0800
Subject: [PATCH] Merge branch 'master' into div
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/goods/CommonGoodsMapper.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 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 176a89d..5a5b948 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
@@ -9,8 +9,13 @@
public interface CommonGoodsMapper extends BaseMapper<CommonGoods> {
-
- CommonGoods selectByGoodsIdAndGoodsType(@Param("goodsId") Long goodsId, @Param("goodsType") int goodsType);
+ /**
+ * 鏍规嵁鍟嗗搧ID鏌ヨ
+ * @param goodsId
+ * @param goodsType
+ * @return
+ */
+ CommonGoods selectByGoodsIdAndGoodsType(@Param("goodsId") Long goodsId, @Param("goodsType") Integer goodsType);
/**
@@ -18,14 +23,14 @@
* @param goodsId
* @return
*/
- List<CommonGoods> listBySellerId(@Param("sellerId") Long sellerId);
+ List<CommonGoods> listBySellerId(@Param("sellerId") Long sellerId, @Param("goodsType") Integer goodsType);
/**
* 缁熻搴楅摵鍟嗗搧鏈夊埜鏁伴噺
* @param sellerId
* @return
*/
- long countBySellerIdAndHasCoupon(@Param("sellerId") Long sellerId);
+ long countBySellerIdAndHasCoupon(@Param("sellerId") Long sellerId, @Param("goodsType") Integer goodsType);
/**
@@ -33,7 +38,7 @@
* @param list
* @return
*/
- List<CommonGoods> getByListGoodsId(@Param("list") List<Long> list);
+ List<CommonGoods> getByListGoodsId(@Param("list") List<Long> list, @Param("goodsType") Integer goodsType);
}
\ No newline at end of file
--
Gitblit v1.8.0