diff --git a/app/Controller/v3/BalanceStatementController.php b/app/Controller/v3/BalanceStatementController.php index 52034f3..60085d3 100644 --- a/app/Controller/v3/BalanceStatementController.php +++ b/app/Controller/v3/BalanceStatementController.php @@ -27,10 +27,14 @@ class BalanceStatementController extends BaseController $pagesize = $this->request->input('pagesize',0); $startTime = $this->request->input('start_time',''); $endTime = $this->request->input('end_time',''); - if(!empty($startTime) && !empty($endTime)){ + if(!empty($startTime)){ $startTime = strtotime(date($startTime.' 00:00:00')); + } + + if(!empty($endTime)){ $endTime = strtotime(date($endTime.' 23:59:59')); } + return $this->success($this->revenueListService->getListByUser($userId, $page, $pagesize ,$startTime,$endTime)); } @@ -48,6 +52,7 @@ class BalanceStatementController extends BaseController if(!empty($endTime)){ $endTime = strtotime(date($endTime.' 23:59:59')); } + $res = $this->withdrawalListService->getListByStore($storeId,$page,$pagesize,$startTime,$endTime); return $this->success($res); } diff --git a/app/Controller/v3/WithdrawController.php b/app/Controller/v3/WithdrawController.php index 5dce312..b5fa126 100644 --- a/app/Controller/v3/WithdrawController.php +++ b/app/Controller/v3/WithdrawController.php @@ -152,7 +152,7 @@ class WithdrawController extends BaseController $withdraw = new StoreWithdrawal(); $withdraw->trade_no = $globalOrderId; $withdraw->store_id = $store->id; - $withdraw->name = $storeUser->real_name ?? $storeUser->nick_name; + $withdraw->name = $storeUser->nick_name ?: ''; $withdraw->tel = $storeUser->tel; $withdraw->apply_cash = $money; $withdraw->save(); diff --git a/app/Service/v3/Implementations/RevenueListService.php b/app/Service/v3/Implementations/RevenueListService.php index 6ee373e..aff796f 100644 --- a/app/Service/v3/Implementations/RevenueListService.php +++ b/app/Service/v3/Implementations/RevenueListService.php @@ -29,10 +29,19 @@ class RevenueListService implements RevenueListServiceInterface $mod = bcmod((string)$userId, '5', 0); $financialRecord->suffix($mod); $builder = $financialRecord->where('user_id',$userId); - if(!empty($startTime) && !empty($endTime)){ - $builder->whereBetween('created_at',[strtotime($startTime.' 00:00:00'),strtotime($endTime.' 23:59:59')]); + // if(!empty($startTime) && !empty($endTime)){ + // $builder->whereBetween('created_at',[strtotime($startTime.' 00:00:00'),strtotime($endTime.' 23:59:59')]); + // } + + if (!empty($startTime)) { + $builder->where('created_at', '>=', $startTime); } - $paginate = $builder->paginate($pagesize); + + if (!empty($endTime)) { + $builder->where('created_at', '<=', $endTime); + } + + $paginate = $builder->orderBy('created_at', 'desc')->paginate($pagesize); $revenues = $paginate->toArray(); return ['has_more_pages' => $paginate->hasMorePages(), 'revenue_list' => $revenues['data']]; } diff --git a/app/Service/v3/Implementations/WithdrawalListService.php b/app/Service/v3/Implementations/WithdrawalListService.php index 4c0366a..7b4588a 100644 --- a/app/Service/v3/Implementations/WithdrawalListService.php +++ b/app/Service/v3/Implementations/WithdrawalListService.php @@ -28,12 +28,12 @@ class WithdrawalListService implements WithdrawalListServiceInterface // $builder->whereBetween('created_at',[$startTime,$endTime]); // } - if (!empty($start_time)) { - $builder->where('created_at', '>=', $start_time); + if (!empty($startTime)) { + $builder->where('created_at', '>=', $startTime); } - if (!empty($end_time)) { - $builder->where('created_at', '<=', $end_time); + if (!empty($endTime)) { + $builder->where('created_at', '<=', $endTime); } $paginate = $builder->orderBy('created_at', 'desc')->paginate($pagesize);