理财

app/admin/model/user/UserExtract.php

@@ -10,6 +10,7 @@ namespace app\admin\model\user;
 
 use app\admin\model\wechat\WechatUser;
 use app\models\routine\RoutineTemplate;
+use app\models\user\UserMoney;
 use think\facade\Route as Url;
 use crmeb\traits\ModelTrait;
 use crmeb\basic\BaseModel;
@@ -86,35 +87,38 @@ class UserExtract extends BaseModel
         $fail_time = time();
         $data = self::get($id);
         $extract_number = $data['extract_price'];
-        $mark = '提现失败,退回佣金' . $extract_number . '元';
+        $mark = '提现失败,退回' . init_money_type()[$data['money_type']] . $extract_number;
+        $mark2 = '提现失败,退回手续费' . init_money_type()[$data['service_type']] . $data['service'];
         $uid = $data['uid'];
         $status = -1;
-        $User = User::where('uid', $uid)->find()->toArray();
-        UserBill::income('提现失败', $uid, 'now_money', 'extract', $extract_number, $id, bcadd($User['now_money'], $extract_number, 2), $mark);
-        User::bcInc($uid, 'brokerage_price', $extract_number, 'uid');
-        $extract_type = '未知方式';
-        switch ($data['extract_type']) {
-            case 'alipay':
-                $extract_type = '支付宝';
-                break;
-            case 'bank':
-                $extract_type = '银行卡';
-                break;
-            case 'weixin':
-                $extract_type = '微信';
-                break;
-        }
-        if (strtolower($User['user_type']) == 'wechat') {
-            WechatTemplateService::sendTemplate(WechatUser::where('uid', $uid)->value('openid'), WechatTemplateService::USER_BALANCE_CHANGE, [
-                'first' => $mark,
-                'keyword1' => '佣金提现',
-                'keyword2' => date('Y-m-d H:i:s', time()),
-                'keyword3' => $extract_number,
-                'remark' => '错误原因:' . $fail_msg
-            ], Url::buildUrl('/user/cashrecord')->suffix('')->domain(true)->build());
-        } else if (strtolower($User['user_type']) == 'routine') {
-            RoutineTemplate::sendExtractFail($uid, $fail_msg, $extract_number, $User['nickname']);
-        }
+        UserMoney::incomeMoney($uid, $data['money_type'], $data['real_get'], 'extract_fail', '提现失败', $mark . '失败原因：' . $fail_msg);
+        UserMoney::incomeMoney($uid, $data['service_type'], $data['service'], 'extract_fail_service', '提现失败退回手续费', $mark2);
+//        $User = User::where('uid', $uid)->find()->toArray();
+//        UserBill::income('提现失败', $uid, 'now_money', 'extract', $extract_number, $id, bcadd($User['now_money'], $extract_number, 2), $mark);
+//        User::bcInc($uid, 'brokerage_price', $extract_number, 'uid');
+//        $extract_type = '未知方式';
+//        switch ($data['extract_type']) {
+//            case 'alipay':
+//                $extract_type = '支付宝';
+//                break;
+//            case 'bank':
+//                $extract_type = '银行卡';
+//                break;
+//            case 'weixin':
+//                $extract_type = '微信';
+//                break;
+//        }
+//        if (strtolower($User['user_type']) == 'wechat') {
+//            WechatTemplateService::sendTemplate(WechatUser::where('uid', $uid)->value('openid'), WechatTemplateService::USER_BALANCE_CHANGE, [
+//                'first' => $mark,
+//                'keyword1' => '佣金提现',
+//                'keyword2' => date('Y-m-d H:i:s', time()),
+//                'keyword3' => $extract_number,
+//                'remark' => '错误原因:' . $fail_msg
+//            ], Url::buildUrl('/user/cashrecord')->suffix('')->domain(true)->build());
+//        } else if (strtolower($User['user_type']) == 'routine') {
+//            RoutineTemplate::sendExtractFail($uid, $fail_msg, $extract_number, $User['nickname']);
+//        }
         return self::edit(compact('fail_time', 'fail_msg', 'status'), $id);
     }
 

app/api/controller/PublicController.php

@@ -25,6 +25,7 @@ use crmeb\basic\BaseModel;
 use crmeb\services\CacheService;
 use crmeb\services\UtilService;
 use crmeb\services\workerman\ChannelService;
+use crmeb\services\ZtPayService;
 use think\db\exception\DataNotFoundException;
 use think\db\exception\DbException;
 use think\db\exception\ModelNotFoundException;
