From a8e45a802600ca1cde28fe8522a26635328bbd99 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 15 三月 2019 17:45:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/RecommendUserGoodsServiceImpl.java |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/RecommendUserGoodsServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/RecommendUserGoodsServiceImpl.java
index 00e5667..9d126c6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/RecommendUserGoodsServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/RecommendUserGoodsServiceImpl.java
@@ -31,7 +31,7 @@
 
 	@Transactional
 	@Override
-	public void addRecommend(Long uid, String recommendDesc, List<CommonGoods> goodsList)
+	public void addRecommend(Long uid, String device, String recommendDesc, List<CommonGoods> goodsList)
 			throws RecommendUserGoodsException {
 		if (goodsList == null || goodsList.size() == 0)
 			throw new RecommendUserGoodsException(1, "鏃犳帹鑽愬晢鍝�");
@@ -40,6 +40,7 @@
 		goods.setCreateTime(new Date());
 		goods.setRecommendDesc(recommendDesc);
 		goods.setUser(new UserInfo(uid));
+		goods.setDevice(device);
 		recommendUserGoodsMapper.insertSelective(goods);
 		for (CommonGoods commonGoods : goodsList)
 			try {
@@ -74,5 +75,20 @@
 	public RecommendUserGoods getLatestRecommendUserGoods(Long uid) {
 		return recommendUserGoodsMapper.getLatestRecommendUserGoods(uid);
 	}
+	
+	@Override
+	public RecommendUserGoods getLatestRecommendUserGoodsByDevice(String device) {
+		return recommendUserGoodsMapper.getLatestRecommendUserGoodsByDevice(device);
+	}
+
+	@Override
+	public List<RecommendUserGoods> listRecommendGoodsByDevice(String device, int page, int pageSize) {
+		return recommendUserGoodsMapper.listRecommendGoodsByDevice(device, (page - 1) * pageSize, pageSize);
+	}
+	
+	@Override
+	public long countRecommendGoodsByDevice(String device) {
+		return recommendUserGoodsMapper.countRecommendGoodsByDevice(device);
+	}
 
 }

--
Gitblit v1.8.0