更新分页

modules/Channel/Http/Controllers/OrdersController.php

@@ -51,7 +51,7 @@ class OrdersController extends CatchController
                 if (getProp($param, 'user_id')) {
                     $val->total_count = $val->promotion_count;
                 }
-                unset($val->caompany_count, $val->promotion_count, $val->id, $val->puser_id, $val->pay_product_id, $val->create_ip, $val->transaction_id);
+                unset($val->caompany_count, $val->promotion_count, $val->id, $val->pay_product_id, $val->create_ip, $val->transaction_id);
                 unset($val->third_orderid, $val->pay_merchant_sourcem, $val->video_id, $val->video_series_sequence, $val->updated_at);
             }
         }

modules/Channel/Services/Order/OrderService.php

@@ -31,10 +31,9 @@ class OrderService
         if ($isAll) {
             $list = $sql->get();
         } else {
-            $list = $sql->simplePaginate(getProp($param, 'limit', 15));
+            $list = $sql->paginate(getProp($param, 'limit', 15));
         }
 
-
         if (!$list->isEmpty()) {
             $status = array_column(self::getOrderPayType(),null,'value');
             $types = array_column(self::getOrderType(),null,'value');

modules/Channel/Services/WechatMinprogram/WechatMinprogramUserService.php

@@ -95,7 +95,7 @@ class WechatMinprogramUserService
             ->where('orders.status', 'PAID')
             ->where('orders.uid', $uid)
             ->orderBy('orders.id', 'desc')
-            ->simplePaginate(15);
+            ->paginate(15);
 
         foreach ($list as $item) {
             $item->pay_name = '微信支付';
@@ -110,7 +110,6 @@ class WechatMinprogramUserService
                 $item->rechare_coin = "-";
                 $item->pay_result = '充值';
             }
-
             $item->from_page = $item->video_id > 0 ? "播放页" : "充值页";
         }
         return $list;
@@ -152,7 +151,7 @@ class WechatMinprogramUserService
     public static function getUserConsumeRecord(mixed $uid)
     {
         $tableName = 'coin_cost_record_' . ($uid % 8);
-        $result = DB::table($tableName)->where('uid', $uid)->orderBy('id', 'desc')->simplePaginate();
+        $result = DB::table($tableName)->where('uid', $uid)->orderBy('id', 'desc')->paginate();
         foreach ($result as $item) {
             $item->series_name = VideoSeries::where('video_id', $item->video_id)->where('series_sequence', $item->sequence)->select('series_name')->first()->series_name;
             $item->video_name = Videos::where('id', $item->video_id)->value('name');