|
@@ -65,17 +65,17 @@ class AwardIntegralPriceRepository extends BaseRepository
|
|
|
->where('status', '>=', 0)
|
|
->where('status', '>=', 0)
|
|
|
->sum('total_price');
|
|
->sum('total_price');
|
|
|
@file_put_contents('yesterday.txt', StoreOrder::getLastSql() . PHP_EOL, FILE_APPEND);
|
|
@file_put_contents('yesterday.txt', StoreOrder::getLastSql() . PHP_EOL, FILE_APPEND);
|
|
|
- $achievement = bcmul((string)$achievement, '0.05', 2);
|
|
|
|
|
|
|
+ $achievement = bcmul((string)$achievement, '0.05', 6);
|
|
|
/** @var UserExtractRepository $extractRepositories */
|
|
/** @var UserExtractRepository $extractRepositories */
|
|
|
$extractRepositories = app()->make(UserExtractRepository::class);
|
|
$extractRepositories = app()->make(UserExtractRepository::class);
|
|
|
$commission = $extractRepositories->search(['status' => 1])->whereBetween('check_time', [$time_start, $time_end])->sum('commission');
|
|
$commission = $extractRepositories->search(['status' => 1])->whereBetween('check_time', [$time_start, $time_end])->sum('commission');
|
|
|
@file_put_contents('yesterday.txt', UserExtract::getLastSql() . PHP_EOL, FILE_APPEND);
|
|
@file_put_contents('yesterday.txt', UserExtract::getLastSql() . PHP_EOL, FILE_APPEND);
|
|
|
$userService = app()->make(UserRepository::class);
|
|
$userService = app()->make(UserRepository::class);
|
|
|
$num = $userService->search(['status' => 1])->sum('award_integral');
|
|
$num = $userService->search(['status' => 1])->sum('award_integral');
|
|
|
- $sum_achievement = bcadd((string)$commission, (string)$achievement, 2);
|
|
|
|
|
|
|
+ $sum_achievement = bcadd((string)$commission, (string)$achievement, 6);
|
|
|
|
|
|
|
|
- $rise = $num > 0 ? bcdiv($sum_achievement, $num, 3) : 0;
|
|
|
|
|
- $price = bcadd($rise, $basePrice, 3);
|
|
|
|
|
|
|
+ $rise = $num > 0 ? bcdiv($sum_achievement, $num, 6) : 0;
|
|
|
|
|
+ $price = bcadd($rise, $basePrice, 6);
|
|
|
|
|
|
|
|
|
|
|
|
|
return compact('basePrice', 'price', 'rise', 'achievement', 'commission', 'num');
|
|
return compact('basePrice', 'price', 'rise', 'achievement', 'commission', 'num');
|