|
|
@@ -141,8 +141,9 @@ class UserMiningMachine extends BaseModel
|
|
|
$day_get = bcmul(($machine['day_get'] > 0 ? bcmul($machine['day_get'], 1024, 8) : $day_gets[$machine['get_money_type']]), $v['num'], 8);
|
|
|
if ($v['get_money_type'] == 'XCH')
|
|
|
$day_get = bcmul($day_get, 0.84, 8);
|
|
|
- $service_ratio = bcsub(1, bcdiv($machine['service_ratio'], 100, 4), 4);
|
|
|
+ $service_ratio = $machine['service_ratio'];
|
|
|
$service_ratio = UserMiningService::where('uid', $v['uid'])->where('mid', $machine['id'])->value('ratio') ?: $service_ratio;
|
|
|
+ $service_ratio = bcsub(1, bcdiv($service_ratio, 100, 4), 4);
|
|
|
$day_service_get = bcmul($service_ratio, $day_get, 8);
|
|
|
$second_step_get_ratio = bcdiv($machine['second_step_get_ratio'], 100, 4);
|
|
|
$day_real_get = bcmul($second_step_get_ratio, $day_service_get, 8);
|
|
|
@@ -172,8 +173,9 @@ class UserMiningMachine extends BaseModel
|
|
|
$day_get = bcmul(($machine['day_get'] > 0 ? bcmul($machine['day_get'], 1024, 8) : $day_gets[$machine['get_money_type']]), $v['num'], 8);
|
|
|
if ($v['get_money_type'] == 'XCH')
|
|
|
$day_get = bcmul($day_get, 0.84, 8);
|
|
|
- $service_ratio = bcsub(1, bcdiv($machine['service_ratio'], 100, 4), 4);
|
|
|
+ $service_ratio = $machine['service_ratio'];
|
|
|
$service_ratio = UserMiningService::where('uid', $v['uid'])->where('mid', $machine['id'])->value('ratio') ?: $service_ratio;
|
|
|
+ $service_ratio = bcsub(1, bcdiv($service_ratio, 100, 4), 4);
|
|
|
$day_service_get = bcmul($service_ratio, $day_get, 8);
|
|
|
$first_step_get_ratio = bcdiv($machine['first_step_get_ratio'], 100, 4);
|
|
|
$day_real_get = bcmul($first_step_get_ratio, $day_service_get, 8);
|
Kirin