Explorar o código

feature/NG-28: Adjusting Service Award Settlement.

kevin hai 1 ano
pai
achega
ed5c8a6670
Modificáronse 1 ficheiros con 30 adicións e 29 borrados
  1. 30 29
      common/helpers/bonus/CalcServeBonusCalc.php

+ 30 - 29
common/helpers/bonus/CalcServeBonusCalc.php

@@ -579,7 +579,6 @@ class CalcServeBonusCalc extends BaseObject {
                 LoggerTool::debug(json_encode(['FWBonusPerfData-P1', $userId]));
                 // 从缓存中获取会员的业绩信息
                 $perfData = CalcCache::nowPeriodPerf($userId, $periodNum);
-LoggerTool::debug(json_encode(['FWBonusPerfData-P2', $userId, $perfData]));
                 if( !$perfData ) continue;
 
                 // 服务奖来源
@@ -596,36 +595,38 @@ LoggerTool::debug(json_encode(['FWBonusPerfData-P2', $userId, $perfData]));
                     unset($orderType, $orderTypeName, $orderTypeValue, $coefficientName, $coefficient);
                 }
                 unset($perfData, $decRoleBonusFrom);
+                LoggerTool::debug(json_encode(['FWBonusPerfData-P2', $userId, $validPvPcs]));
                 if ( $validPvPcs <= 0 ) continue;
 
-                $this->loopRelationDecDo($userId, function ($bonusUserId) use($userId, $validPvPcs) {
-                    //判断报单中心级别 和 服务奖比例
-                    //计算级别之后更新过userInfo的缓存,缓存中级别发生了变化
-                    $bonusUserInfo = CalcCache::getUserInfo($bonusUserId, $this->_periodNum);
-                    $isDec = $bonusUserInfo['IS_DEC'];
-                    if($isDec == 0) return self::LOOP_CONTINUE;
-                    $decRoleId = $bonusUserInfo['DEC_ROLE_ID'];
-                    if( !$decRoleId ) return self::LOOP_CONTINUE;
-                    if( !isset($this->_decRoleConfig[$decRoleId]) ) return self::LOOP_CONTINUE;
-
-                    $parentDecRoleLevel = $this->_decRoleConfig[$decRoleId];
-                    $parentFwBonusPercent = $parentDecRoleLevel['FW_BONUS_PERCENT'] ?? 0;
-                    $cacheMaxPercent = CalcCache::fwMaxBonusPercent($userId, $this->_periodNum);
-                    $diffPercent = $parentFwBonusPercent - $cacheMaxPercent;
-                    if( $diffPercent <= 0 ) return self::LOOP_CONTINUE;
-
-                    $fwBonus = $validPvPcs * $diffPercent / 100;
-                    if( $fwBonus <= 0  ) return self::LOOP_CONTINUE;
-
-                    //给本人添加服务奖比例
-                    CalcCache::fwMaxBonusPercent($userId, $this->_periodNum, $parentFwBonusPercent);
-                    //记录奖金和奖金来源到缓存 并实现在缓存中奖金累加
-                    CalcCache::saveFwBonusList($bonusUserId, $this->_periodNum, $fwBonus, ['fromUid'=>$userId, 'fromPvPcs'=>$validPvPcs]);
-                    CalcCache::addHasFwBonusUsers($bonusUserId, $this->_periodNum);
-
-                    //达到最大的比例就不在向上找了
-                    unset($bonusUserId, $bonusUserInfo, $isDec, $decRoleId, $parentDecRoleLevel, $parentFwBonusPercent, $cacheMaxPercent, $diffPercent, $fwBonus);
-                });
+                // 会员被报单时的报单中心
+                $bonusUserId = DecOrder::find()->where('TO_USER_ID=:TO_USER_ID', [':TO_USER_ID' => $userId])->select('DEC_ID')->orderBy('CREATED_AT DESC')->scalar();
+
+                //判断报单中心级别 和 服务奖比例
+                //计算级别之后更新过userInfo的缓存,缓存中级别发生了变化
+                $bonusUserInfo = CalcCache::getUserInfo($bonusUserId, $this->_periodNum);
+                $isDec = $bonusUserInfo['IS_DEC'];
+                if($isDec == 0) return self::LOOP_CONTINUE;
+                $decRoleId = $bonusUserInfo['DEC_ROLE_ID'];
+                if( !$decRoleId ) return self::LOOP_CONTINUE;
+                if( !isset($this->_decRoleConfig[$decRoleId]) ) return self::LOOP_CONTINUE;
+
+                $parentDecRoleLevel = $this->_decRoleConfig[$decRoleId];
+                $parentFwBonusPercent = $parentDecRoleLevel['FW_BONUS_PERCENT'] ?? 0;
+                $cacheMaxPercent = CalcCache::fwMaxBonusPercent($userId, $this->_periodNum);
+                $diffPercent = $parentFwBonusPercent - $cacheMaxPercent;
+                if( $diffPercent <= 0 ) return self::LOOP_CONTINUE;
+
+                $fwBonus = $validPvPcs * $diffPercent / 100;
+                if( $fwBonus <= 0  ) return self::LOOP_CONTINUE;
+
+                //给本人添加服务奖比例
+                CalcCache::fwMaxBonusPercent($bonusUserId, $this->_periodNum, $parentFwBonusPercent);
+                //记录奖金和奖金来源到缓存 并实现在缓存中奖金累加
+                CalcCache::saveFwBonusList($bonusUserId, $this->_periodNum, $fwBonus, ['fromUid'=>$userId, 'fromPvPcs'=>$validPvPcs]);
+                CalcCache::addHasFwBonusUsers($bonusUserId, $this->_periodNum);
+
+                //达到最大的比例就不在向上找了
+                unset($bonusUserId, $bonusUserInfo, $isDec, $decRoleId, $parentDecRoleLevel, $parentFwBonusPercent, $cacheMaxPercent, $diffPercent, $fwBonus);
 
                 unset($userId, $validPvPcs);
             }