|
|
@@ -604,18 +604,14 @@ class OrderController extends BaseController
|
|
|
public function actionList()
|
|
|
{
|
|
|
$get = Yii::$app->request->get();
|
|
|
+ $where['mainId'] = $this->mainId;
|
|
|
$status = $get['status'] ?? 0;
|
|
|
if (!empty($status)) {
|
|
|
$where['status'] = $status;
|
|
|
}
|
|
|
- $where['sjId'] = $this->sjId;
|
|
|
- if (isset($get['shopId'])) {
|
|
|
- $shopId = $get['shopId'] ?? 0;
|
|
|
- if (!empty($shopId)) {
|
|
|
- $where['shopId'] = $this->shopId;
|
|
|
- }
|
|
|
- } else {
|
|
|
- $where['shopId'] = $this->shopId;
|
|
|
+ $book = $get['book'] ?? -1;
|
|
|
+ if ($book > -1) {
|
|
|
+ $where['book'] = $book;
|
|
|
}
|
|
|
$searchTime = $get['searchTime'] ?? '';
|
|
|
if (!empty($searchTime)) {
|
