u

app/Services/BalanceLogService.php

@@ -83,7 +83,7 @@ class BalanceLogService extends BaseService
 
         $limit = isset($search['limit']) ? $search['limit'] : 15;
         $paginator = self::model()::where(self::getWhere($search))
-                ->when(isset($search['change_types']) && !empty($search['change_types']), function($query) use ($search) {
+            ->when(isset($search['change_types']) && !empty($search['change_types']), function ($query) use ($search) {
                 return $query->whereIn('change_type', $search['change_types']);
             })
             ->orderBy('updated_at', 'desc')
@@ -122,15 +122,15 @@ class BalanceLogService extends BaseService
      * @param string|null $date
      * @return {*}
      */
-    public static function getTodayFlowing($memberId ,$date = null)
+    public static function getTodayFlowing($memberId, $date = null)
     {
         if (!$date) {
             $date = date('Y-m-d');
         }
-        $startTime = date('Y-m-d H:i:s',strtotime($date . ' 00:00:00'));
-        $endTime = date('Y-m-d H:i:s',strtotime($date . ' 23:59:59'));
-        
-        
+        $startTime = date('Y-m-d H:i:s', strtotime($date . ' 00:00:00'));
+        $endTime = date('Y-m-d H:i:s', strtotime($date . ' 23:59:59'));
+
+
         $flow = self::model()::where('member_id', $memberId)
             ->whereBetween('created_at', [$startTime, $endTime])
             ->where('change_type', '投注')
@@ -149,50 +149,50 @@ class BalanceLogService extends BaseService
         $text = '';
         $text .= "当日流水: " . number_format($flow, 2) . "\n";
         $text .= "返水额度: " . number_format($refund, 2) . "\n";
-        $text .= "当日盈利: " . number_format(($profit + $refund + $flow), 2)  . "\n";
-        $text .= "余额: " . number_format($walletInfo['available_balance'],2) . "\n";
+        $text .= "当日盈利: " . number_format(($profit + $refund + $flow), 2) . "\n";
+        $text .= "余额: " . number_format($walletInfo['available_balance'], 2) . "\n";
         return [
             'chat_id' => $memberId,
             'text' => $text
         ];
     }
 
-    public static function getFlowingHistory($memberId ,$messageId = null, $page = 1 ,$limit = 5)
+    public static function getFlowingHistory($memberId, $messageId = null, $page = 1, $limit = 5)
     {
-       $dateTime = date('Y-m-d 00:00:00');
+        $dateTime = date('Y-m-d 00:00:00');
         $list = [];
-        for ($i=0; $i < $limit; $i++) { 
-            $newIndex = ($page -1) * $limit + $i;
+        for ($i = 0; $i < $limit; $i++) {
+            $newIndex = ($page - 1) * $limit + $i;
             $date = date('Y-m-d', strtotime($dateTime . " -{$newIndex} day"));
-             $startTime = date('Y-m-d H:i:s',strtotime($date . ' 00:00:00'));
-             $endTime = date('Y-m-d H:i:s',strtotime($date . ' 23:59:59'));
-             
-             
-             $flow = self::model()::where('member_id', $memberId)
-                 ->whereBetween('created_at', [$startTime, $endTime])
-                 ->where('change_type', '投注')
-                 ->sum('amount');
-             $refund = self::model()::where('member_id', $memberId)
-                 ->whereBetween('created_at', [$startTime, $endTime])
-                 ->where('change_type', '返水')
-                 ->sum('amount');
- 
-             $profit = self::model()::where('member_id', $memberId)
-                 ->whereBetween('created_at', [$startTime, $endTime])
-                 ->where('change_type', '开奖') //嬴正数 输负数
-                 ->sum('amount');
- 
-             $list[] = [
-                 'date' => $date,
-                 'flow' => number_format($flow, 2),
-                 'refund' => number_format($refund, 2),
-                 'profit' => number_format(($profit + $refund + $flow), 2)
-             ];
+            $startTime = date('Y-m-d H:i:s', strtotime($date . ' 00:00:00'));
+            $endTime = date('Y-m-d H:i:s', strtotime($date . ' 23:59:59'));
+
+
+            $flow = self::model()::where('member_id', $memberId)
+                ->whereBetween('created_at', [$startTime, $endTime])
+                ->where('change_type', '投注')
+                ->sum('amount');
+            $refund = self::model()::where('member_id', $memberId)
+                ->whereBetween('created_at', [$startTime, $endTime])
+                ->where('change_type', '返水')
+                ->sum('amount');
+
+            $profit = self::model()::where('member_id', $memberId)
+                ->whereBetween('created_at', [$startTime, $endTime])
+                ->where('change_type', '开奖') //嬴正数 输负数
+                ->sum('amount');
+
+            $list[] = [
+                'date' => $date,
+                'flow' => number_format($flow, 2),
+                'refund' => number_format($refund, 2),
+                'profit' => number_format(($profit + $refund + $flow), 2)
+            ];
         }
         // $startTime = date('Y-m-d H:i:s',strtotime($date . ' 00:00:00'));
         // $endTime = date('Y-m-d H:i:s',strtotime($date . ' 23:59:59'));
-        
-        
+
+
         // $list = self::model()::where('member_id', $memberId)
         //     ->whereBetween('created_at', [$startTime, $endTime])
         //     ->orderBy('created_at', 'desc')
@@ -207,17 +207,16 @@ class BalanceLogService extends BaseService
             $text .= "盈利： {$item['profit']} \n";
         }
 
-        $keyboard = [];
+        $keyboard = [
+            [
+                ['text' => "👇下一页", 'callback_data' => "FlowingHistoryPage@@" . ($page + 1)]
+            ]
+        ];
 
         if ($page > 1) {
-            $keyboard[] = [
-                ['text' => "👆上一页", 'callback_data' => "FlowingHistoryPage@@" . ($page - 1)]
-            ];
+            array_unshift($keyboard[0], ['text' => "👆上一页", 'callback_data' => "FlowingHistoryPage@@" . ($page - 1)]);
         }
 
-        $keyboard[] = [
-                    ['text' => "👇下一页", 'callback_data' => "FlowingHistoryPage@@" . ($page + 1)]
-                ];
 
         $msg = [];
         $msg['chat_id'] = $memberId;