状态查询

application/admin/dao/PaymentOrderDao.php

@@ -120,7 +120,7 @@ class PaymentOrderDao
             if (!empty($param['name'])) {
                 $where['a.name'] = ["like","%".$param['name']."%"];
             }
-            if ($param['status']."" != 'all') {
+            if ($param['status']."" != 'all' && $param['status']!=="") {
                 $where["a.status"] = $param['status'];
             }
             $having = [];

application/admin/dao/ReceiptOrderDao.php

@@ -121,7 +121,7 @@ class ReceiptOrderDao
             if (!empty($param['name'])) {
                 $where['a.name'] = ["like","%".$param['name']."%"];
             }
-            if ($param['status']."" != 'all') {
+            if ($param['status']."" != 'all' && $param['status']!=="") {
                 $where["a.status"] = $param['status'];
             }
             $having = "";

application/admin/service/OrderMainService.php

@@ -314,7 +314,7 @@ class OrderMainService
         if (!empty($param['channel_id'])) {
             $where[] = " a.channel_id = {$param['channel_id']} ";
         }
-        if ($param['order_status'] != '') {
+        if ($param['order_status'] !== '') {
             $where[] = " a.order_status = {$param['order_status']} ";
         }
         if (!empty($param['commissioner_id'])) {

application/admin/service/ReceiptOrderService.php

@@ -126,7 +126,10 @@ class ReceiptOrderService
         if (!empty($param['channel_id'])) {
             $where['channel_id'] = $param['channel_id'];
         }
-        if ($param['order_status'] != '') {
+        if (!empty($param['channel_order_no'])) {
+            $where['channel_order_no'] = $param['channel_order_no'];
+        }
+        if ($param['order_status'] !== '') {
             $where['order_status'] = $param['order_status'];
         }
         if (!empty($param['commissioner_id'])) {

application/admin/view/receipt_order/index.html

@@ -142,6 +142,10 @@
                                 :value="item.id">
                         </el-option>
                     </el-select>
+                </div>
+                <div class="header-search" style="width: 100%;margin-bottom: 10px">
+                    <span>用户名</span>
+                    <el-input v-model="orderMainListSearch.user_name" style="width: 150px;" placeholder="请输入内容" clearable></el-input>
                     <span>渠道：</span>
                     <el-select v-model="orderMainListSearch.channel_id" style="width: 150px;" placeholder="请选择" clearable>
                         <el-option
@@ -151,6 +155,8 @@
                                 :value="item.id">
                         </el-option>
                     </el-select>
+                    <span>渠道订单号：</span>
+                    <el-input v-model="orderMainListSearch.channel_order_no" style="width: 150px;" placeholder="请输入内容"></el-input>
                     <span>专员</span>
                     <el-select v-model="orderMainListSearch.commissioner_id" style="width: 150px;" placeholder="请选择" clearable>
                         <el-option
@@ -171,8 +177,6 @@
                     </el-select>
                 </div>
                 <div class="header-search" style="width: 100%;margin-bottom: 10px">
-                    <span>用户名</span>
-                    <el-input v-model="orderMainListSearch.user_name" style="width: 150px;" placeholder="请输入内容" clearable></el-input>
                     <span>手机号</span>
                     <el-input v-model="orderMainListSearch.user_phone" style="width: 150px;" placeholder="请输入内容" clearable></el-input>
                     <span>金额</span>
@@ -287,6 +291,7 @@
                     "receipt_order_id":"",
                     "inReceipt":"",
                     "order_id":"",
+                    "channel_order_no":"",
                     "channel_id":"",
                     "order_status":"",
                     "commissioner_id":"",