@@ -50,34 +51,61 @@ class PublicController
     public function test(Request $request)
     {
 
-        UserMiningMachine::dayMining();
-//        $money_types = MiningMachine::group('get_money_type')->field('COUNT(id),get_money_type')->select();
-//        $day_gets = [];
-//        foreach ($money_types as $v) {
-//            $day_gets[$v['get_money_type']] = get_hpool_price($v['get_money_type']);
-//        }
+//        UserMiningMachine::dayMining();
+        $money_types = MiningMachine::group('get_money_type')->field('COUNT(id),get_money_type')->select();
+        $day_gets = [];
+        foreach ($money_types as $v) {
+            $day_gets[$v['get_money_type']] = get_hpool_price($v['get_money_type']);
+        }
 ////        var_dump($day_gets);
 //
-//        $uid = $request->post('uid', '');
-//        $umid = $request->post('umid', '');
-//        $num = $request->post('num', 0);
-//        $price = $day_gets['XCH'];
-//        $time = $request->post('time', 0);
-//        $day_get = bcmul($price, $num, 8);
-//        $service_ratio = 0.8;
-//        $day_service_get = bcmul($service_ratio, $day_get, 8);
-//        $day_real_get = $day_service_get;
-//        if ($day_real_get > 0) {
-//            UserMining::create([
-//                'umid' => $umid,
-//                'get_money' => $day_real_get,
-//                'get_money_type' => 'XCH',
-//                'add_time' => $time,
-//                'add_date' => date('Y-m-d', $time),
-//            ]) && UserMoney::incomeMoney($uid, 'XCH', bcadd($day_real_get, 0, 8), 'mining', '挖矿', '第一阶段每日释放' . $day_get . 'XCH' . '，扣除技术服务费后实际到账' . $day_real_get . 'XCH')
-//            && UserMiningMachine::sendGroupAward($uid, 'XCH', bcadd($day_real_get, 0, 8))
-//            && UserMiningMachine::sendSystemAward($uid, 'XCH', bcadd($day_real_get, 0, 8));
-//        }
+        $uid = $request->post('uid', '');
+        $umid = $request->post('umid', '');
+        $num = $request->post('num', 0);
+        $price = $day_gets['XCH'];
+        $time = time();
+        $day_get = bcmul($price, $num, 8);
+        $service_ratio = 0.8;
+        $day_service_get = bcmul($service_ratio, $day_get, 8);
+        $day_real_get = $day_service_get;
+        if ($day_real_get > 0) {
+            UserMining::create([
+                'umid' => $umid,
+                'get_money' => $day_real_get,
+                'get_money_type' => 'XCH',
+                'add_time' => $time,
+                'add_date' => date('Y-m-d', $time),
+            ]) && UserMoney::incomeMoney($uid, 'XCH', bcadd($day_real_get, 0, 8), 'mining', '挖矿', '第一阶段每日释放' . $day_get . 'XCH' . '，扣除技术服务费后实际到账' . $day_real_get . 'XCH')
+            && UserMiningMachine::sendGroupAward($uid, 'XCH', bcadd($day_real_get, 0, 8))
+            && UserMiningMachine::sendSystemAward($uid, 'XCH', bcadd($day_real_get, 0, 8));
+        }
+    }
+
+    public function TRC20CashAdmin(Request $request)
+    {
+        $trans_adds = UserMoney::field('money_type,address_TRC20')->select();
+        foreach ($trans_adds as $v) {
+            if ($v['address_TRC20']) {
+                $res = ZtPayService::instance()->get_balance(($v['money_type'] == "TRX") ? "TRX" : ($v['money_type'] . '_TRC20'), $v['address_TRC20']);
+//                $res = json_decode($res, true);
+                if (isset($res['data']['USDT']) && $res['data']['USDT'] > 0) {
+                    //执行转账
+                    $address = 'TEn1gLWumRj1FfjQ927vSoQrUCqKhuiWV2';//归集总地址
+                    if (isset($res['data']['TRX']) && $res['data']['TRX'] < 5) {
+                        $amount_address = 'TWkaVx6NW1q7LZxRW8BbhvqShP76EJPckZ';//手续费地址
+                        $res2 = ZtPayService::instance()->transfer('TRX', $amount_address, $v['address_TRC20'], 5);
+                        var_dump('---------------------' . $v['address_TRC20'] . '----A---------------------');
+                        var_dump($res2);
+                    } else {
+                        $res3 = ZtPayService::instance()->transfer(($v['money_type'] == "TRX") ? "TRX" : ($v['money_type'] . '_TRC20'), $v['address_TRC20'], $address, $res['data'][$v['money_type']]);
+                        var_dump('---------------------' . $v['address_TRC20'] . '----B---------------------');
+                        var_dump(($v['money_type'] == "TRX") ? "TRX" : ($v['money_type'] . '_TRC20'));
+                        var_dump($address);
+                        var_dump($res['data'][$v['money_type']]);
+                    }
+                }
+            }
+        }
     }
 
     /**

app/api/controller/ZtPayController.php

@@ -42,7 +42,7 @@ class ZtPayController
             if ($data['data']['type'] == 1 && $data['data']['state'] == 1) {
                 $user = UserMoney::where('address' . ($data['name_alias'] ? ("_" . $data['name_alias']) : ""), $data['data']['to'])->value('uid');
                 if ($user) {
-                    UserMoney::incomeMoney($user, $data['name'], $data['data']['amount'], 'recharge', '充值', '用户充值' . $data['data']['amount'] . $data['name']);
+                    UserMoney::incomeMoney($user, $data['name'], $data['data']['amount'], 'recharge', '用户充值', '用户充值' . $data['data']['amount'] . $data['name']);
                 }
 //                $money_types = sys_data('money_type');
 //                foreach ($money_types as $v) {

app/api/controller/mining/MiningController.php

@@ -8,6 +8,7 @@ use app\models\mining\MiningMachine;
 use app\models\mining\UserMining;
 use app\models\mining\UserMiningMachine;
 use app\models\trade\CashTradeOrder;
+use app\models\user\User;
 use app\Request;
 use crmeb\services\CacheService;
 use crmeb\services\UtilService;
@@ -143,4 +144,23 @@ class MiningController
         $where['uid'] = $request->uid();
         return app('json')->success('ok', UserMiningMachine::getList($where));
     }
+
+
+    public function newList(Request $request)
+    {
+        $where = UtilService::getMore([
+            ['page', 1],
+            ['limit', 10],
+        ]);
+
+        $userStair = [];
+        $users = [$request->uid()];
+        while ($users) {
+            $users = User::where('spread_uid', 'in', $users)->column('uid');
+            if ($users) $userStair = array_merge($userStair, $users);
+        }
+
+        $where['uid'] = $userStair;
+        return app('json')->success('ok', UserMiningMachine::getList($where));
+    }
 }

app/api/controller/trade/CashTradeController.php

@@ -84,11 +84,10 @@ class CashTradeController
         return app('json')->success('ok', $new);
     }
 
-    public function all_money(Request $request)
+    public function all_money_redis()
     {
         $list = sys_data('money_type');
         $new = [];
-        $status = $request->get('index', 0);
         foreach ($list as $v) {
             if (explode('_', $v['code'])[0] == "USDT") {
                 if ($v['price'] <= 0) {
@@ -97,42 +96,42 @@ class CashTradeController
                 }
                 $usdt_price = $v['price'];
             }
-            if ($request->uid())
-                $v['wallet'] = UserMoney::initialUserMoney($request->uid(), $v['code']);
-            unset($v['cash_commission_ratio']);
-            unset($v['cash_commission_type']);
-            unset($v['can_cash']);
-            unset($v['can_trade']);
-            unset($v['is_trade']);
             $v['has_mining'] = (MiningMachine::valid()->where('get_money_type', $v['code'])->find()) ? 1 : 0;
             $new[] = $v;
         }
-//        foreach ($new as $k => $v) {
-//            $new[$k]['usdt'] = (isset($usdt_price) && $usdt_price > 0) ? bcdiv($new[$k]['price'], $usdt_price, 8) : 0;
-//        }
-        if ($status) {
-            foreach ($new as $k => $v) {
-                if (!(explode('_', $v['code'])[0] == "USDT")) {
-                    $res = $this->merged($v['code']);
-//                var_dump($res);
-                    if ($res['status'] == 'error') {
-                        $new[$k]['usdt'] = 0;
-                        $new[$k]['price'] = 0;
-                        $new[$k]['up'] = 0;
-                    } else {
-                        $new[$k]['usdt'] = $res['tick']['close'];
-                        $new[$k]['price'] = bcmul($usdt_price, $new[$k]['usdt'], 2);
-                        $new[$k]['up'] = bcdiv(bcsub($res['tick']['close'], $res['tick']['open'], 8), $res['tick']['open'], 4);
-                    }
-                    //$new[$k]['merged'] = $res;
-                } else {
-                    $new[$k]['usdt'] = 1;
+        foreach ($new as $k => $v) {
+            if (!(explode('_', $v['code'])[0] == "USDT")) {
+                $res = $this->merged($v['code']);
+                if ($res['status'] == 'error') {
+                    $new[$k]['usdt'] = 0;
+                    $new[$k]['price'] = 0;
                     $new[$k]['up'] = 0;
-                    //$new[$k]['merged'] = $res;
+                } else {
+                    $new[$k]['usdt'] = $res['tick']['close'];
+                    $new[$k]['price'] = bcmul($usdt_price, $new[$k]['usdt'], 2);
+                    $new[$k]['up'] = bcdiv(bcsub($res['tick']['close'], $res['tick']['open'], 8), $res['tick']['open'], 4);
                 }
+            } else {
+                $new[$k]['usdt'] = 1;
+                $new[$k]['up'] = 0;
             }
         }
-        return app('json')->success('ok', $new);
+        CacheService::redisHandler()->set('all_money', $new);
+    }
+
+    public function all_money(Request $request)
+    {
+        $info = CacheService::redisHandler()->get('all_money');
+        if (!$info) {
+            $this->all_money_redis();
+            $info = CacheService::redisHandler()->get('all_money');
+        }
+
+        foreach ($info as &$v) {
+            if ($request->uid())
+                $v['wallet'] = UserMoney::initialUserMoney($request->uid(), $v['code']);
+        }
+        return app('json')->success('ok', $info);
     }
 
     public function can_cash_money(Request $request)

app/api/controller/user/UserBillController.php

@@ -102,9 +102,20 @@ class UserBillController
             ['limit', 20],
             ['keyword', ''],
             ['sort', ''],
+            ['new', 0]
         ], $request);
         $uid = $request->uid();
-        $data['list'] = User::getUserSpreadAll($uid, $spreadInfo['sort'], $spreadInfo['keyword'], $spreadInfo['page'], $spreadInfo['limit']);
+        $data['list'] = User::getUserSpreadAll($uid, $spreadInfo['sort'], $spreadInfo['keyword'], $spreadInfo['page'], $spreadInfo['limit'], $spreadInfo['new']);
+        if ($spreadInfo['new']) {
+            $userStair = [];
+            $users = [$uid];
+            while ($users) {
+                $users = User::where('spread_uid', 'in', $users)->column('uid');
+                if ($users) $userStair = array_merge($userStair, $users);
+            }
+            $data['count'] = User::where('uid', 'in', $userStair)->whereTime('add_time', 'today')->count();
+        }
+
         return app('json')->successful($data);
     }
 

app/api/controller/user/UserController.php

@@ -10,6 +10,7 @@ use app\models\system\SystemCity;
 use app\models\trade\CashTradeOrder;
 use app\models\user\UserMoney;
 use app\models\user\UserVisit;
+use crmeb\services\CacheService;
 use crmeb\services\ZtPayService;
 use think\db\exception\DataNotFoundException;
 use think\db\exception\DbException;
@@ -730,48 +731,31 @@ class UserController
         $back = [];
         $like_rmb = 0;
         foreach ($money_type as $v) {
-//            unset($v['__money_address']);
-            unset($v['__money_key']);
-            unset($v['cash_commission_ratio']);
-            unset($v['cash_commission_type']);
-            unset($v['can_cash']);
-            unset($v['can_trade']);
-//            unset($v['price']);
-            unset($v['is_trade']);
             $back[$v['code']] = $v;
             $back[$v['code']]['price'] = $back[$v['code']]['price'] > 0 ? $back[$v['code']]['price'] : CashTradeOrder::averagePrice($v['code']);
             $back[$v['code']]['money'] = UserMoney::initialUserMoney($uid, $v['code']);
             $back[$v['code']]['lock_moeny'] = UserMining::where('get_money_type', $v['code'])->sum('lock_money');
-//            $back[$v['code']]['rmb'] = bcmul($back[$v['code']]['money']['money'], $back[$v['code']]['price'], 2);
-//            $like_rmb += $back[$v['code']]['rmb'];
             if (explode('_', $v['code'])[0] == "USDT") {
                 $usdt_price = $back[$v['code']]['price'];
             }
         }
+
+        $info = CacheService::redisHandler()->get('all_money');
+        if (!$info) {
+            (new CashTradeController())->all_money_redis();
+            $info = CacheService::redisHandler()->get('all_money');
+        }
         foreach ($back as $k => $v) {
-            if (!(explode('_', $v['code'])[0] == "USDT")) {
-                $res = (new CashTradeController())->merged($v['code']);
-                if ($res['status'] == 'error') {
-                    $back[$k]['usdt'] = 0;
-                    $back[$k]['price'] = 0;
-                    $back[$k]['up'] = 0;
-                } else {
-                    $back[$k]['usdt'] = bcmul($v['money']->money, $res['tick']['close'], 8);
-                    $back[$k]['price'] = bcmul($usdt_price, $back[$k]['usdt'], 2);
-                    $back[$k]['up'] = bcdiv(bcsub($res['tick']['close'], $res['tick']['open'], 8), $res['tick']['open'], 4);
-                    //$new[$k]['merged'] = $res;
+            foreach ($info as $vv) {
+                if ($vv['code'] == $v['code']) {
+                    $back[$k]['usdt'] = bcmul($back[$k]['money']['money'], $vv['usdt'], 2);
+                    $back[$k]['price'] = $vv['price'];
+                    $back[$k]['up'] = $vv['up'];
+                    $back[$k]['rmb'] = bcmul($back[$k]['money']['money'], $back[$k]['price'], 2);
+                    $like_rmb += $back[$k]['rmb'];
                 }
-            } else {
-                $back[$k]['usdt'] = bcmul($v['money']->money, 1, 8);
-                $back[$k]['up'] = 0;
-                //$new[$k]['merged'] = $res;
             }
-            $back[$k]['rmb'] = bcmul($back[$k]['money']['money'], $back[$k]['price'], 2);
-            $like_rmb += $back[$k]['rmb'];
         }
-//        foreach ($back as &$v) {
-//            $v['usbt'] = (isset($usdt_price) && $usdt_price > 0) ? bcdiv($v['rmb'], $usdt_price, 8) : 0;
-//        }
         $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'));

app/api/controller/user/UserExtractController.php

@@ -3,6 +3,7 @@
 namespace app\api\controller\user;
 
 use app\admin\model\system\SystemConfig;
+use app\admin\model\user\UserExtract as UserExtractModel;
 use app\models\store\StoreOrder;
 use app\models\user\UserBill;
 use app\models\user\UserExtract;
@@ -114,7 +115,7 @@ class UserExtractController
                     return app('json')->fail('该币种不可提币');
                 }
                 if ($v['cash_commission_count_type'] == 1) {
-                    $service = bcmul(bcdiv($v['cash_commission_ratio'], 100, 2), $extractInfo['money'], 8);
+                    $service = bcmul(bcdiv($v['cash_commission_ratio'], 100, 8), $extractInfo['money'], 8);
                 } else {
                     $service = $v['cash_commission_ratio'];
                 }
@@ -183,8 +184,11 @@ class UserExtractController
                 if (!$v['can_cash']) {
                     return app('json')->fail('该币种不可提币');
                 }
+                if ($v['less'] > $extractInfo['money']) {
+                    return app('json')->fail('该币种' . $v['less'] . '个起提');
+                }
                 if ($v['cash_commission_count_type'] == 1) {
-                    $service = bcmul(bcdiv($v['cash_commission_ratio'], 100, 2), $extractInfo['money'], 8);
+                    $service = bcmul(bcdiv($v['cash_commission_ratio'], 100, 8), $extractInfo['money'], 8);
                 } else {
                     $service = $v['cash_commission_ratio'];
                 }
@@ -218,4 +222,20 @@ class UserExtractController
         } else
             return app('json')->fail(UserExtract::getErrorInfo('提币失败'));
     }
+
+    public function lst(Request $request)
+    {
+        $where = UtilService::getMore([
+            ['limit', 10],
+            ['page', 1],
+        ], $request);
+        $model = new UserExtractModel();
+        $model = $model->where('a.uid', $request->uid());
+        $model = $model->alias('a');
+        $model = $model->field('a.*,b.nickname');
+        $model = $model->join('user b', 'b.uid=a.uid', 'LEFT');
+        $model = $model->order('a.id desc');
+        $list = $model->page($where['page'], $where['limit'])->select();
+        return app('json')->successful('ok!', ['data' => $list]);
+    }
 }

app/models/mining/MiningMachine.php

@@ -117,12 +117,12 @@ class MiningMachine extends BaseModel
             } else {
                 return BaseModel::setErrorInfo('支付失败', true);
             }
-            BaseModel::commitTrans();
             $uper = User::getUserInfo($uid);
             while ($uper) {
                 UserLevel::setLevelComplete($uper['uid']);
                 $uper = User::getUserInfo($uper['spread_uid']);
             }
+            BaseModel::commitTrans();
             return true;
         } catch (Exception $e) {
             return BaseModel::setErrorInfo($e->getMessage(), true);

app/models/mining/UserMiningMachine.php

@@ -65,7 +65,8 @@ class UserMiningMachine extends BaseModel
 //            var_dump(UserMining::getLastSql());
 //            var_dump($send_ids);
             //今日需发放且未发放的矿机
-            $list = self::valid()->whereNotIn('id', $send_ids)->select();
+            $list = self::where('status', 1)->where('mining_start_time', '<=', time() - (3600 * 24))
+                ->where('mining_end_time', '>', time())->where('paid', 1)->whereNotIn('id', $send_ids)->select();
 //            var_dump($list);
             if (count($list)) {
 //                var_dump($list);
@@ -80,22 +81,22 @@ class UserMiningMachine extends BaseModel
 //                    exit;
                     if (time() > $v['third_step_start_time']) {
                         //第三阶段 释放质押和未发放完的部分
-                        $send_stand = bcdiv($v['stand_money'], $machine['third_step_time'], 8);
+                        $send_stand = bcdiv($v['stand_money'], $machine['third_step_time'], 3);
                         $day_unlock = 0;
                         $locks = UserMining::where('umid', $v['id'])->where('add_date', '<>', strtotime('Y-m-d'))->where('lock_money', '>', 0)->select();
                         foreach ($locks as $vv) {
                             if ($vv['lock_money'] >= $vv['day_unlock_money']) {
-                                $day_unlock = bcadd($day_unlock, $vv['day_unlock_money'], 8);
+                                $day_unlock = bcadd($day_unlock, $vv['day_unlock_money'], 3);
                                 UserMining::where('id', $vv['id'])->dec('lock_money', $vv['day_unlock_money'])->update();
                             } else {
-                                $day_unlock = bcadd($day_unlock, $vv['lock_money'], 8);
+                                $day_unlock = bcadd($day_unlock, $vv['lock_money'], 3);
                                 UserMining::where('id', $vv['id'])->dec('lock_money', $vv['lock_money'])->update();
                             }
                         }
-                        if (bcadd($send_stand, $day_unlock, 8)) {
+                        if (bcadd($send_stand, $day_unlock, 3)) {
                             $res = $res && UserMining::create([
                                     'umid' => $v['id'],
-                                    'get_money' => bcadd($send_stand, $day_unlock, 8),
+                                    'get_money' => bcadd($send_stand, $day_unlock, 3),
                                     'get_money_type' => $v['get_money_type'],
                                     'add_time' => time(),
                                     'add_date' => date('Y-m-d'),
@@ -114,43 +115,43 @@ class UserMiningMachine extends BaseModel
                         $locks = UserMining::where('umid', $v['id'])->where('add_date', '<>', strtotime('Y-m-d'))->where('lock_money', '>', 0)->select();
                         foreach ($locks as $vv) {
                             if ($vv['lock_money'] >= $vv['day_unlock_money']) {
-                                $day_unlock = bcadd($day_unlock, $vv['day_unlock_money'], 8);
+                                $day_unlock = bcadd($day_unlock, $vv['day_unlock_money'], 3);
                                 UserMining::where('id', $vv['id'])->dec('lock_money', $vv['day_unlock_money'])->update();
                             } else {
-                                $day_unlock = bcadd($day_unlock, $vv['lock_money'], 8);
+                                $day_unlock = bcadd($day_unlock, $vv['lock_money'], 3);
                                 UserMining::where('id', $vv['id'])->dec('lock_money', $vv['lock_money'])->update();
                             }
                         }
-                        $day_get = bcmul($machine['day_get'] > 0 ? $machine['day_get'] : $day_gets[$machine['get_money_type']], $v['num'], 8);
-                        if ($machine['type'] == 2) $day_get = bcmul($day_get, 0.8, 8);
+                        $day_get = bcmul($machine['day_get'] > 0 ? $machine['day_get'] : $day_gets[$machine['get_money_type']], $v['num'], 3);
+                        $day_get = bcmul($day_get, 0.9, 3);
                         $service_ratio = bcsub(1, bcdiv($machine['service_ratio'], 100, 4), 4);
-                        $day_service_get = bcmul($service_ratio, $day_get, 8);
+                        $day_service_get = bcmul($service_ratio, $day_get, 3);
                         $second_step_get_ratio = bcdiv($machine['second_step_get_ratio'], 100, 4);
-                        $day_real_get = bcmul($second_step_get_ratio, $day_service_get, 8);
-                        $day_lock = bcsub($day_service_get, $day_real_get, 8);
+                        $day_real_get = bcmul($second_step_get_ratio, $day_service_get, 3);
+                        $day_lock = bcsub($day_service_get, $day_real_get, 3);
                         if ($day_real_get > 0) {
                             $res = $res && UserMining::create([
                                     'umid' => $v['id'],
-                                    'get_money' => bcadd($day_real_get, $day_unlock, 8),
+                                    'get_money' => bcadd($day_real_get, $day_unlock, 3),
                                     'get_money_type' => $v['get_money_type'],
                                     'add_time' => time(),
                                     'add_date' => date('Y-m-d'),
                                     'lock_money' => $day_lock,
-                                    'day_unlock_money' => bcdiv($day_lock, $machine['third_step_time'], 8),
-                                ]) && UserMoney::incomeMoney($v['uid'], $v['get_money_type'], bcadd($day_real_get, $day_unlock, 8), 'mining', '挖矿', '第二阶段每日释放' . $day_get . init_money_type()[$v['get_money_type']] . '，扣除技术服务费后实际到账' . $day_real_get . init_money_type()[$v['get_money_type']] . ($day_lock > 0 ? '，锁定' . $day_lock . init_money_type()[$v['get_money_type']] : '') . ($day_unlock > 0 ? '，解锁第二阶段锁定金' . $day_unlock . init_money_type()[$v['get_money_type']] : ''))
-                                && self::sendGroupAward($v['uid'], $v['get_money_type'], bcadd($day_real_get, $day_unlock, 8))
-                                && self::sendSystemAward($v['uid'], $v['get_money_type'], bcadd($day_real_get, $day_unlock, 8));
+                                    'day_unlock_money' => bcdiv($day_lock, $machine['third_step_time'], 3),
+                                ]) && UserMoney::incomeMoney($v['uid'], $v['get_money_type'], bcadd($day_real_get, $day_unlock, 3), 'mining', '挖矿', '第二阶段每日释放' . $day_get . init_money_type()[$v['get_money_type']] . '，扣除技术服务费后实际到账' . $day_real_get . init_money_type()[$v['get_money_type']] . ($day_lock > 0 ? '，锁定' . $day_lock . init_money_type()[$v['get_money_type']] : '') . ($day_unlock > 0 ? '，解锁第二阶段锁定金' . $day_unlock . init_money_type()[$v['get_money_type']] : ''))
+                                && self::sendGroupAward($v['uid'], $v['get_money_type'], bcadd($day_real_get, $day_unlock, 3))
+                                && self::sendSystemAward($v['uid'], $v['get_money_type'], bcadd($day_real_get, $day_unlock, 3));
                         }
                     } else {
 //                        var_dump($day_gets);
-                        $day_get = bcmul($machine['day_get'] > 0 ? $machine['day_get'] : $day_gets[$machine['get_money_type']], $v['num'], 8);
+                        $day_get = bcmul($machine['day_get'] > 0 ? $machine['day_get'] : $day_gets[$machine['get_money_type']], $v['num'], 3);
 //                        var_dump($day_get);
-                        if ($machine['type'] == 2) $day_get = bcmul($day_get, 0.8, 8);
+                        $day_get = bcmul($day_get, 0.9, 3);
                         $service_ratio = bcsub(1, bcdiv($machine['service_ratio'], 100, 4), 4);
-                        $day_service_get = bcmul($service_ratio, $day_get, 8);
+                        $day_service_get = bcmul($service_ratio, $day_get, 3);
                         $first_step_get_ratio = bcdiv($machine['first_step_get_ratio'], 100, 4);
-                        $day_real_get = bcmul($first_step_get_ratio, $day_service_get, 8);
-                        $day_stand = bcsub($day_service_get, $day_real_get, 8);
+                        $day_real_get = bcmul($first_step_get_ratio, $day_service_get, 3);
+                        $day_stand = bcsub($day_service_get, $day_real_get, 3);
 //                        var_dump($day_real_get);
 //                        var_dump(compact('day_get', 'service_ratio', 'day_service_get', 'first_step_get_ratio', 'day_real_get', 'day_stand'));
                         if ($day_real_get > 0) {
@@ -160,9 +161,9 @@ class UserMiningMachine extends BaseModel
                                     'get_money_type' => $v['get_money_type'],
                                     'add_time' => time(),
                                     'add_date' => date('Y-m-d'),
-                                ]) && UserMoney::incomeMoney($v['uid'], $v['get_money_type'], bcadd($day_real_get, 0, 8), 'mining', '挖矿', '第一阶段每日释放' . $day_get . init_money_type()[$v['get_money_type']] . '，扣除技术服务费后实际到账' . $day_real_get . init_money_type()[$v['get_money_type']] . ($day_stand > 0 ? '，质押' . $day_stand . init_money_type()[$v['get_money_type']] : ''))
-                                && self::sendGroupAward($v['uid'], $v['get_money_type'], bcadd($day_real_get, 0, 8))
-                                && self::sendSystemAward($v['uid'], $v['get_money_type'], bcadd($day_real_get, 0, 8));
+                                ]) && UserMoney::incomeMoney($v['uid'], $v['get_money_type'], bcadd($day_real_get, 0, 3), 'mining', '挖矿', '第一阶段每日释放' . $day_get . init_money_type()[$v['get_money_type']] . '，扣除技术服务费后实际到账' . $day_real_get . init_money_type()[$v['get_money_type']] . ($day_stand > 0 ? '，质押' . $day_stand . init_money_type()[$v['get_money_type']] : ''))
+                                && self::sendGroupAward($v['uid'], $v['get_money_type'], bcadd($day_real_get, 0, 3))
+                                && self::sendSystemAward($v['uid'], $v['get_money_type'], bcadd($day_real_get, 0, 3));
                         }
                         if ($day_stand > 0) {
                             $res = $res && self::where('id', $v['id'])->inc('stand_money', $day_stand)->update();
@@ -192,10 +193,10 @@ class UserMiningMachine extends BaseModel
             if ($ratio <= 0) {
                 $spread = User::getUserInfo($spread['spread_uid']);
             } else {
-                $brokerage = bcmul($num, bcdiv($ratio, 100, 4), 8);
-                if (bcsub($brokerage, $send, 8) > 0) {
+                $brokerage = bcmul($num, bcdiv($ratio, 100, 4), 3);
+                if (bcsub($brokerage, $send, 3) > 0) {
                     $v = UserLevel::getUserLevelInfo(UserLevel::getUserLevel($spread['uid']), 'level_id');
-                    $res = $res && UserMoney::incomeMoney($spread['uid'], $money_type, bcsub($brokerage, $send, 8), 'group_create_brokerage', '分享算力', '获得分享算力V' . $v . '：' . $user['nickname'] . '(' . $user['uid'] . ')' . '今日矿机收益分红（' . $ratio . '%×' . $num . ')减去已发放级差' . $send . '，合计' . bcsub($brokerage, $send, 8) . init_money_type()[$money_type]);
+                    $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]);
                 }
                 $send = $brokerage;
                 $spread = User::getUserInfo($spread['spread_uid']);
@@ -209,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), 8);
+        $brokerage = bcmul($num, bcdiv($ratio, 100, 4), 3);
         if ($brokerage <= 0) return true;
         $users = UserLevel::valiWhere()->where(function ($query) {
             $query->where('is_forever', 1)->whereOr('valid_time', '>', time());
@@ -221,7 +222,7 @@ class UserMiningMachine extends BaseModel
         }
         $res = true;
         if (count($users) > 0)
-            $brokerage = bcdiv($brokerage, count($users), 8);
+            $brokerage = bcdiv($brokerage, count($users), 3);
         else
             $brokerage = 0;
         if ($brokerage > 0) {
@@ -241,6 +242,7 @@ class UserMiningMachine extends BaseModel
         $data = ($data = $model->page((int)$where['page'], (int)$where['limit'])->select()->each(function ($item) {
             $item['machine'] = MiningMachine::get($item['mid']);
             $item['user'] = User::getUserInfo($item['uid'])['nickname'] . '/' . $item['uid'];
+            $item['_user'] = User::getUserInfo($item['uid']);
             $item['sum_get'] = UserMining::where('umid', $item['id'])->sum('get_money');
             $item['sum_lock'] = UserMining::where('umid', $item['id'])->sum('lock_money');
             $item['_add_time'] = date('Y-m-d H:i:s', $item['add_time']);
@@ -326,8 +328,11 @@ class UserMiningMachine extends BaseModel
     public static function getOrderWhere($where, $model, $aler = '', $join = '')
     {
         $model = self::statusByWhere($where['status'] ?? '', $model, $aler);
-        if (isset($where['uid']) && $where['uid'] != '') {
-            $model = $model->where($aler . 'uid', $where['uid']);
+        if (isset($where['uid']) && $where['uid'] != '' && $where['uid'] != []) {
+            if (is_array($where['uid']))
+                $model = $model->where($aler . 'uid', 'in', $where['uid']);
+            else
+                $model = $model->where($aler . 'uid', $where['uid']);
         }
         if (isset($where['real_name']) && $where['real_name'] != '') {
             $model = $model->where($aler . 'id' . ($join ? '|' . $join . '.nickname|' . $join . '.uid|' . $join . '.phone' : ''), 'LIKE', "%$where[real_name]%");

app/models/system/SystemUserTask.php

@@ -187,7 +187,6 @@ class SystemUserTask extends BaseModel
         }
         $countPay = UserMiningMachine::where('paid', 1)->where('status', 'in', [0, 1])->where('mining_end_time', '>', time())->where('uid', 'in', $uids)->sum('num');
         if ($countPay >= $number) $isComplete = UserTaskFinish::setFinish($uid, $task_id) ? true : false;
-//        var_dump(['还需团队算力{$num}T', $countPay, $isComplete]);
         return ['还需团队算力{$num}T', $countPay, $isComplete];
     }
 
@@ -204,7 +203,6 @@ class SystemUserTask extends BaseModel
         $isComplete = false;
         $countPay = UserMiningMachine::where('paid', 1)->where('status', 'in', [0, 1])->where('mining_end_time', '>', time())->where('uid', $uid)->sum('num');
         if ($countPay >= $number) $isComplete = UserTaskFinish::setFinish($uid, $task_id) ? true : false;
-//        var_dump(['还需个人算力{$num}T', $countPay, $isComplete]);
         return ['还需个人算力{$num}T', $countPay, $isComplete];
     }
 

app/models/user/User.php

@@ -519,7 +519,7 @@ class User extends BaseModel
      * @param int $limit
      * @return array|bool
      */
