From e75b0d79535a6bcd147cca4a54632b70b42afdb9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 29 五月 2021 18:10:18 +0800
Subject: [PATCH] 特价完善

---
 fanli/src/main/java/com/yeshi/fanli/lijin/manager/GoodsLijinMnager.java |   22 +++++++++-------------
 1 files changed, 9 insertions(+), 13 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 e47afd9..0d1f60f 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
@@ -43,28 +43,32 @@
 import com.yeshi.fanli.lijin.vo.GoodsDetailVO.*;
 import org.yeshi.utils.MoneyBigDecimalUtil;
 
+import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.*;
 
 @Component
 public class GoodsLijinMnager {
 
-    @Reference(version = "1.0",check = false)
+    @Reference(version = "1.0", check = false)
     private LijinCreateService lijinCreateService;
 
-    @Reference(version = "1.0",check = false)
+    @Reference(version = "1.0", check = false)
     private VipCenterService vipCenterService;
 
-    @Reference(version = "1.0",check = false)
+    @Reference(version = "1.0", check = false)
     private VipGradePotenceService vipGradePotenceService;
 
 
-    @Reference(version = "1.0",check = false)
+    @Reference(version = "1.0", check = false)
     private VipGradeService vipGradeService;
 
 
     @Reference(version = "1.0", check = false)
     private LiJinLinkService liJinLinkService;
+
+    @Resource
+    private UserLijinMnager userLijinMnager;
 
 
     private String getUid(Long uid) {
@@ -384,21 +388,13 @@
      */
     public BigDecimal getFanLiRate(Long uid) {
         //鍔犺浇杩斿埄淇℃伅
-        VIPEnum rank = getVIPRank(uid);
+        VIPEnum rank = userLijinMnager.getVIPRank(uid);
         VipGradePotence potence = vipGradePotenceService.getPotenceByVipEnum(rank);
         //鑾峰彇杩斿埄姣斾緥
         BigDecimal fanliRate = potence.getRebatePercent();
         return fanliRate;
     }
 
-    public VIPEnum getVIPRank(Long uid) {
-        VIPEnum rank = null;
-        if (uid != null)
-            rank = vipCenterService.getVIPEnumByUid(getUid(uid));
-        if (rank == null)
-            rank = vipGradeService.getDefaultGrade().getIdentity();
-        return rank;
-    }
 
     public GoodsHongBaoListVO.UserLevelVO getUserLevel(VIPEnum vipRank) {
         GoodsHongBaoListVO.UserLevelVO userLevelVO = new GoodsHongBaoListVO.UserLevelVO();

--
Gitblit v1.8.0