列表

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);
     }

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();

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']];
     }

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);