From 389d0c6d923532e3af63582e37946a5cda1fa90b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 06 十二月 2018 14:13:15 +0800
Subject: [PATCH] 浏览记录调整 邀请更改

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ScanHistoryV2ServiceImpl.java |   36 +++++++++++++++++++++++++++++++++++-
 1 files changed, 35 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ScanHistoryV2ServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ScanHistoryV2ServiceImpl.java
index 2b9c1e9..e8bdcc4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ScanHistoryV2ServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ScanHistoryV2ServiceImpl.java
@@ -1,6 +1,7 @@
 package com.yeshi.fanli.service.impl.goods;
 
 import java.util.Date;
+import java.util.List;
 
 import javax.annotation.Resource;
 
@@ -54,11 +55,44 @@
 		if (history.getUserInfo() == null && StringUtil.isNullOrEmpty(history.getDevice()))
 			throw new ScanHistoryException(1, "璁惧鎴栫敤鎴蜂俊鎭己澶�");
 
-		CommonGoods commonGoods = commonGoodsService.addOrUpdateCommonGoods(history.getCommonGoods());
+		CommonGoods commonGoods = commonGoodsService.addCommonGoods(history.getCommonGoods());
 		if (commonGoods == null)
 			throw new CommonGoodsException(2, "鍟嗗搧淇℃伅涓嶅畬鏁�");
 		history.setCommonGoods(commonGoods);
 		scanHistoryV2Mapper.insertSelective(history);
 	}
 
+	@Override
+	public List<ScanHistoryV2> getScanHistoryByDeviceOrUid(Long uid, String device, int page, int pageSize) {
+		if (uid == null && StringUtil.isNullOrEmpty(device))
+			return null;
+		return scanHistoryV2Mapper.selectByDeviceOrUid(uid, device, (page - 1) * pageSize, pageSize);
+	}
+
+	@Override
+	public long getCountByDeviceOrUid(Long uid, String device) {
+		if (uid == null && StringUtil.isNullOrEmpty(device))
+			return 0;
+		Long count = scanHistoryV2Mapper.selectCountByDeviceOrUid(uid, device);
+		return count == null ? 0 : count;
+	}
+
+	@Override
+	public void deleteByDeviceOrUid(Long uid, String device) {
+		if (uid == null && StringUtil.isNullOrEmpty(device))
+			return;
+		scanHistoryV2Mapper.deleteByDeviceOrUid(uid, device);
+	}
+
+	@Override
+	public void deleteByAuctionIdAndDeviceOrUid(Long uid, String device, Long auctionId) {
+		if (uid == null && StringUtil.isNullOrEmpty(device))
+			return;
+		List<ScanHistoryV2> list = scanHistoryV2Mapper.selectByDeviceOrUidAndGoodsIdAndGoodsType(uid, device, auctionId,
+				CommonGoods.GOODS_TYPE_TB);
+		if (list != null)
+			for (ScanHistoryV2 sv : list)
+				scanHistoryV2Mapper.deleteByPrimaryKey(sv.getId());
+	}
+
 }

--
Gitblit v1.8.0