Merge branch 'clear-cg' into dev

app-ghs/controllers/OrderController.php

@@ -2477,9 +2477,9 @@ class OrderController extends BaseController
                 util::fail('请选时间');
             }
         }
-        $allowedPageSizes = [20, 50, 100, 300];
+        $allowedPageSizes = [50, 100, 200, 300];
         $pageSize = isset($get['pageSize']) && in_array((int)$get['pageSize'], $allowedPageSizes, true)
-            ? (int)$get['pageSize'] : 20;
+            ? (int)$get['pageSize'] : 50;
         $page = max(1, (int)($get['page'] ?? 1));
         $fields = ['id', 'orderSn', 'actPrice', 'addTime', 'remainDebtPrice', 'debtPrice', 'payTime'];
         Yii::$app->request->setQueryParams(array_merge($get, ['page' => $page, 'pageSize' => $pageSize]));

app-hd/controllers/OrderController.php

@@ -184,9 +184,9 @@ class OrderController extends BaseController
             $period = dateUtil::formatTime($searchTime, $startTime, $endTime);
             $where['addTime'] = ['between', [$period['startTime'], $period['endTime']]];
         }
-        $allowedPageSizes = [20, 50, 100, 300];
+        $allowedPageSizes = [50, 100, 200, 300];
         $pageSize = isset($get['pageSize']) && in_array((int)$get['pageSize'], $allowedPageSizes, true)
-            ? (int)$get['pageSize'] : 20;
+            ? (int)$get['pageSize'] : 50;
         $page = max(1, (int)($get['page'] ?? 1));
         $fields = ['id', 'orderSn', 'actPrice', 'addTime', 'remainDebtPrice', 'debtPrice'];
         Yii::$app->request->setQueryParams(array_merge($get, ['page' => $page, 'pageSize' => $pageSize]));

biz-ghs/order/services/PurchaseOrderService.php

@@ -15,9 +15,9 @@ class PurchaseOrderService extends BaseService
     public static function getDebtList($where)
     {
         $get = Yii::$app->request->get();
-        $allowedPageSizes = [20, 50, 100, 300];
+        $allowedPageSizes = [50, 100, 200, 300];
         $pageSize = isset($get['pageSize']) && in_array((int)$get['pageSize'], $allowedPageSizes, true)
-            ? (int)$get['pageSize'] : 20;
+            ? (int)$get['pageSize'] : 50;
         $page = max(1, (int)($get['page'] ?? 1));
         Yii::$app->request->setQueryParams(array_merge($get, ['page' => $page, 'pageSize' => $pageSize]));
         $result = PurchaseOrderClass::getList('*', $where, 'addTime DESC');

biz-hd/purchase/services/PurchaseService.php

@@ -24,7 +24,6 @@ use common\components\dict;
 use common\components\imgUtil;
 use common\components\noticeUtil;
 use common\components\util;
-use Yii;
 
 class PurchaseService extends BaseService
 {
@@ -187,9 +186,9 @@ class PurchaseService extends BaseService
     public static function getDebtList($where)
     {
         $get = Yii::$app->request->get();
-        $allowedPageSizes = [20, 50, 100, 300];
+        $allowedPageSizes = [50, 100, 200, 300];
         $pageSize = isset($get['pageSize']) && in_array((int)$get['pageSize'], $allowedPageSizes, true)
-            ? (int)$get['pageSize'] : 20;
+            ? (int)$get['pageSize'] : 50;
         $page = max(1, (int)($get['page'] ?? 1));
 
         $list = PurchaseClass::getAllList('*', $where, 'addTime DESC');