From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/CommonGoodsServiceImpl.java |   30 ++++++++++++++++++++++++------
 1 files changed, 24 insertions(+), 6 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..bc95171 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
@@ -20,6 +20,14 @@
 	@Resource
 	private CommonGoodsMapper commonGoodsMapper;
 
+	
+	@Override
+	public CommonGoods selectByPrimaryKey(Long id) {
+		return commonGoodsMapper.selectByPrimaryKey(id);
+	}
+	
+	
+	
 	/**
 	 * 楠岃瘉鏁版嵁姝g‘鎬�
 	 * 
@@ -54,7 +62,9 @@
 
 	@Override
 	public CommonGoods addOrUpdateCommonGoods(CommonGoods commonGoods) throws CommonGoodsException {
+		// 楠岃瘉鏁版嵁瀹屾暣鎬�
 		filterCommonGoods(commonGoods);
+		
 		CommonGoods goods = commonGoodsMapper.selectByGoodsIdAndGoodsType(commonGoods.getGoodsId(),
 				commonGoods.getGoodsType());
 		if (goods != null) {
@@ -71,7 +81,9 @@
 	
 	@Override
 	public CommonGoods addCommonGoods(CommonGoods commonGoods) throws CommonGoodsException {
+		// 楠岃瘉鏁版嵁瀹屾暣鎬�
 		filterCommonGoods(commonGoods);
+		
 		CommonGoods goods = commonGoodsMapper.selectByGoodsIdAndGoodsType(commonGoods.getGoodsId(),
 				commonGoods.getGoodsType());
 		if (goods != null) {
@@ -89,6 +101,7 @@
 	public void updateCommonGoods(CommonGoods commonGoods) throws CommonGoodsException {
 		// 鍒ゆ柇淇℃伅鏄惁瀹屾暣
 		filterCommonGoods(commonGoods);
+		
 		CommonGoods goods = commonGoodsMapper.selectByGoodsIdAndGoodsType(commonGoods.getGoodsId(),
 				commonGoods.getGoodsType());
 		if (goods == null) {
@@ -102,7 +115,7 @@
 	}
 
 	@Override
-	public void offlineCommonGoods(Long goodsId, int goodsType) {
+	public void offlineCommonGoods(Long goodsId, Integer goodsType) {
 		CommonGoods goods = commonGoodsMapper.selectByGoodsIdAndGoodsType(goodsId, goodsType);
 		if (goods == null)
 			return;
@@ -114,7 +127,7 @@
 	}
 
 	@Override
-	public CommonGoods getCommonGoodsByGoodsIdAndGoodsType(Long goodsId, int goodsType) {
+	public CommonGoods getCommonGoodsByGoodsIdAndGoodsType(Long goodsId, Integer goodsType) {
 		return commonGoodsMapper.selectByGoodsIdAndGoodsType(goodsId, goodsType);
 	}
 
@@ -154,13 +167,18 @@
 	
 	
 	@Override
-	public List<CommonGoods> listBySellerId(Long sellerId) {
-		return commonGoodsMapper.listBySellerId(sellerId);
+	public List<CommonGoods> listBySellerId(Long sellerId, Integer goodsType) {
+		return commonGoodsMapper.listBySellerId(sellerId, goodsType);
 	} 
 	
+	@Override
+	public long countBySellerIdAndHasCoupon(Long sellerId, Integer goodsType) {
+		return commonGoodsMapper.countBySellerIdAndHasCoupon(sellerId, goodsType);
+	}
 	
 	@Override
-	public long countBySellerIdAndHasCoupon(Long sellerId) {
-		return commonGoodsMapper.countBySellerIdAndHasCoupon(sellerId);
+	public List<CommonGoods> getByListGoodsId(List<Long> list, Integer goodsType) {
+		return commonGoodsMapper.getByListGoodsId(list, goodsType);
 	}
+	
 }

--
Gitblit v1.8.0