WIN-2308041133\Administrator 4 meses atrás
pai
commit
22cd782b91

+ 4 - 4
app/common/repositories/user/AwardIntegralPriceRepository.php

@@ -65,17 +65,17 @@ class AwardIntegralPriceRepository extends BaseRepository
             ->where('status', '>=', 0)
             ->sum('total_price');
         @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 */
         $extractRepositories = app()->make(UserExtractRepository::class);
         $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);
         $userService = app()->make(UserRepository::class);
         $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');

+ 8 - 0
app/controller/api/Auth.php

@@ -206,6 +206,14 @@ class Auth extends BaseController
         $data['integral_prcie'] =$integral_prcie['price'];
         $UserRepository = app()->make(UserRepository::class);
         $UserRepository->checkAward($user['uid']);
+        $GiftLevel = app()->make(GiftLevel::class);
+        $group_users = $GiftLevel->get_group_user($user['uid']);
+        $achievement1 = StoreOrder::where('uid','in', $group_users)->where('paid', 1)->where('product_type',2)->whereNotIn('status',-1)->sum('pay_price');
+        $achievement2 = StoreOrder::where('uid', $user['uid'])->where('paid', 1)->where('product_type',2)->whereNotIn('status',-1)->sum('pay_price');
+        $data['gift_performance'] = bcadd($achievement1, $achievement2, 2);
+        $achievement1 = StoreOrder::where('uid', 'in',$group_users)->where('paid', 1)->where('product_type',1)->whereNotIn('status',-1)->sum('pay_price');
+        $achievement2 = StoreOrder::where('uid', $user['uid'])->where('paid', 1)->where('product_type',1)->whereNotIn('status',-1)->sum('pay_price');
+        $data['oil_performance'] = bcadd($achievement1, $achievement2, 2);
         return app('json')->success($data);
     }