会员升级

app/dao/user/UserExchangeDao.php

@@ -51,6 +51,12 @@ class UserExchangeDao extends BaseDao
         })->order('id desc')->select()->toArray();
     }
 
+
+    public function getLastOne(int $uid)
+    {
+        return $this->search(['uid' => $uid])->order('id desc')->find();
+    }
+
     /**
      * 获取某个条件的提现总和
      * @param array $where
@@ -138,7 +144,7 @@ class UserExchangeDao extends BaseDao
                 } elseif ($where['timeKey']['days'] > 30 && $where['timeKey']['days'] < 365) {
                     $timeUinx = "%Y-%m";
                 } else {
-					$timeUinx = "%Y-%m";
+                    $timeUinx = "%Y-%m";
                 }
                 $query->field("sum($field) as number,FROM_UNIXTIME($group, '$timeUinx') as time");
                 $query->group("FROM_UNIXTIME($group, '$timeUinx')");

app/jobs/integral/IntegralJob.php

@@ -56,7 +56,7 @@ class IntegralJob extends BaseJobs
                 //推荐奖
                 $rate = sys_config('action_integral_rate', 3);
                 $spread = $userService->getUserInfo($user['spread_uid']);
-                if ($spread) {
+                if ($spread && $spread['is_promoter']) {
                     if ($awardIntegralService->getPaySum($spread['uid']) >= 1000 || $awardIntegralService->getHourExtractPaySum($spread['uid'], 24) >= 1000) {
                         $award_ratio = sys_config('recommend_integral', 0);
                         if ($awardIntegralService->reOrder($user['uid'], $order['id'])) {
@@ -84,7 +84,7 @@ class IntegralJob extends BaseJobs
                 $levelServices->detection((int)$user['uid']);
                 $pass = [$user['uid']];
                 $send = 0;
-                while ($spread && !in_array($spread['uid'], $pass)) {
+                while ($spread && !in_array($spread['uid'], $pass) && $spread['is_promoter']) {
                     //先发奖，再结算等级
                     $level = $levelServices->getUserLevel($spread['uid']);
                     $ratio = $level['levelInfo']['group_award'] ?? 0;

app/services/user/UserExchangeServices.php

@@ -314,6 +314,7 @@ class UserExchangeServices extends BaseServices
         $data['minEnergy'] = sys_config('user_exchange_min_energy');//提现最低金额
         $data['exchange_fee'] = sys_config('exchange_fee');//提现手续费
         $data['stock_price'] = sys_config('stock_price');//提现手续费
+        $data['bank'] = $this->dao->getLastOne($uid);
         return $data;
     }