各种列表和下单oid序号

app/Controller/v3/BalanceStatementController.php

@@ -41,8 +41,11 @@ 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'));
         }
         $res = $this->withdrawalListService->getListByStore($storeId,$page,$pagesize,$startTime,$endTime);

app/Service/v3/Implementations/OrderListService.php

@@ -158,8 +158,16 @@ class OrderListService implements OrderListServiceInterface
             ->where([''.$childTable.'.store_id' => $storeId, ''.$mainTable.'.type' => OrderType::OFFLINE])
             ->with('user');
 
-        if(!empty($start_time) && !empty($end_time)){
-            $builder->whereBetween(''.$mainTable.'.created_at',[strtotime($start_time.' 00:00:00'),strtotime($end_time.' 23:59:59')]);
+        // if(!empty($start_time) && !empty($end_time)){
+        //     $builder->whereBetween(''.$mainTable.'.created_at',[strtotime($start_time.' 00:00:00'),strtotime($end_time.' 23:59:59')]);
+        // }
+
+        if (!empty($start_time)) {
+            $builder->where(''.$mainTable.'.created_at', '>=', strtotime($start_time.' 00:00:00'));
+        }
+
+        if (!empty($end_time)) {
+            $builder->where(''.$mainTable.'.created_at', '<=', strtotime($end_time.' 23:59:59'));
         }
 
         $paginate = $builder->orderBy(''.$mainTable.'.created_at', 'desc')->paginate($pagesize);

app/Service/v3/Implementations/OrderOfflineService.php

@@ -37,6 +37,9 @@ class OrderOfflineService implements OrderOfflineServiceInterface
     {
         try {
 
+            $mainTable = ApplicationContext::getContainer()->get(OrderMain::class)->getTable();
+            $childTable = ApplicationContext::getContainer()->get(Order::class)->getTable();
+
             $store = Store::find($storeId);
 
             // 获取分布式全局ID
@@ -68,9 +71,9 @@ class OrderOfflineService implements OrderOfflineServiceInterface
 
             // 店铺今天的订单数
             $count = Order::query()
-                ->join('lanzu_order_main as main', 'main.id', '=', 'lanzu_order.order_main_id')
-                ->where(['lanzu_order.store_id' => $storeId, 'main.type' => OrderType::OFFLINE])
-                ->whereBetween('lanzu_order.created_at', [strtotime(date('Y-m-d 00:00:00')), strtotime(date('Y-m-d 23:59:59'))])
+                ->join($mainTable, ''.$mainTable.'.global_order_id', '=', ''.$childTable.'.order_main_id')
+                ->where([''.$childTable.'.store_id' => $storeId, ''.$mainTable.'.type' => OrderType::OFFLINE])
+                ->whereBetween(''.$childTable.'.created_at', [strtotime(date('Y-m-d 00:00:00')), strtotime(date('Y-m-d 23:59:59'))])
                 ->count();
 
             // 子订单数据

app/Service/v3/Implementations/OrderOnlineService.php

@@ -118,6 +118,9 @@ class OrderOnlineService implements OrderOnlineServiceInterface
 	    Db::beginTransaction();
         try {
 
+            $mainTable = ApplicationContext::getContainer()->get(OrderMain::class)->getTable();
+            $childTable = ApplicationContext::getContainer()->get(Order::class)->getTable();
+
             $currentTime = time();
             bcscale(6);
             // 用户收货地址
@@ -160,9 +163,9 @@ class OrderOnlineService implements OrderOnlineServiceInterface
                 $storeTypeIds[] = (string)$storeType;
                 // 店铺今天的订单数
                 $count = Order::query()
-                    ->join('lanzu_order_main as main', 'main.id', '=', 'lanzu_order.order_main_id')
-                    ->where(['lanzu_order.store_id' => $storeId, 'main.type' => OrderType::ONLINE])
-                    ->whereBetween('lanzu_order.created_at', [strtotime(date('Y-m-d 00:00:00')), strtotime(date('Y-m-d 23:59:59'))])
+                    ->join($mainTable, ''.$mainTable.'.global_order_id', '=', ''.$childTable.'.order_main_id')
+                    ->where([''.$childTable.'.store_id' => $storeId, ''.$mainTable.'.type' => OrderType::ONLINE])
+                    ->whereBetween(''.$childTable.'.created_at', [strtotime(date('Y-m-d 00:00:00')), strtotime(date('Y-m-d 23:59:59'))])
                     ->count();
 
                 // 用户购物车数据

app/Service/v3/Implementations/RevenueListService.php

@@ -30,7 +30,7 @@ class RevenueListService implements RevenueListServiceInterface
         $financialRecord->suffix($mod);
         $builder = $financialRecord->where('user_id',$userId);
         if(!empty($startTime) && !empty($endTime)){
-            $builder->whereBetween('created_at',[strtotime($startTime.' 23:59:59'),strtotime($endTime.' 23:59:59')]);
+            $builder->whereBetween('created_at',[strtotime($startTime.' 00:00:00'),strtotime($endTime.' 23:59:59')]);
         }
         $paginate = $builder->paginate($pagesize);
         $revenues = $paginate->toArray();
@@ -47,7 +47,7 @@ class RevenueListService implements RevenueListServiceInterface
         if(!empty($startTime) && !empty($endTime)){
             $builder->whereBetween('created_at',[$startTime,$endTime]);
         }
-        $revenue = $builder->select('money','money_type','created_at')->get()->toArray();
+        $revenue = $builder->select('money','money_type','created_at')->orderBy('created_at', 'desc')->get()->toArray();
         return $revenue;
     }
 }

app/Service/v3/Implementations/WithdrawalListService.php

@@ -24,9 +24,18 @@ class WithdrawalListService implements WithdrawalListServiceInterface
     public function getListByStore($storeId, $page=1, $pagesize=10 ,$startTime = '',$endTime = '')
     {
         $builder = StoreWithdrawal::query()->where('store_id',$storeId);
-        if(!empty($startTime) && !empty($endTime)){
-            $builder->whereBetween('created_at',[$startTime,$endTime]);
+        // if(!empty($startTime) && !empty($endTime)){
+        //     $builder->whereBetween('created_at',[$startTime,$endTime]);
+        // }
+
+        if (!empty($start_time)) {
+            $builder->where('created_at', '>=', $start_time);
+        }
+
+        if (!empty($end_time)) {
+            $builder->where('created_at', '<=', $end_time);
         }
+
         $paginate = $builder->orderBy('created_at', 'desc')->paginate($pagesize);
         $orders = $paginate->toArray();
         return ['has_more_pages' => $paginate->hasMorePages(), 'orders' => $orders['data']];