优化

app-ghs/controllers/OrderController.php

@@ -2608,7 +2608,7 @@ class OrderController extends BaseController
         util::success($out);
     }
 
-    //客户欠款的订单 ssh 2021.2.4
+    // 客户欠款订单列表：searchTime 筛账单日期 payTime，sendSearchTime 筛发货日期 sendTimeWant
     public function actionDebtList()
     {
         $get = Yii::$app->request->get();
@@ -2628,11 +2628,19 @@ class OrderController extends BaseController
                 util::fail('请选时间');
             }
         }
+        // 发货日期筛选：按 xhGhsOrder.sendTimeWant，可与账单日期同时生效
+        $sendSearchTime = $get['sendSearchTime'] ?? '';
+        if (!empty($sendSearchTime)) {
+            $sendStartTime = $get['sendStartTime'] ?? '';
+            $sendEndTime = $get['sendEndTime'] ?? '';
+            $sendPeriod = dateUtil::formatTime($sendSearchTime, $sendStartTime, $sendEndTime);
+            $where['sendTimeWant'] = ['between', [$sendPeriod['startTime'], $sendPeriod['endTime']]];
+        }
         $allowedPageSizes = [100, 200, 300];
         $pageSize = isset($get['pageSize']) && in_array((int)$get['pageSize'], $allowedPageSizes, true)
             ? (int)$get['pageSize'] : 100;
         $page = max(1, (int)($get['page'] ?? 1));
-        $fields = ['id', 'orderSn', 'actPrice', 'addTime', 'remainDebtPrice', 'debtPrice', 'payTime', 'remark', 'tkPrice', 'nextDayTkPrice', 'clearId'];
+        $fields = ['id', 'orderSn', 'actPrice', 'addTime', 'remainDebtPrice', 'debtPrice', 'payTime', 'sendTimeWant', 'remark', 'tkPrice', 'nextDayTkPrice', 'clearId'];
         Yii::$app->request->setQueryParams(array_merge($get, ['page' => $page, 'pageSize' => $pageSize]));
         $result = OrderClass::getList($fields, $where, 'addTime DESC');
         if (!empty($result['list'])) {