会员升级

app/controller/api/v1/PublicController.php

@@ -79,12 +79,12 @@ class PublicController extends BaseController
         $pass = [$user['uid']];
         $send = 0;
         $spread = $userService->getUserInfo($user['spread_uid']);
-        while ($spread && !in_array($spread['uid'], $pass) && $spread['is_promoter']) {
+        while ($spread && !in_array($spread['uid'], $pass)) {
             //先发奖，再结算等级
-            $level = $levelServices->getUserLevel($spread['uid'],'*',1718160672);
+            $level = $levelServices->getUserLevel($spread['uid'], '*', 1718160672);
             $ratio = $level['levelInfo']['group_award'] ?? 0;
             $give_action_integral = bcdiv(bcmul(2000, $ratio), 100, 2);
-            if ($give_action_integral > $send) {
+            if ($give_action_integral > $send && $spread['is_promoter']) {
                 $real_send = bcsub($give_action_integral, $send, 2);
                 if ($awardIntegralService->getPaySum($spread['uid']) >= 0 || $awardIntegralService->getHourExtractPaySum($spread['uid'], 24) > 0 || $spread['award_switch']) {
                     $mark = '团队用户' . $user['nickname'] . "({$user['uid']})" . '购买商品，获得团队级差积分' . $real_send;

app/jobs/integral/IntegralJob.php

@@ -85,12 +85,12 @@ class IntegralJob extends BaseJobs
                 $levelServices->detection((int)$user['uid']);
                 $pass = [$user['uid']];
                 $send = 0;
-                while ($spread && !in_array($spread['uid'], $pass) && $spread['is_promoter']) {
+                while ($spread && !in_array($spread['uid'], $pass)) {
                     //先发奖，再结算等级
                     $level = $levelServices->getUserLevel($spread['uid']);
                     $ratio = $level['levelInfo']['group_award'] ?? 0;
                     $give_action_integral = bcdiv(bcmul($total_price, $ratio), 100, 2);
-                    if ($give_action_integral > $send) {
+                    if ($give_action_integral > $send && $spread['is_promoter']) {
                         $real_send = bcsub($give_action_integral, $send, 2);
                         if ($awardIntegralService->getPaySum($spread['uid']) >= 0 || $awardIntegralService->getHourExtractPaySum($spread['uid'], 24) > 0 || $spread['award_switch']) {
                             $extract_sum = bcmul($real_send, $rate, 2);