From 512f368d7d8e71ee72a8f71dd7d2146f4c64f774 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 02 六月 2021 18:54:58 +0800
Subject: [PATCH] 特价相关bug修改

---
 fanli/src/main/java/com/yeshi/fanli/lijin/manager/GoodsLijinMnager.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 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 0d1f60f..68f3d84 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
@@ -166,9 +166,11 @@
 
     private List<GoodsDetailVOWithKey> loadTBMoneyInfo(SystemEnum system, Long uid, List<TaoBaoGoodsBrief> goodsBriefList, List<String> goodsKeyList, GoodsMoneyConfigParamsDTO paramsDTO) {
         Map<String, MoneyInfo> lijinMap = null;
+        boolean hasCreateTime = false;
         if (SystemInfoUtil.hasFunctions(system, SystemFunction.lijinSub)) {
             loadMaterialLibsType(goodsBriefList);
             lijinMap = getTBLijinList(uid, goodsBriefList);
+            hasCreateTime = true;
         }
         List<GoodsDetailVOWithKey> voList = new ArrayList<>();
         for (int i = 0; i < goodsBriefList.size(); i++) {
@@ -189,9 +191,11 @@
         if (goodsList == null || goodsList.size() == 0)
             return voList;
 
+        boolean hasCreateTime = false;
         BigDecimal fanliRate = null;
         if (system == SystemEnum.yhqjx) {
             fanliRate = getFanLiRate(uid);
+            hasCreateTime = true;
         }
 
         BigDecimal couponPrice = null;
@@ -306,8 +310,14 @@
         }
 
         for (GoodsDetailVO vo : otherVOList) {
-            int p = positionMap.get(vo.getGoodsId() + "#" + vo.getGoodsType() + "#" + vo.getId());
+            String goodsId = vo.getGoodsId();
+            if (goodsId.contains("-"))
+                goodsId = goodsId.split("-")[1];
+            Integer p = positionMap.get(goodsId + "#" + vo.getGoodsType() + "#" + vo.getId());
+//            if (p != null)
             vos[p] = vo;
+//            else
+//                System.out.println(vo);
         }
 
         List<GoodsDetailVO> finalList = new ArrayList<>();

--
Gitblit v1.8.0