From 8ce7c720e4e7a604b0ff770349b5556f39d37759 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 九月 2021 11:44:38 +0800
Subject: [PATCH] 好省呗应用兼容

---
 fanli/src/main/java/com/yeshi/fanli/lijin/manager/GoodsLijinMnager.java |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 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 be0268b..1c5aaa2 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
@@ -136,7 +136,7 @@
     }
 
 
-    public GoodsDetailVO loadTBMoneyInfo(SystemEnum system, Long uid, TaoBaoGoodsBrief goodsBrief, GoodsDetailVO detailVO,boolean detail) {
+    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;
@@ -146,7 +146,7 @@
         }
         for (TaoBaoGoodsBrief goods : goodsBriefs) {
             try {
-                loadTBMoneyInfo(system, lijinMap, goods, detailVO,detail);
+                loadTBMoneyInfo(system, lijinMap, goods, detailVO, detail);
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -155,7 +155,7 @@
     }
 
 
-    public List<GoodsDetailVO> loadTBMoneyInfo(SystemEnum system, Long uid, List<TaoBaoGoodsBrief> goodsBriefList, GoodsMoneyConfigParamsDTO paramsDTO,boolean detail) {
+    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);
@@ -165,7 +165,7 @@
         for (TaoBaoGoodsBrief goods : goodsBriefList) {
             try {
                 GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO);
-                loadTBMoneyInfo(system, lijinMap, goods, detailVO,detail);
+                loadTBMoneyInfo(system, lijinMap, goods, detailVO, detail);
                 voList.add(detailVO);
             } catch (Exception e) {
                 e.printStackTrace();
@@ -181,7 +181,7 @@
     }
 
 
-    private List<GoodsDetailVOWithKey> loadTBMoneyInfo(SystemEnum system, Long uid, List<TaoBaoGoodsBrief> goodsBriefList, List<String> goodsKeyList, GoodsMoneyConfigParamsDTO paramsDTO,boolean detail) {
+    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) {
@@ -193,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,detail);
+                loadTBMoneyInfo(system, lijinMap, goodsBriefList.get(i), detailVO, detail);
                 voList.add(new GoodsDetailVOWithKey(detailVO, goodsKeyList.get(i)));
             } catch (Exception e) {
                 e.printStackTrace();
@@ -210,7 +210,7 @@
 
         boolean hasCreateTime = false;
         BigDecimal fanliRate = null;
-        if (system == SystemEnum.yhqjx) {
+        if (system == SystemEnum.yhqjx || system == SystemEnum.hsb) {
             fanliRate = getFanLiRate(uid);
             hasCreateTime = true;
         }
@@ -268,7 +268,7 @@
             return null;
 
         BigDecimal fanliRate = null;
-        if (system == SystemEnum.yhqjx) {
+        if (system == SystemEnum.yhqjx || system == SystemEnum.hsb) {
             fanliRate = getFanLiRate(uid);
         }
 
@@ -312,7 +312,7 @@
             }
         }
         GoodsDetailVO[] vos = new GoodsDetailVO[positionMap.size()];
-        List<GoodsDetailVOWithKey> tbVOList = loadTBMoneyInfo(system, uid, taoBaoGoodsBriefList, tbKeyList, paramsDTO,false);
+        List<GoodsDetailVOWithKey> tbVOList = loadTBMoneyInfo(system, uid, taoBaoGoodsBriefList, tbKeyList, paramsDTO, false);
         List<GoodsDetailVO> otherVOList = loadOtherMoneyInfo(system, uid, otherGoodsList, paramsDTO);
 
         for (GoodsDetailVOWithKey vo : tbVOList) {
@@ -423,7 +423,7 @@
     }
 
 
-    public GoodsHongBaoListVO.UserLevelVO getUserLevel(VIPEnum vipRank, boolean fanli) {
+    public GoodsHongBaoListVO.UserLevelVO getUserLevel(SystemEnum system, VIPEnum vipRank, boolean fanli) {
         GoodsHongBaoListVO.UserLevelVO userLevelVO = new GoodsHongBaoListVO.UserLevelVO();
         userLevelVO.setVipRank(vipRank.name());
         if (vipRank == VIPEnum.silver) {
@@ -432,7 +432,7 @@
             } else {
                 userLevelVO.setDesc("閾傞噾浼氬憳鍏嶅箍鍛婏紝绀奸噾绾㈠寘鎻愰珮216%");
             }
-            userLevelVO.setLink(configService.getValue(ConfigKeyEnum.lijinVIPLink, SystemEnum.yhqjx));
+            userLevelVO.setLink(configService.getValue(ConfigKeyEnum.lijinVIPLink, system));
         }
         return userLevelVO;
     }

--
Gitblit v1.8.0