会员升级

app/jobs/integral/IntegralJob.php

@@ -37,12 +37,12 @@ class IntegralJob extends BaseJobs
                 //添加静态积分
                 $static_integral_ratio = sys_config('static_integral_ratio', 0);
                 $give_static_integral = bcdiv(bcmul($award_price, $static_integral_ratio), 100, 2);
-                if ($give_static_integral > 0) {
-                    $rate = sys_config('static_integral_rate', 3);
-                    $extract_sum = bcmul($award_price, $rate, 2);
-                    $mark = '购买商品，获得静态积分';
-                    $awardIntegralService->incIntegral($order['uid'], $integral_price, $give_static_integral, $total_price, 0, $extract_sum, $order['id'], $mark);
-                }
+//                if ($give_static_integral > 0) {
+                $rate = sys_config('static_integral_rate', 3);
+                $extract_sum = bcmul($award_price, $rate, 2);
+                $mark = '购买商品，获得静态积分';
+                $awardIntegralService->incIntegral($order['uid'], $integral_price, $give_static_integral, $total_price, 0, $extract_sum, $order['id'], $mark);
+//                }
                 //添加奖池
                 $lake_ratio = sys_config('lake_ratio', 0);
                 $add_lake = bcdiv(bcmul($award_price, $lake_ratio), 100, 2);
@@ -58,11 +58,11 @@ class IntegralJob extends BaseJobs
                     if ($awardIntegralService->getPaySum($spread['uid']) >= 1000 || $awardIntegralService->getHourExtractPaySum($spread['uid'], 24) >= 1000) {
                         $award_ratio = sys_config('recommend_integral', 0);
                         $give_action_integral = bcdiv(bcmul($award_price, $award_ratio), 100, 2);
-                        if ($give_action_integral > 0) {
-                            $extract_sum = bcmul($give_action_integral, $rate, 2);
-                            $mark = '推荐用户' . $user['nickname'] . "({$user['uid']})" . '购买商品，获得推荐积分';
-                            $awardIntegralService->incIntegral($spread['uid'], $integral_price, $give_action_integral, $total_price, 1, $extract_sum, $order['id'], $mark);
-                        }
+//                        if ($give_action_integral > 0) {
+                        $extract_sum = bcmul($give_action_integral, $rate, 2);
+                        $mark = '推荐用户' . $user['nickname'] . "({$user['uid']})" . '购买商品，获得推荐积分';
+                        $awardIntegralService->incIntegral($spread['uid'], $integral_price, $give_action_integral, $total_price, 1, $extract_sum, $order['id'], $mark);
+//                        }
                     }
                 }
                 $levelServices->detection((int)$user['uid']);
@@ -73,13 +73,14 @@ class IntegralJob extends BaseJobs
                     $level = $levelServices->getUserLevel($spread['uid']);
                     $ratio = $level['levelInfo']['group_award'] ?? 0;
                     $give_action_integral = bcdiv(bcmul($award_price, $ratio), 100, 2);
-                    if ($give_action_integral > $send) {
-                        $real_send = bcsub($give_action_integral, $send, 2);
-                        $extract_sum = bcmul($real_send, $rate, 2);
-                        $mark = '团队用户' . $user['nickname'] . "({$user['uid']})" . '购买商品，获得团队级差积分';
-                        $awardIntegralService->incIntegral($spread['uid'], $integral_price, $real_send, $total_price, 1, $extract_sum, $order['id'], $mark);
-                        $send = $give_action_integral;
-                    }
+//                    if ($give_action_integral > $send) {
+                    $real_send = bcsub($give_action_integral, $send, 2);
+                    if ($real_send < 0) $real_send = 0;
+                    $extract_sum = bcmul($real_send, $rate, 2);
+                    $mark = '团队用户' . $user['nickname'] . "({$user['uid']})" . '购买商品，获得团队级差积分';
+                    $awardIntegralService->incIntegral($spread['uid'], $integral_price, $real_send, $total_price, 1, $extract_sum, $order['id'], $mark);
+                    if ($real_send > 0) $send = $give_action_integral;
+//                    }
                     $levelServices->detection((int)$spread['uid']);
                     $pass[] = $spread['uid'];
                     $spread = $userService->getUserInfo($spread['spread_uid']);

app/services/user/UserAwardIntegralServices.php

@@ -184,6 +184,7 @@ class UserAwardIntegralServices extends BaseServices
             'mark' => $mark,
             'order_price' => $order_price,
             'add_time' => time(),
+            'status' => $inc_integral > 0 ? 0 : 1,
         ]);
     }