|
@@ -1770,11 +1770,10 @@ class Orders extends Auth {
|
|
|
$curtime15 = $curtime + 60 * 15;
|
|
$curtime15 = $curtime + 60 * 15;
|
|
|
$limitTime = date('Y-m-d H:i:s', $curtime15);
|
|
$limitTime = date('Y-m-d H:i:s', $curtime15);
|
|
|
|
|
|
|
|
- // 1. 各分组先按 status 升序,再按 xtime 降序(一次 sort 搞定,用 arraySequence 两次是历史写法)
|
|
|
|
|
$sortFn = function ($list) {
|
|
$sortFn = function ($list) {
|
|
|
if (!$list) return [];
|
|
if (!$list) return [];
|
|
|
- $list = arraySequence($list, 'status'); // 先按 status 升序
|
|
|
|
|
- $list = arraySequence($list, 'xtime', 'SORT_DESC'); // 再按 xtime 降序(稳定排序,保持 status 分组)
|
|
|
|
|
|
|
+ $list = arraySequence($list, 'status');
|
|
|
|
|
+ $list = arraySequence($list, 'xtime', 'SORT_DESC');
|
|
|
return $list;
|
|
return $list;
|
|
|
};
|
|
};
|
|
|
|
|
|
|
@@ -1782,26 +1781,35 @@ class Orders extends Auth {
|
|
|
$newret3 = $sortFn($newret3);
|
|
$newret3 = $sortFn($newret3);
|
|
|
$newret1 = $sortFn($newret1);
|
|
$newret1 = $sortFn($newret1);
|
|
|
|
|
|
|
|
- // 2. 合并主列表
|
|
|
|
|
$all = array_merge($newret2, $newret3, $newret1);
|
|
$all = array_merge($newret2, $newret3, $newret1);
|
|
|
|
|
|
|
|
- // 3. newret4 按 status 拆成三组,统一走同样的过滤逻辑
|
|
|
|
|
$a1 = $a2 = $a3 = [];
|
|
$a1 = $a2 = $a3 = [];
|
|
|
foreach ($newret4 as $v) {
|
|
foreach ($newret4 as $v) {
|
|
|
- if ($v['status'] == 3) $a1[] = $v; // 延时任务
|
|
|
|
|
- elseif ($v['status'] == 1) $a2[] = $v; // 新任务
|
|
|
|
|
|
|
+ if ($v['status'] == 3) $a1[] = $v; // 延迟
|
|
|
|
|
+ elseif ($v['status'] == 1) $a2[] = $v; // 新单
|
|
|
elseif ($v['status'] == 2) $a3[] = $v; // 进行中
|
|
elseif ($v['status'] == 2) $a3[] = $v; // 进行中
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- // 4. 三组合并后统一排序 + 统一过滤(priority != 4 且 xq_time < 15分钟后)
|
|
|
|
|
- $a = array_merge($a2, $a3, $a1); // 保持 新任务 → 进行中 → 延时 的顺序
|
|
|
|
|
- $a = $sortFn($a);
|
|
|
|
|
|
|
+ $a2 = $sortFn($a2);
|
|
|
|
|
+ $a3 = $sortFn($a3);
|
|
|
|
|
+ $a1 = $sortFn($a1);
|
|
|
|
|
|
|
|
- foreach ($a as $v) {
|
|
|
|
|
- if ($v['priority'] != 4 && $v['xq_time'] < $limitTime) {
|
|
|
|
|
- $all[] = $v;
|
|
|
|
|
|
|
+ $filterFn = function ($list) use ($limitTime) {
|
|
|
|
|
+ $out = [];
|
|
|
|
|
+ foreach ($list as $v) {
|
|
|
|
|
+ if ($v['priority'] != 4 && $v['xq_time'] < $limitTime) {
|
|
|
|
|
+ $out[] = $v;
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
- }
|
|
|
|
|
|
|
+ return $out;
|
|
|
|
|
+ };
|
|
|
|
|
+
|
|
|
|
|
+ $all = array_merge(
|
|
|
|
|
+ $all,
|
|
|
|
|
+ $filterFn($a2),
|
|
|
|
|
+ $filterFn($a3),
|
|
|
|
|
+ $filterFn($a1)
|
|
|
|
|
+ );
|
|
|
|
|
|
|
|
$newret = $all;
|
|
$newret = $all;
|
|
|
}
|
|
}
|