|
|
@@ -1017,8 +1017,8 @@ class OrderController extends BaseController
|
|
|
public function actionList()
|
|
|
{
|
|
|
$get = Yii::$app->request->get();
|
|
|
- $search = isset($get['searchText']) ? $get['searchText'] : '';
|
|
|
- $searchType = isset($get['searchType']) && is_numeric($get['searchType']) ? $get['searchType'] : '';
|
|
|
+ $searchText = $get['searchText'] ?? '';
|
|
|
+ $searchStyle = $get['searchStyle'] ?? 0;
|
|
|
$shopId = $this->shopId ?? 0;
|
|
|
if (empty($shopId)) {
|
|
|
//没有登录不显示数据
|
|
|
@@ -1047,27 +1047,8 @@ class OrderController extends BaseController
|
|
|
if (!empty($get['shopAdminId'])) {
|
|
|
$where['shopAdminId'] = $get['shopAdminId'];
|
|
|
}
|
|
|
- if (!empty($search)) {
|
|
|
- if (is_numeric($searchType)) {
|
|
|
- if ($searchType == 0) {
|
|
|
- $where['actPrice'] = $search;
|
|
|
- } elseif ($searchType == 1) {
|
|
|
- $where['orderSn'] = $search;
|
|
|
- } elseif ($searchType == 2) {
|
|
|
- $where['bookMobile'] = $search;
|
|
|
- } elseif ($searchType == 3) {
|
|
|
- $where['customName'] = ['like', $search];
|
|
|
- } else {
|
|
|
- $where['actPrice'] = $search;
|
|
|
- }
|
|
|
- } else {
|
|
|
- //兼容旧版本
|
|
|
- if (stringUtil::isMobile($search)) {
|
|
|
- $where['bookMobile'] = $search;
|
|
|
- } else {
|
|
|
- $where['orderSn'] = strtoupper($search);
|
|
|
- }
|
|
|
- }
|
|
|
+ if ($searchStyle == 1) {
|
|
|
+ $where['sendNum'] = $searchText;
|
|
|
}
|
|
|
if (isset($get['repeat']) && $get['repeat'] > -1) {
|
|
|
$where['repeat'] = $get['repeat'];
|