pdkj
/
jiqu-library-server
6
0
Fork 0
Code Releases Activity

批零统计优化

release
李静 2022-04-19 13:49:36 +08:00
parent 3405c0f66f
commit d5692c9c3d
2 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Endpoint/Api/Http/Controllers/Dealer/FansController.php
View File

@ -3,7 +3,6 @@
namespace App\Endpoint\Api\Http\Controllers\Dealer; namespace App\Endpoint\Api\Http\Controllers\Dealer;
use App\Actions\Dealer\CalculatePurchaseAmountOfCurrentPeriod; use App\Actions\Dealer\CalculatePurchaseAmountOfCurrentPeriod;
use App\Actions\Dealer\CalculateUnsettledPurchaseAmount;
use App\Endpoint\Api\Http\Controllers\Controller; use App\Endpoint\Api\Http\Controllers\Controller;
use App\Endpoint\Api\Http\Resources\Dealer\DealerFansResource; use App\Endpoint\Api\Http\Resources\Dealer\DealerFansResource;
use App\Helpers\Paginator as PaginatorHelper; use App\Helpers\Paginator as PaginatorHelper;
@ -16,20 +15,17 @@ class FansController extends Controller
* 统计当前信息 * 统计当前信息
* *
* @param Request $request * @param Request $request
* @param CalculateUnsettledPurchaseAmount $calculateUnsettledPurchaseAmount
* @param CalculatePurchaseAmountOfCurrentPeriod $calculatePurchaseAmountOfCurrentPeriod * @param CalculatePurchaseAmountOfCurrentPeriod $calculatePurchaseAmountOfCurrentPeriod
*/ */
public function statistics( public function statistics(
Request $request, Request $request,
CalculateUnsettledPurchaseAmount $calculateUnsettledPurchaseAmount,
CalculatePurchaseAmountOfCurrentPeriod $calculatePurchaseAmountOfCurrentPeriod CalculatePurchaseAmountOfCurrentPeriod $calculatePurchaseAmountOfCurrentPeriod
) { ) {
$user = $request->user(); $user = $request->user();
return response()->json([ return response()->json([
'fans_num'=> $user->fans()->count(), 'fans_num'=> $user->fans()->count(),
// 未完成的业绩 'unsettled_purchase_amount' => '0.00',
'unsettled_purchase_amount' => $calculateUnsettledPurchaseAmount->handle($user->dealer),
'current_period_purchase_amount'=> $calculatePurchaseAmountOfCurrentPeriod->handle($user->dealer), 'current_period_purchase_amount'=> $calculatePurchaseAmountOfCurrentPeriod->handle($user->dealer),
]); ]);
} }

18
app/Endpoint/Api/Http/Controllers/Dealer/UserController.php
View File

@ -4,8 +4,6 @@ namespace App\Endpoint\Api\Http\Controllers\Dealer;
use App\Actions\Dealer\CalculateManageSubsidiesOfCurrentPeriod; use App\Actions\Dealer\CalculateManageSubsidiesOfCurrentPeriod;
use App\Actions\Dealer\CalculatePurchaseAmountOfCurrentPeriod; 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\Controllers\Controller;
use App\Endpoint\Api\Http\Resources\Dealer\DealerResource; use App\Endpoint\Api\Http\Resources\Dealer\DealerResource;
use App\Endpoint\Api\Http\Resources\Dealer\UserInfoResource; use App\Endpoint\Api\Http\Resources\Dealer\UserInfoResource;
@ -17,17 +15,13 @@ class UserController extends Controller
* 个人信息 * 个人信息
* *
* @param \Illuminate\Http\Request $request * @param \Illuminate\Http\Request $request
* @param \App\Actions\Dealer\CalculateUnsettledManageSubsidies $calculateNotCompletedManageSubsidies
* @param \App\Actions\Dealer\CalculateManageSubsidiesOfCurrentPeriod $calculateManageSubsidiesOfCurrentPeriod * @param \App\Actions\Dealer\CalculateManageSubsidiesOfCurrentPeriod $calculateManageSubsidiesOfCurrentPeriod
* @param \App\Actions\Dealer\CalculateUnsettledPurchaseAmount $calculateNotCompletedPurchaseAmount
* @param \App\Actions\Dealer\CalculatePurchaseAmountOfCurrentPeriod $calculatePurchaseAmountOfCurrentPeriod * @param \App\Actions\Dealer\CalculatePurchaseAmountOfCurrentPeriod $calculatePurchaseAmountOfCurrentPeriod
* @return \Illuminate\Http\JsonResponse * @return \Illuminate\Http\JsonResponse
*/ */
public function show( public function show(
Request $request, Request $request,
CalculateUnsettledManageSubsidies $calculateUnsettledManageSubsidies,
CalculateManageSubsidiesOfCurrentPeriod $calculateManageSubsidiesOfCurrentPeriod, CalculateManageSubsidiesOfCurrentPeriod $calculateManageSubsidiesOfCurrentPeriod,
CalculateUnsettledPurchaseAmount $calculateUnsettledPurchaseAmount,
CalculatePurchaseAmountOfCurrentPeriod $calculatePurchaseAmountOfCurrentPeriod CalculatePurchaseAmountOfCurrentPeriod $calculatePurchaseAmountOfCurrentPeriod
) { ) {
$user = $request->user(); $user = $request->user();
@ -35,17 +29,9 @@ class UserController extends Controller
$user->dealer->setRelation('userInfo', $user->userInfo); $user->dealer->setRelation('userInfo', $user->userInfo);
$dealerResource = DealerResource::make($user->dealer)->toArray($request); $dealerResource = DealerResource::make($user->dealer)->toArray($request);
$dealerResource['guanli_values'] = bcadd( $dealerResource['guanli_values'] = $calculateManageSubsidiesOfCurrentPeriod->handle($user->dealer);
$calculateUnsettledManageSubsidies->handle($user->dealer),
$calculateManageSubsidiesOfCurrentPeriod->handle($user->dealer),
2
);
$dealerResource['archived_purchase_amount'] = $user->dealer->archived_purchase_amount; $dealerResource['archived_purchase_amount'] = $user->dealer->archived_purchase_amount;
$dealerResource['total_purchase_amount'] = bcadd( $dealerResource['total_purchase_amount'] = $calculatePurchaseAmountOfCurrentPeriod->handle($user->dealer);
$calculateUnsettledPurchaseAmount->handle($user->dealer),
$calculatePurchaseAmountOfCurrentPeriod->handle($user->dealer),
2
);
return response()->json([ return response()->json([
'id' => $user->id, 'id' => $user->id,