Просмотр исходного кода

小组业绩是推荐 relation

root 3 лет назад
Родитель
Сommit
48521cdd7d
2 измененных файлов с 5 добавлено и 2 удалено
  1. 4 1
      common/helpers/bonus/BonusCalc.php
  2. 1 1
      common/helpers/bonus/PerfCalc.php

+ 4 - 1
common/helpers/bonus/BonusCalc.php

@@ -955,7 +955,7 @@ class BonusCalc extends BaseObject {
                 // 如果用户不活跃,且上面没有活跃的,则不累计了,是不是
                 if (!$isActive) {
                     // 如果此店铺不活跃,则找最近的一个店铺获得此奖
-                    $this->loopNetworkParentDo($userId, function ($parent) use (&$bonusUserId) {
+                    $this->loopRelationParentDo($userId, function ($parent) use (&$bonusUserId) {
                         if ($this->_isMonthPerfLimit($parent['PARENT_UID'])) {
                             // 判断是否是店铺
                             $parentUser = CalcCache::getUserInfo($parent['PARENT_UID'], $this->_periodNum);
@@ -1027,6 +1027,9 @@ class BonusCalc extends BaseObject {
             foreach ($allData as $userId) {
                 $storeBonus = $this->verifyStorePerf($userId);
                 if (empty($storeBonus)) continue;
+                // 未开启紧缩,不活跃,则不发放了
+                $isActive = $this->_isMonthPerfLimit($userId);
+                if (!$isActive) continue;
                 $surplus = $storeBonus;
                 $manageTax = $reConsumePoints = '0.000';
                 $deductData = [];

+ 1 - 1
common/helpers/bonus/PerfCalc.php

@@ -1226,7 +1226,7 @@ class PerfCalc {
                     ]);
                 } else {
                     // 如果此用户不是店铺,继续上找到店铺并累加上去PV
-                    $this->loopNetworkParentDo($userId, function ($parent) use (&$everyData) {
+                    $this->loopRelationParentDo($userId, function ($parent) use (&$everyData) {
                         $parentUser = CalcCache::getUserInfo($parent['PARENT_UID'], $this->_periodNum);
                         $userNetWork = CalcCache::getUserNetWorkNewInfo($parent['PARENT_UID'], $this->_periodNum);
                         $isStudio = $parentUser['IS_STUDIO'] == 1 ? true : false;