diff --git a/app/Actions/Dealer/CalculateNotCompletedManageSubsidies.php b/app/Actions/Dealer/CalculateUnsettledManageSubsidies.php similarity index 89% rename from app/Actions/Dealer/CalculateNotCompletedManageSubsidies.php rename to app/Actions/Dealer/CalculateUnsettledManageSubsidies.php index 93448d8c..2f17f050 100644 --- a/app/Actions/Dealer/CalculateNotCompletedManageSubsidies.php +++ b/app/Actions/Dealer/CalculateUnsettledManageSubsidies.php @@ -5,7 +5,7 @@ namespace App\Actions\Dealer; use App\Models\Dealer; use App\Models\DealerManageSubsidyLog; -class CalculateNotCompletedManageSubsidies +class CalculateUnsettledManageSubsidies { /** * @param \App\Models\Dealer $dealer diff --git a/app/Actions/Dealer/CalculateNotCompletedPurchaseAmount.php b/app/Actions/Dealer/CalculateUnsettledPurchaseAmount.php similarity index 91% rename from app/Actions/Dealer/CalculateNotCompletedPurchaseAmount.php rename to app/Actions/Dealer/CalculateUnsettledPurchaseAmount.php index 87a2a833..8f925094 100644 --- a/app/Actions/Dealer/CalculateNotCompletedPurchaseAmount.php +++ b/app/Actions/Dealer/CalculateUnsettledPurchaseAmount.php @@ -5,7 +5,7 @@ namespace App\Actions\Dealer; use App\Models\Dealer; use App\Models\DealerPurchaseLog; -class CalculateNotCompletedPurchaseAmount +class CalculateUnsettledPurchaseAmount { /** * 计算经销商的未完成的进货业绩 diff --git a/app/Endpoint/Api/Http/Controllers/Dealer/FansController.php b/app/Endpoint/Api/Http/Controllers/Dealer/FansController.php index a6a1acc3..a1a18362 100644 --- a/app/Endpoint/Api/Http/Controllers/Dealer/FansController.php +++ b/app/Endpoint/Api/Http/Controllers/Dealer/FansController.php @@ -2,8 +2,8 @@ namespace App\Endpoint\Api\Http\Controllers\Dealer; -use App\Actions\Dealer\CalculateNotCompletedPurchaseAmount; 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,12 +16,12 @@ class FansController extends Controller * 统计当前信息 * * @param Request $request - * @param CalculateNotCompletedPurchaseAmount $calculateNotCompletedPurchaseAmount + * @param CalculateUnsettledPurchaseAmount $calculateUnsettledPurchaseAmount * @param CalculatePurchaseAmountOfCurrentPeriod $calculatePurchaseAmountOfCurrentPeriod */ public function statistics( Request $request, - CalculateNotCompletedPurchaseAmount $calculateNotCompletedPurchaseAmount, + CalculateUnsettledPurchaseAmount $calculateUnsettledPurchaseAmount, CalculatePurchaseAmountOfCurrentPeriod $calculatePurchaseAmountOfCurrentPeriod ) { $user = $request->user(); @@ -29,8 +29,8 @@ class FansController extends Controller return response()->json([ 'fans_num'=> $user->fans()->count(), // 未完成的业绩 - 'not_completed_purchase_amount' => $calculateNotCompletedPurchaseAmount->handle($user->dealer), - 'total_purchase_amount'=> $calculatePurchaseAmountOfCurrentPeriod->handle($user->dealer), + 'unsettled_purchase_amount' => $calculateUnsettledPurchaseAmount->handle($user->dealer), + 'current_period_purchase_amount'=> $calculatePurchaseAmountOfCurrentPeriod->handle($user->dealer), ]); } diff --git a/app/Endpoint/Api/Http/Controllers/Dealer/ManageSubsidyController.php b/app/Endpoint/Api/Http/Controllers/Dealer/ManageSubsidyController.php new file mode 100644 index 00000000..a0099bc9 --- /dev/null +++ b/app/Endpoint/Api/Http/Controllers/Dealer/ManageSubsidyController.php @@ -0,0 +1,34 @@ +user(); + + return response()->json([ + // 未结算的管理津贴 + 'unsettled_manage_subsidies' => $calculateUnsettledManageSubsidies->handle($user->dealer), + // 本期已结算的管理津贴 + 'current_period_manage_subsidies'=> $calculateManageSubsidiesOfCurrentPeriod->handle($user->dealer), + ]); + } +} diff --git a/app/Endpoint/Api/Http/Controllers/Dealer/UserController.php b/app/Endpoint/Api/Http/Controllers/Dealer/UserController.php index 88a8c3aa..5f78bab4 100644 --- a/app/Endpoint/Api/Http/Controllers/Dealer/UserController.php +++ b/app/Endpoint/Api/Http/Controllers/Dealer/UserController.php @@ -3,9 +3,9 @@ namespace App\Endpoint\Api\Http\Controllers\Dealer; use App\Actions\Dealer\CalculateManageSubsidiesOfCurrentPeriod; -use App\Actions\Dealer\CalculateNotCompletedManageSubsidies; -use App\Actions\Dealer\CalculateNotCompletedPurchaseAmount; 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 +17,17 @@ class UserController extends Controller * 个人信息 * * @param \Illuminate\Http\Request $request - * @param \App\Actions\Dealer\CalculateNotCompletedManageSubsidies $calculateNotCompletedManageSubsidies + * @param \App\Actions\Dealer\CalculateUnsettledManageSubsidies $calculateNotCompletedManageSubsidies * @param \App\Actions\Dealer\CalculateManageSubsidiesOfCurrentPeriod $calculateManageSubsidiesOfCurrentPeriod - * @param \App\Actions\Dealer\CalculateNotCompletedPurchaseAmount $calculateNotCompletedPurchaseAmount + * @param \App\Actions\Dealer\CalculateUnsettledPurchaseAmount $calculateNotCompletedPurchaseAmount * @param \App\Actions\Dealer\CalculatePurchaseAmountOfCurrentPeriod $calculatePurchaseAmountOfCurrentPeriod * @return \Illuminate\Http\JsonResponse */ public function show( Request $request, - CalculateNotCompletedManageSubsidies $calculateNotCompletedManageSubsidies, + CalculateUnsettledManageSubsidies $calculateUnsettledManageSubsidies, CalculateManageSubsidiesOfCurrentPeriod $calculateManageSubsidiesOfCurrentPeriod, - CalculateNotCompletedPurchaseAmount $calculateNotCompletedPurchaseAmount, + CalculateUnsettledPurchaseAmount $calculateUnsettledPurchaseAmount, CalculatePurchaseAmountOfCurrentPeriod $calculatePurchaseAmountOfCurrentPeriod ) { $user = $request->user(); @@ -36,12 +36,12 @@ class UserController extends Controller $dealerResource = DealerResource::make($user->dealer)->toArray($request); $dealerResource['guanli_values'] = bcadd( - $calculateNotCompletedManageSubsidies->handle($user->dealer), + $calculateUnsettledManageSubsidies->handle($user->dealer), $calculateManageSubsidiesOfCurrentPeriod->handle($user->dealer), 2 ); $dealerResource['total_purchase_amount'] = bcadd( - $calculateNotCompletedPurchaseAmount->handle($user->dealer), + $calculateUnsettledPurchaseAmount->handle($user->dealer), $calculatePurchaseAmountOfCurrentPeriod->handle($user->dealer), 2 ); diff --git a/app/Endpoint/Api/routes.php b/app/Endpoint/Api/routes.php index 6a733c59..85e53985 100644 --- a/app/Endpoint/Api/routes.php +++ b/app/Endpoint/Api/routes.php @@ -302,6 +302,8 @@ Route::group([ Route::get('purchase-subsidies', [Dealer\PurchaseSubsidyController::class, 'index']); // 进货补贴流水 Route::get('purchase-subsidies/{purchase_subsidy}/logs', [Dealer\PurchaseSubsidyLogController::class, 'index']); + // 管理津贴统计 + Route::get('manage-subsidy-statistics', [Dealer\ManageSubsidyController::class, 'statistics']); // 管理津贴流水 Route::get('manage-subsidy-logs', [Dealer\ManageSubsidyLogController::class, 'index']);