From aad0554cc7f18a6ec05e2e5e646b5e501d41617d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 10 七月 2019 17:13:49 +0800
Subject: [PATCH] 冲突文件
---
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/CommonGoodsServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/CommonGoodsServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/CommonGoodsServiceImpl.java
index 190f35e..605b873 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/CommonGoodsServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/CommonGoodsServiceImpl.java
@@ -158,9 +158,14 @@
return commonGoodsMapper.listBySellerId(sellerId);
}
-
@Override
public long countBySellerIdAndHasCoupon(Long sellerId) {
return commonGoodsMapper.countBySellerIdAndHasCoupon(sellerId);
}
+
+ @Override
+ public List<CommonGoods> getByListGoodsId(List<Long> list) {
+ return commonGoodsMapper.getByListGoodsId(list);
+ }
+
}
--
Gitblit v1.8.0