|
|
@@ -598,14 +598,6 @@ class OrderClass extends BaseClass
|
|
|
return $list;
|
|
|
}
|
|
|
|
|
|
- //订单列表 ssh 2021.1.19
|
|
|
- public static function getOrderList($where)
|
|
|
- {
|
|
|
- $data = self::getList('*', $where, 'addTime DESC');
|
|
|
- $data['list'] = self::groupOrder($data['list'], true, false, false, true);
|
|
|
- return $data;
|
|
|
- }
|
|
|
-
|
|
|
//显示操作按钮
|
|
|
public static function getShowButton($showButton, $isList, $order)
|
|
|
{
|
|
|
@@ -814,6 +806,18 @@ class OrderClass extends BaseClass
|
|
|
return ['list' => $list, 'itemStat' => $itemStat];
|
|
|
}
|
|
|
|
|
|
+ //订单列表 ssh 2021.1.19
|
|
|
+ public static function getOrderList($where)
|
|
|
+ {
|
|
|
+ $data = self::getList('*', $where, 'addTime DESC');
|
|
|
+ if (isset($data['list']) && !empty($data['list'])) {
|
|
|
+ foreach ($data['list'] as $key => $val) {
|
|
|
+ $data['list'][$key]['customAvatarUrl'] = imgUtil::groupImg('');
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return $data;
|
|
|
+ }
|
|
|
+
|
|
|
//整合订单员工和供应商等信息 ssh 2021.1.19
|
|
|
//$isList 是否列表页
|
|
|
public static function groupOrder($list, $showButton = false, $showItem = false, $showExpress = false, $isList = false)
|