理财

app/api/controller/mining/MiningController.php

@@ -93,9 +93,10 @@ class MiningController
     {
         $page = $request->get('page', 1);
         $limit = $request->get('limit', 10);
+        $uid = $request->get('uid', $request->uid());
         $get_money_type = $request->get('get_money_type', '');
         $type = $request->get('type', '');
-        return app('json')->success('ok', MiningMachine::getList($page, $limit, ['get_money_type' => $get_money_type, 'type' => $type, 'uid' => $request->uid()]));
+        return app('json')->success('ok', MiningMachine::getList($page, $limit, ['get_money_type' => $get_money_type, 'type' => $type, 'uid' => $uid]));
     }
 
     /**

app/api/controller/user/UserBillController.php

@@ -442,7 +442,7 @@ class UserBillController
             return app('json')->fail('服务费比例不能低于自己');
         }
         $uids = User::where('spread_uid', $user['uid'])->column('uid');
-        $user2 = UserMiningService::where('mid', $mid)->where('uid', 'in', $uids)->max('ratio');
+        $user2 = UserMiningService::where('mid', $mid)->where('uid', 'in', $uids)->min('ratio');
         if ($user2 > 0 && $ratio > $user2) {
             return app('json')->fail('服务费比例不能高于目标下级');
         }

app/models/mining/MiningMachine.php

@@ -55,8 +55,11 @@ class MiningMachine extends BaseModel
             $item['award_ratio'] = 0;
             //$item['service'] = explode(',', $item['tags']);
             if (isset($where['uid']) && $where['uid']) {
+                $uids = User::where('spread_uid', $where['uid'])->column('uid');
                 $item['award_ratio'] = UserMiningRatio::where('uid', $where['uid'])->where('mid', $item['id'])->value('ratio') ?: 0;
+                $item['lower_award_ratio'] = UserMiningRatio::where('mid', $item['id'])->where('uid', 'in', $uids)->max('ratio') ?: 0;
                 $item['user_service_ratio'] = UserMiningService::where('uid', $where['uid'])->where('mid', $item['id'])->value('ratio') ?: $item['service_ratio'];
+                $item['lower_service_ratio'] = UserMiningService::where('mid', $item['id'])->where('uid', 'in', $uids)->min('ratio') ?: $item['service_ratio'];
             }
         })->toArray();
         return compact('count', 'data');