From 30d8e227e8d823b6c38c3b9c90ac2df03b63befe Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 25 二月 2025 16:41:22 +0800
Subject: [PATCH] 淘宝转链接口更新

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderHongBaoMoneyComputeServiceImpl.java |   23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderHongBaoMoneyComputeServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderHongBaoMoneyComputeServiceImpl.java
index 840fa0c..c3020ec 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderHongBaoMoneyComputeServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderHongBaoMoneyComputeServiceImpl.java
@@ -73,7 +73,7 @@
     public BigDecimal computeFanliMoney(CommonOrder order, UserLevelEnum userLevel) {
         SystemEnum system = userInfoService.getUserSystem(order.getUserInfo().getId());
         BigDecimal rate = null;
-        if (system == SystemEnum.yhqjx||system == SystemEnum.hsb) {
+        if (system == SystemEnum.yhqjx || system == SystemEnum.hsb) {
             rate = userLijinMnager.getUserFanliRate(order.getUserInfo().getId(), order.getThirdCreateTime());
         } else {
             rate = hongBaoManageService.getBaseFanliRate(order.getThirdCreateTime().getTime(), system)
@@ -97,7 +97,7 @@
     public BigDecimal computeShareMoney(CommonOrder order, UserLevelEnum userLevel) {
         SystemEnum system = userInfoService.getUserSystem(order.getUserInfo().getId());
 
-        if (system == SystemEnum.yhqjx||system == SystemEnum.hsb) {
+        if (system == SystemEnum.yhqjx || system == SystemEnum.hsb) {
             return new BigDecimal(0);
         }
 
@@ -121,7 +121,7 @@
     public BigDecimal computeFirstInviteMoney(CommonOrder order, UserLevelEnum buyer,
                                               List<UserTeamLevel> bossLevelList) {
         SystemEnum system = userInfoService.getUserSystem(order.getUserInfo().getId());
-        if (system == SystemEnum.yhqjx||system == SystemEnum.hsb) {
+        if (system == SystemEnum.yhqjx || system == SystemEnum.hsb) {
             return new BigDecimal(0);
         }
         BigDecimal rate = null;
@@ -150,12 +150,15 @@
     public BigDecimal computeSecondInviteMoney(CommonOrder order, UserLevelEnum buyer,
                                                List<UserTeamLevel> bossLevelList) {
         SystemEnum system = userInfoService.getUserSystem(order.getUserInfo().getId());
-        if (system == SystemEnum.yhqjx||system == SystemEnum.hsb) {
+        if (system == SystemEnum.yhqjx || system == SystemEnum.hsb) {
             return new BigDecimal(0);
         }
         BigDecimal rate = null;
         if (order.getThirdCreateTime().getTime() >= Constant.NEW_ORDER_FANLI_RULE_TIME) {
-            rate = getTeamRewardRate(buyer, bossLevelList, order.getThirdCreateTime(), 2, system).getRate();
+            UserTeamRate teamRate = getTeamRewardRate(buyer, bossLevelList, order.getThirdCreateTime(), 2, system);
+            if (teamRate != null) {
+                rate = teamRate.getRate();
+            }
             if (rate == null)
                 return null;
             if (order.getState() == CommonOrder.STATE_JS || order.getState() == CommonOrder.STATE_WQ)
@@ -187,7 +190,7 @@
      * @Description:
      */
     private BigDecimal getOfficialSubsidyRate(Date date, UserLevelEnum userLevel, boolean share, SystemEnum system) {
-        if (system == SystemEnum.yhqjx||system == SystemEnum.hsb) {
+        if (system == SystemEnum.yhqjx || system == SystemEnum.hsb) {
             return new BigDecimal(0);
         }
         String key = null;
@@ -205,7 +208,7 @@
     }
 
     private BigDecimal getRateByLevel(UserLevelEnum level, Date date, SystemEnum system) {
-        if (system == SystemEnum.yhqjx||system == SystemEnum.hsb) {
+        if (system == SystemEnum.yhqjx || system == SystemEnum.hsb) {
             return new BigDecimal(0);
         }
         BigDecimal baseRate = hongBaoManageService.getBaseFanliRateCache(
@@ -219,7 +222,7 @@
     @Override
     public UserTeamRate getTeamRewardRate(UserLevelEnum buyerLevel, List<UserTeamLevel> bossLevelList, Date date,
                                           int deep, SystemEnum system) {
-        if (system == SystemEnum.yhqjx||system == SystemEnum.hsb) {
+        if (system == SystemEnum.yhqjx || system == SystemEnum.hsb) {
             return null;
         }
         if (deep == 1) {// 鐩存帴閭�璇蜂汉濂栭噾
@@ -286,7 +289,7 @@
     @Override
     public List<UserTeamRate> getTeamRewardMoreThan2LevelRates(UserLevelEnum buyerLevel,
                                                                List<UserTeamLevel> bossLevelList, Date date, SystemEnum system) {
-        if (system == SystemEnum.yhqjx||system == SystemEnum.hsb) {
+        if (system == SystemEnum.yhqjx || system == SystemEnum.hsb) {
             return null;
         }
         if (bossLevelList == null || bossLevelList.size() < 3)
@@ -321,7 +324,7 @@
     @Override
     public List<UserTeamRate> getTeamDividentsRates(UserLevelEnum buyerLevel, List<UserTeamLevel> bossLevelList,
                                                     Date date, SystemEnum system) {
-        if (system == SystemEnum.yhqjx||system == SystemEnum.hsb) {
+        if (system == SystemEnum.yhqjx || system == SystemEnum.hsb) {
             return null;
         }
         List<UserTeamRate> rateList = new ArrayList<>();

--
Gitblit v1.8.0