Parcourir la source

用户详情充值记录分页

zqwang il y a 1 an
Parent
commit
7ac80d3ae5

+ 0 - 1
modules/Channel/Http/Controllers/OrdersController.php

@@ -93,7 +93,6 @@ class OrdersController extends CatchController
         $pid = $request->input('user_id');
         $limit = $request->input('limit',20);
         $userContext = $this->getUserContext(null);
-
         // 公司账户处理
         if ($userContext['loginUserRoles']->contains('company')) {
             $pid = $userContext['operateUser']->id;

+ 2 - 2
modules/Channel/Services/WechatMinprogram/WechatMinprogramUserService.php

@@ -102,14 +102,14 @@ class WechatMinprogramUserService
         }
 
         $list = $list->orderBy('orders.id', 'desc')
-            ->paginate(15);
+            ->paginate(getProp($param,'limit',15));
 
         foreach ($list as $item) {
             $item->pay_name = '微信支付';
             $item->status = '已完成';
             if ($item->type == 'COIN') {
                 $item->rechare_coin = $item->product_price * 100;
-                $item->pay_result = $item->product_price * 100 + $item->given;
+                $item->pay_result =- $item->product_price * 100 + $item->given;
             } elseif (isset($pool[$item->type])) {
                 $item->rechare_coin = "-";
                 $item->pay_result = $pool[$item->type];