From bc9d4bf3fddcb3107f8509159a250f7a5a5f8ae5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 11 六月 2021 17:13:01 +0800
Subject: [PATCH] 特价bug修复
---
fanli/src/main/java/com/yeshi/fanli/controller/client/lijin/GoodsControllerLijin.java | 74 ++++++++++++++++++++++++++++++++++++-
1 files changed, 72 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/lijin/GoodsControllerLijin.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/lijin/GoodsControllerLijin.java
index 14bbbf3..bac3c92 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/lijin/GoodsControllerLijin.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/lijin/GoodsControllerLijin.java
@@ -20,11 +20,14 @@
import com.yeshi.fanli.entity.bus.user.ShamUser;
import com.yeshi.fanli.entity.goods.CollectionGoodsV2;
import com.yeshi.fanli.entity.jd.JDGoods;
+import com.yeshi.fanli.exception.goods.CommonGoodsException;
+import com.yeshi.fanli.exception.goods.ScanHistoryException;
import com.yeshi.fanli.exception.pdd.PDDApiException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.lijin.manager.GoodsLijinMnager;
import com.yeshi.fanli.lijin.manager.UserLijinMnager;
import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;
+import com.yeshi.fanli.service.inter.goods.ScanHistoryV2Service;
import com.yeshi.fanli.service.inter.pdd.PDDAuthService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;
@@ -87,6 +90,8 @@
@Resource
private PIDManager pidManager;
+ @Resource
+ private ScanHistoryV2Service scanHistoryV2Service;
/**
@@ -114,6 +119,11 @@
goodsDetailVO.setGoods(GoodsDetailVOLijinFactory.convertTaoBao(goods, paramsDTO));
+ BigDecimal lijinAmount = goodsLijinMnager.getTBLijin(uid, goods);
+ if (lijinAmount != null && lijinAmount.compareTo(new BigDecimal(0)) > 0) {
+ goodsDetailVO.getGoods().getMoneyInfo().setHongBaoMoney("楼" + lijinAmount);
+ GoodsDetailVOLijinFactory.fillRights(goodsDetailVO.getGoods());
+ }
// 搴楅摵淇℃伅
TaoBaoShop shop = taoBaoShopService.getTaoBaoShop(goods.getId(), goods.getSellerId());
if (shop != null) {
@@ -125,7 +135,18 @@
}
extraVO.setDetailUrl("http://apph5.banliapp.com/apppage/goods_img.html?id=" + goodsId);
-
+ ThreadUtil.run(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ scanHistoryV2Service.addScanHistory(uid, acceptData.getDevice(), goods);
+ } catch (CommonGoodsException e) {
+ e.printStackTrace();
+ } catch (ScanHistoryException e) {
+ e.printStackTrace();
+ }
+ }
+ });
break;
case Constant
@@ -133,7 +154,18 @@
JDGoods jdGoods = getJDGoods(Long.parseLong(goodsId));
goodsDetailVO.setGoods(GoodsDetailVOLijinFactory.convertJDGoods(jdGoods, paramsDTO));
extraVO.setDetailUrl("https://in.m.jd.com/product/jieshao/video/" + goodsId + ".html");
-
+ ThreadUtil.run(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ scanHistoryV2Service.addJDScanHistory(uid, acceptData.getDevice(), jdGoods);
+ } catch (CommonGoodsException e) {
+ e.printStackTrace();
+ } catch (ScanHistoryException e) {
+ e.printStackTrace();
+ }
+ }
+ });
break;
case Constant
@@ -141,12 +173,36 @@
PDDGoodsDetail pddGoodsDetail = getPDDGoods(acceptData.getSystem(), Long.parseLong(goodsId), uid);
goodsDetailVO.setGoods(GoodsDetailVOLijinFactory.convertPDDGoods(pddGoodsDetail, paramsDTO));
extraVO.setDetailUrl("http://apph5.banliapp.com/apppage/goods_img_pdd.html?id=" + goodsId);
+ ThreadUtil.run(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ scanHistoryV2Service.addPDDScanHistory(uid, acceptData.getDevice(), pddGoodsDetail);
+ } catch (CommonGoodsException e) {
+ e.printStackTrace();
+ } catch (ScanHistoryException e) {
+ e.printStackTrace();
+ }
+ }
+ });
break;
case Constant
.SOURCE_TYPE_VIP:
VIPGoodsInfo vipGoodsInfo = VipShopApiUtil.getGoodsDetail(goodsId);
goodsDetailVO.setGoods(GoodsDetailVOLijinFactory.convertVIPGoods(vipGoodsInfo, paramsDTO));
+ ThreadUtil.run(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ scanHistoryV2Service.addVIPScanHistory(uid, acceptData.getDevice(), vipGoodsInfo);
+ } catch (CommonGoodsException e) {
+ e.printStackTrace();
+ } catch (ScanHistoryException e) {
+ e.printStackTrace();
+ }
+ }
+ });
break;
case Constant
@@ -159,6 +215,20 @@
extraVO.setDetailUrl("http://apph5.banliapp.com/apppage/goods_img_suning.html?id="
+ suningGoodsInfo.getCommodityInfo().getCommodityCode() + "&supplierCode="
+ suningGoodsInfo.getCommodityInfo().getSupplierCode());
+
+ ThreadUtil.run(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ scanHistoryV2Service.addSuningScanHistory(uid, acceptData.getDevice(), suningGoodsInfo);
+ } catch (CommonGoodsException e) {
+ e.printStackTrace();
+ } catch (ScanHistoryException e) {
+ e.printStackTrace();
+ }
+ }
+ });
+
break;
}
--
Gitblit v1.8.0