From 7a0f778dd145a79e92e56f35d0b880b20e09ab82 Mon Sep 17 00:00:00 2001
From: nizongfeng <nizongfeng@gmail.com>
Date: Sun, 5 Dec 2021 13:46:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/dao/PaymentOrderDao.php         | 2 +-
 application/admin/dao/ReceiptOrderDao.php         | 2 +-
 application/admin/service/OrderMainService.php    | 2 +-
 application/admin/service/ReceiptOrderService.php | 5 ++++-
 application/admin/view/receipt_order/index.html   | 9 +++++++--
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/application/admin/dao/PaymentOrderDao.php b/application/admin/dao/PaymentOrderDao.php
index 2937603..156cc18 100644
--- a/application/admin/dao/PaymentOrderDao.php
+++ b/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 = [];
diff --git a/application/admin/dao/ReceiptOrderDao.php b/application/admin/dao/ReceiptOrderDao.php
index bdd95a0..477f708 100644
--- a/application/admin/dao/ReceiptOrderDao.php
+++ b/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 = "";
diff --git a/application/admin/service/OrderMainService.php b/application/admin/service/OrderMainService.php
index 312a58d..93ddc7b 100644
--- a/application/admin/service/OrderMainService.php
+++ b/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'])) {
diff --git a/application/admin/service/ReceiptOrderService.php b/application/admin/service/ReceiptOrderService.php
index 072afea..8dcdced 100644
--- a/application/admin/service/ReceiptOrderService.php
+++ b/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'])) {
diff --git a/application/admin/view/receipt_order/index.html b/application/admin/view/receipt_order/index.html
index dfc0738..7412bc1 100755
--- a/application/admin/view/receipt_order/index.html
+++ b/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":"",