From d5692c9c3db75513fe8d3aedd3af30d750b27ccc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=9D=99?= <lym125@gmail.com>
Date: Tue, 19 Apr 2022 13:49:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=9B=B6=E7=BB=9F=E8=AE=A1=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Http/Controllers/Dealer/FansController.php |  6 +-----
 .../Http/Controllers/Dealer/UserController.php | 18 ++----------------
 2 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/app/Endpoint/Api/Http/Controllers/Dealer/FansController.php b/app/Endpoint/Api/Http/Controllers/Dealer/FansController.php
index a1a18362..113a85c8 100644
--- a/app/Endpoint/Api/Http/Controllers/Dealer/FansController.php
+++ b/app/Endpoint/Api/Http/Controllers/Dealer/FansController.php
@@ -3,7 +3,6 @@
 namespace App\Endpoint\Api\Http\Controllers\Dealer;
 
 use App\Actions\Dealer\CalculatePurchaseAmountOfCurrentPeriod;
-use App\Actions\Dealer\CalculateUnsettledPurchaseAmount;
 use App\Endpoint\Api\Http\Controllers\Controller;
 use App\Endpoint\Api\Http\Resources\Dealer\DealerFansResource;
 use App\Helpers\Paginator as PaginatorHelper;
@@ -16,20 +15,17 @@ class FansController extends Controller
      * 统计当前信息
      *
      * @param Request $request
-     * @param CalculateUnsettledPurchaseAmount $calculateUnsettledPurchaseAmount
      * @param CalculatePurchaseAmountOfCurrentPeriod $calculatePurchaseAmountOfCurrentPeriod
      */
     public function statistics(
         Request $request,
-        CalculateUnsettledPurchaseAmount $calculateUnsettledPurchaseAmount,
         CalculatePurchaseAmountOfCurrentPeriod $calculatePurchaseAmountOfCurrentPeriod
     ) {
         $user = $request->user();
 
         return response()->json([
             'fans_num'=> $user->fans()->count(),
-            // 未完成的业绩
-            'unsettled_purchase_amount' => $calculateUnsettledPurchaseAmount->handle($user->dealer),
+            'unsettled_purchase_amount' => '0.00',
             'current_period_purchase_amount'=> $calculatePurchaseAmountOfCurrentPeriod->handle($user->dealer),
         ]);
     }
diff --git a/app/Endpoint/Api/Http/Controllers/Dealer/UserController.php b/app/Endpoint/Api/Http/Controllers/Dealer/UserController.php
index ad257c8f..eb6ef697 100644
--- a/app/Endpoint/Api/Http/Controllers/Dealer/UserController.php
+++ b/app/Endpoint/Api/Http/Controllers/Dealer/UserController.php
@@ -4,8 +4,6 @@ namespace App\Endpoint\Api\Http\Controllers\Dealer;
 
 use App\Actions\Dealer\CalculateManageSubsidiesOfCurrentPeriod;
 use App\Actions\Dealer\CalculatePurchaseAmountOfCurrentPeriod;
-use App\Actions\Dealer\CalculateUnsettledManageSubsidies;
-use App\Actions\Dealer\CalculateUnsettledPurchaseAmount;
 use App\Endpoint\Api\Http\Controllers\Controller;
 use App\Endpoint\Api\Http\Resources\Dealer\DealerResource;
 use App\Endpoint\Api\Http\Resources\Dealer\UserInfoResource;
@@ -17,17 +15,13 @@ class UserController extends Controller
      * 个人信息
      *
      * @param \Illuminate\Http\Request $request
-     * @param \App\Actions\Dealer\CalculateUnsettledManageSubsidies $calculateNotCompletedManageSubsidies
      * @param \App\Actions\Dealer\CalculateManageSubsidiesOfCurrentPeriod $calculateManageSubsidiesOfCurrentPeriod
-     * @param \App\Actions\Dealer\CalculateUnsettledPurchaseAmount $calculateNotCompletedPurchaseAmount
      * @param \App\Actions\Dealer\CalculatePurchaseAmountOfCurrentPeriod $calculatePurchaseAmountOfCurrentPeriod
      * @return \Illuminate\Http\JsonResponse
      */
     public function show(
         Request $request,
-        CalculateUnsettledManageSubsidies $calculateUnsettledManageSubsidies,
         CalculateManageSubsidiesOfCurrentPeriod $calculateManageSubsidiesOfCurrentPeriod,
-        CalculateUnsettledPurchaseAmount $calculateUnsettledPurchaseAmount,
         CalculatePurchaseAmountOfCurrentPeriod $calculatePurchaseAmountOfCurrentPeriod
     ) {
         $user = $request->user();
@@ -35,17 +29,9 @@ class UserController extends Controller
         $user->dealer->setRelation('userInfo', $user->userInfo);
 
         $dealerResource = DealerResource::make($user->dealer)->toArray($request);
-        $dealerResource['guanli_values'] = bcadd(
-            $calculateUnsettledManageSubsidies->handle($user->dealer),
-            $calculateManageSubsidiesOfCurrentPeriod->handle($user->dealer),
-            2
-        );
+        $dealerResource['guanli_values'] = $calculateManageSubsidiesOfCurrentPeriod->handle($user->dealer);
         $dealerResource['archived_purchase_amount'] = $user->dealer->archived_purchase_amount;
-        $dealerResource['total_purchase_amount'] = bcadd(
-            $calculateUnsettledPurchaseAmount->handle($user->dealer),
-            $calculatePurchaseAmountOfCurrentPeriod->handle($user->dealer),
-            2
-        );
+        $dealerResource['total_purchase_amount'] = $calculatePurchaseAmountOfCurrentPeriod->handle($user->dealer);
 
         return response()->json([
             'id' => $user->id,