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/service/impl/order/OrderHongBaoMoneyComputeServiceImpl.java |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 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 c70caa4..840fa0c 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) {
+        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) {
+        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) {
+        if (system == SystemEnum.yhqjx||system == SystemEnum.hsb) {
             return new BigDecimal(0);
         }
         BigDecimal rate = null;
@@ -150,7 +150,7 @@
     public BigDecimal computeSecondInviteMoney(CommonOrder order, UserLevelEnum buyer,
                                                List<UserTeamLevel> bossLevelList) {
         SystemEnum system = userInfoService.getUserSystem(order.getUserInfo().getId());
-        if (system == SystemEnum.yhqjx) {
+        if (system == SystemEnum.yhqjx||system == SystemEnum.hsb) {
             return new BigDecimal(0);
         }
         BigDecimal rate = null;
@@ -187,7 +187,7 @@
      * @Description:
      */
     private BigDecimal getOfficialSubsidyRate(Date date, UserLevelEnum userLevel, boolean share, SystemEnum system) {
-        if (system == SystemEnum.yhqjx) {
+        if (system == SystemEnum.yhqjx||system == SystemEnum.hsb) {
             return new BigDecimal(0);
         }
         String key = null;
@@ -205,7 +205,7 @@
     }
 
     private BigDecimal getRateByLevel(UserLevelEnum level, Date date, SystemEnum system) {
-        if (system == SystemEnum.yhqjx) {
+        if (system == SystemEnum.yhqjx||system == SystemEnum.hsb) {
             return new BigDecimal(0);
         }
         BigDecimal baseRate = hongBaoManageService.getBaseFanliRateCache(
@@ -219,7 +219,7 @@
     @Override
     public UserTeamRate getTeamRewardRate(UserLevelEnum buyerLevel, List<UserTeamLevel> bossLevelList, Date date,
                                           int deep, SystemEnum system) {
-        if (system == SystemEnum.yhqjx) {
+        if (system == SystemEnum.yhqjx||system == SystemEnum.hsb) {
             return null;
         }
         if (deep == 1) {// 鐩存帴閭�璇蜂汉濂栭噾
@@ -286,7 +286,7 @@
     @Override
     public List<UserTeamRate> getTeamRewardMoreThan2LevelRates(UserLevelEnum buyerLevel,
                                                                List<UserTeamLevel> bossLevelList, Date date, SystemEnum system) {
-        if (system == SystemEnum.yhqjx) {
+        if (system == SystemEnum.yhqjx||system == SystemEnum.hsb) {
             return null;
         }
         if (bossLevelList == null || bossLevelList.size() < 3)
@@ -321,7 +321,7 @@
     @Override
     public List<UserTeamRate> getTeamDividentsRates(UserLevelEnum buyerLevel, List<UserTeamLevel> bossLevelList,
                                                     Date date, SystemEnum system) {
-        if (system == SystemEnum.yhqjx) {
+        if (system == SystemEnum.yhqjx||system == SystemEnum.hsb) {
             return null;
         }
         List<UserTeamRate> rateList = new ArrayList<>();

--
Gitblit v1.8.0