Kirin há 3 anos atrás
pai
commit
9a9d94fa7f

+ 9 - 9
app/api/controller/AuthController.php

@@ -241,15 +241,15 @@ class AuthController
             if (!$spread) return app('json')->fail('邀请码不存在');
         }
         if ($phone) {
-            if (!$captcha) {
-                return app('json')->fail('请输入验证码');
-            }
-            $verifyCode = CacheService::get('code_' . $phone);
-            if (!$verifyCode)
-                return app('json')->fail('请先获取验证码');
-            $verifyCode = substr($verifyCode, 0, 6);
-            if ($verifyCode != $captcha)
-                return app('json')->fail('验证码错误');
+//            if (!$captcha) {
+//                return app('json')->fail('请输入验证码');
+//            }
+//            $verifyCode = CacheService::get('code_' . $phone);
+//            if (!$verifyCode)
+//                return app('json')->fail('请先获取验证码');
+//            $verifyCode = substr($verifyCode, 0, 6);
+//            if ($verifyCode != $captcha)
+//                return app('json')->fail('验证码错误');
         }
         if (!$phone && !$email) {
             return app('json')->fail('请输入对应注册方式的账号');

+ 4 - 2
app/api/controller/user/UserController.php

@@ -730,6 +730,7 @@ class UserController
         $money_type = sys_data('money_type');
         $back = [];
         $like_rmb = 0;
+        $like_usdt = 0;
         foreach ($money_type as $v) {
             $back[$v['code']] = $v;
             $back[$v['code']]['price'] = $back[$v['code']]['price'] > 0 ? $back[$v['code']]['price'] : CashTradeOrder::averagePrice($v['code']);
@@ -753,11 +754,12 @@ class UserController
                     $back[$k]['up'] = $vv['up'];
                     $back[$k]['rmb'] = bcmul($back[$k]['money']['money'], $back[$k]['price'], 2);
                     $like_rmb += $back[$k]['rmb'];
+                    $like_usdt += $back[$k]['usdt'];
                 }
             }
         }
-        $like_usdt = 0;
-        if (isset($usdt_price) && $usdt_price > 0) $like_usdt = bcdiv($like_rmb, $usdt_price, 8);
+//        $like_usdt = 0;
+//        if (isset($usdt_price) && $usdt_price > 0) $like_usdt = bcdiv($like_rmb, $usdt_price, 8);
         return app('json')->success('ok', compact('back', 'like_rmb', 'like_usdt'));
     }
 

+ 5 - 5
app/models/mining/UserMiningMachine.php

@@ -193,10 +193,10 @@ class UserMiningMachine extends BaseModel
             if ($ratio <= 0) {
                 $spread = User::getUserInfo($spread['spread_uid']);
             } else {
-                $brokerage = bcmul($num, bcdiv($ratio, 100, 4), 3);
-                if (bcsub($brokerage, $send, 3) > 0) {
+                $brokerage = bcmul($num, bcdiv($ratio, 100, 4), 5);
+                if (bcsub($brokerage, $send, 5) > 0) {
                     $v = UserLevel::getUserLevelInfo(UserLevel::getUserLevel($spread['uid']), 'level_id');
-                    $res = $res && UserMoney::incomeMoney($spread['uid'], $money_type, bcsub($brokerage, $send, 3), 'group_create_brokerage', '分享算力', '获得分享算力V' . $v . ':' . $user['nickname'] . '(' . $user['uid'] . ')' . '今日矿机收益分红(' . $ratio . '%×' . $num . ')减去已发放级差' . $send . ',合计' . bcsub($brokerage, $send, 3) . init_money_type()[$money_type]);
+                    $res = $res && UserMoney::incomeMoney($spread['uid'], $money_type, bcsub($brokerage, $send, 5), 'group_create_brokerage', '分享算力', '获得分享算力V' . $v . ':' . $user['nickname'] . '(' . $user['uid'] . ')' . '今日矿机收益分红(' . $ratio . '%×' . $num . ')减去已发放级差' . $send . ',合计' . bcsub($brokerage, $send, 5) . init_money_type()[$money_type]);
                 }
                 $send = $brokerage;
                 $spread = User::getUserInfo($spread['spread_uid']);
@@ -210,7 +210,7 @@ class UserMiningMachine extends BaseModel
         $user = User::getUserInfo($uid);
         $ratio = sys_config('system_create_award_ratio', 0);
         if (!$ratio) return true;
-        $brokerage = bcmul($num, bcdiv($ratio, 100, 4), 3);
+        $brokerage = bcmul($num, bcdiv($ratio, 100, 4), 5);
         if ($brokerage <= 0) return true;
         $users = UserLevel::valiWhere()->where(function ($query) {
             $query->where('is_forever', 1)->whereOr('valid_time', '>', time());
@@ -222,7 +222,7 @@ class UserMiningMachine extends BaseModel
         }
         $res = true;
         if (count($users) > 0)
-            $brokerage = bcdiv($brokerage, count($users), 3);
+            $brokerage = bcdiv($brokerage, count($users), 5);
         else
             $brokerage = 0;
         if ($brokerage > 0) {