From d99f45a1c358282ab0d4333232da25f03560778f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 29 五月 2020 18:49:31 +0800
Subject: [PATCH] 苏宁,唯品会接口修改

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ScanHistoryV2ServiceImpl.java |   51 ++++++++++++++++++++-------------------------------
 1 files changed, 20 insertions(+), 31 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 155359a..868db00 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
@@ -9,6 +9,7 @@
 
 import com.yeshi.fanli.dao.mybatis.goods.ScanHistoryV2Mapper;
 import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
+import com.yeshi.fanli.dto.suning.SuningGoodsInfo;
 import com.yeshi.fanli.dto.vip.goods.VIPGoodsInfo;
 import com.yeshi.fanli.entity.bus.user.UserInfo;
 import com.yeshi.fanli.entity.goods.CommonGoods;
@@ -39,6 +40,21 @@
 			throw new ScanHistoryException(1, "璁惧鎴栫敤鎴蜂俊鎭己澶�");
 
 		CommonGoods commonGoods = CommonGoodsFactory.create(goods);
+		addScanHistory(commonGoods, device, uid);
+	}
+
+	@Override
+	public void addSuningScanHistory(Long uid, String device, SuningGoodsInfo suningGoods)
+			throws CommonGoodsException, ScanHistoryException {
+		if (uid == null && StringUtil.isNullOrEmpty(device))
+			throw new ScanHistoryException(1, "璁惧鎴栫敤鎴蜂俊鎭己澶�");
+
+		CommonGoods commonGoods = CommonGoodsFactory.create(suningGoods);
+		addScanHistory(commonGoods, device, uid);
+	}
+
+	private void addScanHistory(CommonGoods commonGoods, String device, Long uid)
+			throws CommonGoodsException, ScanHistoryException {
 		commonGoods = commonGoodsService.addOrUpdateCommonGoods(commonGoods);
 		if (commonGoods == null)
 			throw new CommonGoodsException(2, "鍟嗗搧淇℃伅涓嶅畬鏁�");
@@ -87,21 +103,7 @@
 			throw new ScanHistoryException(1, "璁惧鎴栫敤鎴蜂俊鎭己澶�");
 
 		CommonGoods commonGoods = CommonGoodsFactory.create(goods);
-		commonGoods = commonGoodsService.addOrUpdateCommonGoods(commonGoods);
-		if (commonGoods == null)
-			throw new CommonGoodsException(2, "鍟嗗搧淇℃伅涓嶅畬鏁�");
-
-		// 娣诲姞娴忚璁板綍
-		ScanHistoryV2 scanHistoryV2 = new ScanHistoryV2();
-		scanHistoryV2.setCommonGoods(commonGoods);
-		scanHistoryV2.setCreateTime(new Date());
-		scanHistoryV2.setDevice(device);
-
-		if (uid != null)
-			scanHistoryV2.setUserInfo(new UserInfo(uid));
-
-		scanHistoryV2.setUpdateTime(new Date());
-		scanHistoryV2Mapper.insertSelective(scanHistoryV2);
+		addScanHistory(commonGoods, device, uid);
 	}
 
 	@Override
@@ -111,21 +113,7 @@
 			throw new ScanHistoryException(1, "璁惧鎴栫敤鎴蜂俊鎭己澶�");
 
 		CommonGoods commonGoods = CommonGoodsFactory.create(pddGoods);
-		commonGoods = commonGoodsService.addOrUpdateCommonGoods(commonGoods);
-		if (commonGoods == null)
-			throw new CommonGoodsException(2, "鍟嗗搧淇℃伅涓嶅畬鏁�");
-
-		// 娣诲姞娴忚璁板綍
-		ScanHistoryV2 scanHistoryV2 = new ScanHistoryV2();
-		scanHistoryV2.setCommonGoods(commonGoods);
-		scanHistoryV2.setCreateTime(new Date());
-		scanHistoryV2.setDevice(device);
-
-		if (uid != null)
-			scanHistoryV2.setUserInfo(new UserInfo(uid));
-
-		scanHistoryV2.setUpdateTime(new Date());
-		scanHistoryV2Mapper.insertSelective(scanHistoryV2);
+		addScanHistory(commonGoods, device, uid);
 	}
 
 	@Override
@@ -147,7 +135,8 @@
 			Integer source, boolean notBackSuVip) {
 		if (uid == null && StringUtil.isNullOrEmpty(device))
 			return null;
-		return scanHistoryV2Mapper.selectByDeviceOrUid(uid, device, (page - 1) * pageSize, pageSize, source, notBackSuVip);
+		return scanHistoryV2Mapper.selectByDeviceOrUid(uid, device, (page - 1) * pageSize, pageSize, source,
+				notBackSuVip);
 	}
 
 	@Override

--
Gitblit v1.8.0