From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 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 e0a025d..0b8cba9 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
@@ -18,6 +18,7 @@
 import com.yeshi.fanli.exception.goods.RecommendUserGoodsException;
 import com.yeshi.fanli.service.inter.goods.CommonGoodsService;
 import com.yeshi.fanli.service.inter.goods.RecommendUserGoodsService;
+import com.yeshi.fanli.util.StringUtil;
 
 @Service
 public class RecommendUserGoodsServiceImpl implements RecommendUserGoodsService {
@@ -29,7 +30,7 @@
 	@Resource
 	private CommonGoodsService commonGoodsService;
 
-	@Transactional
+	@Transactional(rollbackFor=Exception.class)
 	@Override
 	public void addRecommend(Long uid, String device, String recommendDesc, List<CommonGoods> goodsList)
 			throws RecommendUserGoodsException {
@@ -92,4 +93,19 @@
 		return recommendUserGoodsMapper.countRecommendGoodsByDevice(device);
 	}
 
+	@Override
+	public void syncDeviceAndUid(Long uid, String targetDevice) {
+
+		List<RecommendUserGoods> list = recommendUserGoodsMapper.listRecommendGoods(uid, 0, 20);
+		for (RecommendUserGoods ru : list) {
+			if (StringUtil.isNullOrEmpty(ru.getDevice())) {
+				RecommendUserGoods update = new RecommendUserGoods();
+				update.setId(ru.getId());
+				update.setDevice(targetDevice);
+				recommendUserGoodsMapper.updateByPrimaryKeySelective(update);
+			}
+		}
+
+	}
+
 }

--
Gitblit v1.8.0