Kirin 3 éve
szülő
commit
3830cc68d4
1 módosított fájl, 6 hozzáadás és 3 törlés
  1. 6 3
      app/admin/controller/user/User.php

+ 6 - 3
app/admin/controller/user/User.php

@@ -9,6 +9,8 @@ namespace app\admin\controller\user;
 
 use app\admin\controller\AuthController;
 use app\models\mining\MiningMachine;
+use app\models\mining\UserMiningRatio;
+use app\models\mining\UserMiningService;
 use app\models\user\UserMoney;
 use app\models\vote\UserVote;
 use crmeb\repositories\UserRepository;
@@ -850,7 +852,7 @@ class User extends AuthController
         if (!$user) $this->failed('数据不存在!');
         if (!$mid || !MiningMachine::get($mid)) $this->failed('矿机不合法');
         $f = array();
-        $f[] = Form::number('ratio', '比率', $user->getData('ratio'));
+        $f[] = Form::number('ratio', '比率', UserMiningRatio::where('uid', $uid)->where('mid', $mid)->value('ratio') ?: 0);
         $form = Form::make_post_form('佣金比率', $f, Url::buildUrl('update_ratio', array('uid' => $uid, 'mid' => $mid)), 5);
         $this->assign(compact('form'));
         return $this->fetch('public/form-builder');
@@ -861,10 +863,11 @@ class User extends AuthController
         if (!$uid) $this->failed('数据不存在');
         $user = UserModel::get($uid);
         if (!$user) $this->failed('数据不存在!');
+        $m = MiningMachine::get($mid);
         if (!$mid || !MiningMachine::get($mid)) $this->failed('矿机不合法');
         $f = array();
-        $f[] = Form::number('ratio', '比率', $user->getData('ratio'));
-        $form = Form::make_post_form('佣金比率', $f, Url::buildUrl('update_service', array('uid' => $uid, 'mid' => $mid)), 5);
+        $f[] = Form::number('ratio', '比率', UserMiningService::where('uid', $uid)->where('mid', $mid)->value('ratio') ?: $m['service_ratio']);
+        $form = Form::make_post_form('服务费比率', $f, Url::buildUrl('update_service', array('uid' => $uid, 'mid' => $mid)), 5);
         $this->assign(compact('form'));
         return $this->fetch('public/form-builder');
     }