|
|
@@ -368,9 +368,14 @@ class ShopController extends BaseController {
|
|
|
'PERIOD_NUM'=> 'O.PERIOD_NUM',
|
|
|
'CREATED_AT'=> 'O.CREATED_AT',
|
|
|
]);
|
|
|
- $condition = ' 1=1 ' . $filter['condition'];
|
|
|
+// $condition = ' 1=1 ' . $filter['condition'];
|
|
|
+// $params = $filter['params'];
|
|
|
+// $condition .= $condition ? ' AND O.IS_DELETE=0' : ' O.IS_DELETE=0';
|
|
|
+
|
|
|
+ $condition = $filter['condition'];
|
|
|
$params = $filter['params'];
|
|
|
- $condition .= $condition ? ' AND O.IS_DELETE=0' : ' O.IS_DELETE=0';
|
|
|
+ $condition .= ' AND O.IS_DELETE=0';
|
|
|
+
|
|
|
$listObj = new OrderList();
|
|
|
$data = $listObj->getList(['condition'=>$condition, 'params'=>$params]);
|
|
|
return static::notice($data);
|