From dd6a31aae79b35ccf0e006704a4d9e1d950c57d6 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:55:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ScanHistoryV2ServiceImpl.java | 70 ++++++++++++++++++++++++-----------
1 files changed, 48 insertions(+), 22 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 0f8de4a..155359a 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.vip.goods.VIPGoodsInfo;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.goods.CommonGoods;
import com.yeshi.fanli.entity.goods.ScanHistoryV2;
@@ -31,77 +32,102 @@
private ScanHistoryV2Mapper scanHistoryV2Mapper;
@Override
- public void addScanHistory(Long uid, String device, TaoBaoGoodsBrief goods)
+ public void addVIPScanHistory(Long uid, String device, VIPGoodsInfo goods)
throws CommonGoodsException, ScanHistoryException {
+
if (uid == null && StringUtil.isNullOrEmpty(device))
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);
}
-
@Override
- public void addJDScanHistory(Long uid, String device, JDGoods goods) throws CommonGoodsException, ScanHistoryException {
+ public void addScanHistory(Long uid, String device, TaoBaoGoodsBrief goods)
+ throws CommonGoodsException, ScanHistoryException {
if (uid == null && StringUtil.isNullOrEmpty(device))
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);
}
-
-
+
@Override
- public void addPDDScanHistory(Long uid, String device, PDDGoodsDetail pddGoods) throws CommonGoodsException, ScanHistoryException {
+ public void addJDScanHistory(Long uid, String device, JDGoods goods)
+ throws CommonGoodsException, ScanHistoryException {
if (uid == null && StringUtil.isNullOrEmpty(device))
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);
+ }
+
+ @Override
+ public void addPDDScanHistory(Long uid, String device, PDDGoodsDetail pddGoods)
+ throws CommonGoodsException, ScanHistoryException {
+ if (uid == null && StringUtil.isNullOrEmpty(device))
+ 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);
}
-
+
@Override
public void addScanHistory(ScanHistoryV2 history) throws CommonGoodsException, ScanHistoryException {
if (history == null)
@@ -146,19 +172,19 @@
public void deleteByAuctionIdAndDeviceOrUid(Long uid, String device, Long auctionId) {
if (uid == null && StringUtil.isNullOrEmpty(device))
return;
- List<ScanHistoryV2> list = scanHistoryV2Mapper.selectByDeviceOrUidAndGoodsIdAndGoodsType(uid, device, auctionId);
+ List<ScanHistoryV2> list = scanHistoryV2Mapper.selectByDeviceOrUidAndGoodsIdAndGoodsType(uid, device,
+ auctionId);
if (list != null)
for (ScanHistoryV2 sv : list)
scanHistoryV2Mapper.deleteByPrimaryKey(sv.getId());
}
-
@Override
public void deleteByCommonIdAndDeviceOrUid(Long uid, String device, Long commonId) {
if (uid == null && StringUtil.isNullOrEmpty(device)) {
return;
}
-
+
List<ScanHistoryV2> list = scanHistoryV2Mapper.getByCommonGoodsId(uid, device, commonId);
if (list != null && list.size() > 0) {
for (ScanHistoryV2 sv : list) {
--
Gitblit v1.8.0