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/CollectionGoodsV2ServiceImpl.java |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/CollectionGoodsV2ServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/CollectionGoodsV2ServiceImpl.java
index 162a8e2..8d5d9a6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/CollectionGoodsV2ServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/CollectionGoodsV2ServiceImpl.java
@@ -5,7 +5,6 @@
 
 import javax.annotation.Resource;
 
-import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -35,7 +34,7 @@
 	@Resource
 	private CommonGoodsService commonGoodsService;
 
-	@Transactional
+	@Transactional(rollbackFor=Exception.class)
 	@Override
 	public void addCollection(Long uid, TaoBaoGoodsBrief goods) throws CollectionGoodsException {
 		if (uid == null || uid == 0)
@@ -66,7 +65,7 @@
 	}
 
 	
-	@Transactional
+	@Transactional(rollbackFor=Exception.class)
 	@Override
 	public void addJDCollection(Long uid, JDGoods jdGoods) throws CollectionGoodsException {
 		if (uid == null || uid == 0)
@@ -97,7 +96,7 @@
 	}
 	
 	
-	@Transactional
+	@Transactional(rollbackFor=Exception.class)
 	@Override
 	public void addPDDCollection(Long uid, PDDGoodsDetail goods) throws CollectionGoodsException {
 		if (uid == null || uid == 0)
@@ -149,7 +148,7 @@
 		collectionGoodsV2Mapper.insertSelective(goods);
 	}
 
-	@Transactional
+	@Transactional(rollbackFor=Exception.class)
 	@Override
 	public void cancelCollection(Long uid, Long id) throws CollectionGoodsException {
 		if (uid == null || uid == 0)
@@ -167,13 +166,13 @@
 	}
 
 	@Override
-	public List<CollectionGoodsV2> getCollectionGoodsList(Long uid, int page, int pageSize, Integer source) {
-		return collectionGoodsV2Mapper.selectByUidOrderByCreateTimeDesc(uid, (page - 1) * pageSize, pageSize, source);
+	public List<CollectionGoodsV2> getCollectionGoodsList(Long uid, int page, int pageSize, Integer source, boolean notBackSuVip) {
+		return collectionGoodsV2Mapper.selectByUidOrderByCreateTimeDesc(uid, (page - 1) * pageSize, pageSize, source, notBackSuVip);
 	}
 
 	@Override
-	public long getCollectionGoodsCount(Long uid, Integer source) {
-		return collectionGoodsV2Mapper.selectCountByUid(uid, source);
+	public long getCollectionGoodsCount(Long uid, Integer source, boolean notBackSuVip) {
+		return collectionGoodsV2Mapper.selectCountByUid(uid, source, notBackSuVip);
 	}
 
 	@Override

--
Gitblit v1.8.0