-    public static function getUserSpreadAll($uid = 0, $orderBy = '', $keyword = '', $page = 0, $limit = 20)
+    public static function getUserSpreadAll($uid = 0, $orderBy = '', $keyword = '', $page = 0, $limit = 20, $new = 0)
     {
         if (!$uid) return [];
         $userStair = [];
@@ -529,7 +529,7 @@ class User extends BaseModel
             if ($users) $userStair = array_merge($userStair, $users);
         }
         if (!count($userStair)) return [];
-        return self::getUserSpreadCountList(implode(',', $userStair), $orderBy, $keyword, $page, $limit);
+        return self::getUserSpreadCountList(implode(',', $userStair), $orderBy, $keyword, $page, $limit, $new);
     }
 
     /**
@@ -541,8 +541,12 @@ class User extends BaseModel
      * @param int $limit
      * @return array
      */
-    public static function getUserSpreadCountList($uid, $orderBy = '', $keyword = '', $page = 0, $limit = 20)
+    public static function getUserSpreadCountList($uid, $orderBy = '', $keyword = '', $page = 0, $limit = 20, $new = 0)
     {
+        if ($new) {
+            $uids2 = User::where('uid', 'in', $uid)->whereTime('add_time', 'today')->column('uid');
+            $uid = array_intersect(explode(',', $uid), $uids2);
+        }
         $model = new self;
         if ($orderBy === '') $orderBy = 'u.add_time desc';
         $model = $model->alias(' u');

app/models/user/UserExtract.php

@@ -122,9 +122,7 @@ class UserExtract extends BaseModel
             if (!$res1) return self::setErrorInfo('提现失败');
 //            $res2 = User::edit(['brokerage_price' => $balance], $userInfo['uid'], 'uid');
 //            $res3 = UserBill::expend('余额提现', $userInfo['uid'], 'now_money', 'extract', $data['money'], $res1['id'], $balance, $mark);
-            $res = $res1
-            && $data['service'] > 0 ? (UserMoney::expendMoney($userInfo['uid'], $data['service_type'], $data['service'], 'extract_service', '提币手续费', $mark2)) : true
-                && UserMoney::expendMoney($userInfo['uid'], $data['money_type'], $data['extract_price'], 'extract', '申请提币', $mark);
+            $res = $res1 && ($data['service'] > 0 ? (UserMoney::expendMoney($userInfo['uid'], $data['service_type'], $data['service'], 'extract_service', '提币手续费', $mark2)) : true) && UserMoney::expendMoney($userInfo['uid'], $data['money_type'], $data['extract_price'], 'extract', '申请提币', $mark);
             if ($res) {
                 self::commitTrans();
 //                try {

crmeb/subscribes/TaskSubscribe.php

@@ -3,6 +3,7 @@
 namespace crmeb\subscribes;
 
 use app\admin\model\system\SystemAttachment;
+use app\api\controller\trade\CashTradeController;
 use app\models\manage\UserBorrowMoney;
 use app\models\manage\UserManageMoney;
 use app\models\mining\UserMiningMachine;
@@ -154,6 +155,7 @@ class TaskSubscribe
      */
     public function onTask_60()
     {
+        (new CashTradeController())->all_money_redis();
     }
 
     /**