|
|
@@ -267,6 +267,13 @@ class UserMiningMachine extends BaseModel
|
|
|
$item['mining_end_time'] = $item['_stop_time'];
|
|
|
$item['_start_time'] = date('Y-m-d H:i:s', $item['mining_start_time']);
|
|
|
$item['_pay_time'] = date('Y-m-d H:i:s', $item['pay_time']);
|
|
|
+ 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['mid'])->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['mid'])->value('ratio') ?: $item['machine']['service_ratio'];
|
|
|
+ $item['lower_service_ratio'] = UserMiningService::where('mid', $item['mid'])->where('uid', 'in', $uids)->min('ratio') ?: $item['machine']['service_ratio'];
|
|
|
+ }
|
|
|
})) && count($data) ? $data->toArray() : [];
|
|
|
$count = self::getOrderWhere($where, self::alias('a')->join('user r', 'r.uid=a.uid', 'LEFT'), 'a.', 'r')->count();
|
|
|
return compact('count', 'data');
|
Kirin