From e257a2834bf7b62af5c5c96f9b0b21fac92f2196 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 24 七月 2021 18:31:02 +0800
Subject: [PATCH] jumpdetail分system
---
fanli/src/main/java/com/yeshi/fanli/lijin/manager/GoodsLijinMnager.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/lijin/manager/GoodsLijinMnager.java b/fanli/src/main/java/com/yeshi/fanli/lijin/manager/GoodsLijinMnager.java
index 5e1f182..be0268b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/lijin/manager/GoodsLijinMnager.java
+++ b/fanli/src/main/java/com/yeshi/fanli/lijin/manager/GoodsLijinMnager.java
@@ -114,7 +114,7 @@
}
- private void loadTBMoneyInfo(SystemEnum system, Map<String, MoneyInfo> lijinMap, TaoBaoGoodsBrief goods, GoodsDetailVO detailVO) {
+ private void loadTBMoneyInfo(SystemEnum system, Map<String, MoneyInfo> lijinMap, TaoBaoGoodsBrief goods, GoodsDetailVO detailVO, boolean detail) {
if (SystemInfoUtil.hasFunctions(system, SystemFunction.lijinSub)) {
//璁剧疆绀奸噾
MoneyInfo moneyInfo = lijinMap.get(goods.getAuctionId() + "");
@@ -123,7 +123,8 @@
BigDecimal finalPrice = null;
if (moneyInfo != null && moneyInfo.getLijinAmount() != null) {//鏈夌ぜ閲�
detailVO.getMoneyInfo().setHongBaoMoney("楼" + moneyInfo.getLijinAmount());
- detailVO.getMoneyInfo().setFanliMoney(null);
+ if (!detail)
+ detailVO.getMoneyInfo().setFanliMoney(null);
finalPrice = couponPrice.subtract(moneyInfo.getLijinAmount());
} else {//鏃犵ぜ閲�
finalPrice = couponPrice.subtract(moneyInfo.getFanliAmount() == null ? new BigDecimal(0) : moneyInfo.getFanliAmount());
@@ -135,7 +136,7 @@
}
- public GoodsDetailVO loadTBMoneyInfo(SystemEnum system, Long uid, TaoBaoGoodsBrief goodsBrief, GoodsDetailVO detailVO) {
+ public GoodsDetailVO loadTBMoneyInfo(SystemEnum system, Long uid, TaoBaoGoodsBrief goodsBrief, GoodsDetailVO detailVO,boolean detail) {
List<TaoBaoGoodsBrief> goodsBriefs = new ArrayList<>();
goodsBriefs.add(goodsBrief);
Map<String, MoneyInfo> lijinMap = null;
@@ -145,7 +146,7 @@
}
for (TaoBaoGoodsBrief goods : goodsBriefs) {
try {
- loadTBMoneyInfo(system, lijinMap, goods, detailVO);
+ loadTBMoneyInfo(system, lijinMap, goods, detailVO,detail);
} catch (Exception e) {
e.printStackTrace();
}
@@ -154,7 +155,7 @@
}
- public List<GoodsDetailVO> loadTBMoneyInfo(SystemEnum system, Long uid, List<TaoBaoGoodsBrief> goodsBriefList, GoodsMoneyConfigParamsDTO paramsDTO) {
+ public List<GoodsDetailVO> loadTBMoneyInfo(SystemEnum system, Long uid, List<TaoBaoGoodsBrief> goodsBriefList, GoodsMoneyConfigParamsDTO paramsDTO,boolean detail) {
Map<String, MoneyInfo> lijinMap = null;
if (SystemInfoUtil.hasFunctions(system, SystemFunction.lijinSub)) {
loadMaterialLibsType(goodsBriefList);
@@ -164,7 +165,7 @@
for (TaoBaoGoodsBrief goods : goodsBriefList) {
try {
GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO);
- loadTBMoneyInfo(system, lijinMap, goods, detailVO);
+ loadTBMoneyInfo(system, lijinMap, goods, detailVO,detail);
voList.add(detailVO);
} catch (Exception e) {
e.printStackTrace();
@@ -180,7 +181,7 @@
}
- private List<GoodsDetailVOWithKey> loadTBMoneyInfo(SystemEnum system, Long uid, List<TaoBaoGoodsBrief> goodsBriefList, List<String> goodsKeyList, GoodsMoneyConfigParamsDTO paramsDTO) {
+ private List<GoodsDetailVOWithKey> loadTBMoneyInfo(SystemEnum system, Long uid, List<TaoBaoGoodsBrief> goodsBriefList, List<String> goodsKeyList, GoodsMoneyConfigParamsDTO paramsDTO,boolean detail) {
Map<String, MoneyInfo> lijinMap = null;
boolean hasCreateTime = false;
if (SystemInfoUtil.hasFunctions(system, SystemFunction.lijinSub) && goodsBriefList.size() > 0) {
@@ -192,7 +193,7 @@
for (int i = 0; i < goodsBriefList.size(); i++) {
try {
GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(goodsBriefList.get(i), paramsDTO);
- loadTBMoneyInfo(system, lijinMap, goodsBriefList.get(i), detailVO);
+ loadTBMoneyInfo(system, lijinMap, goodsBriefList.get(i), detailVO,detail);
voList.add(new GoodsDetailVOWithKey(detailVO, goodsKeyList.get(i)));
} catch (Exception e) {
e.printStackTrace();
@@ -311,7 +312,7 @@
}
}
GoodsDetailVO[] vos = new GoodsDetailVO[positionMap.size()];
- List<GoodsDetailVOWithKey> tbVOList = loadTBMoneyInfo(system, uid, taoBaoGoodsBriefList, tbKeyList, paramsDTO);
+ List<GoodsDetailVOWithKey> tbVOList = loadTBMoneyInfo(system, uid, taoBaoGoodsBriefList, tbKeyList, paramsDTO,false);
List<GoodsDetailVO> otherVOList = loadOtherMoneyInfo(system, uid, otherGoodsList, paramsDTO);
for (GoodsDetailVOWithKey vo : tbVOList) {
--
Gitblit v1.8.0