From 54ce9f2fb768efb970e3e38c6505f55b95fbec90 Mon Sep 17 00:00:00 2001
From: nizongfeng <nizongfeng@gmail.com>
Date: Thu, 25 Nov 2021 16:30:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/service/OrderMainService.php | 20 ++++++++++++++++
 application/admin/view/order_main/index.html   | 33 ++++++++++++++++++--------
 2 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/application/admin/service/OrderMainService.php b/application/admin/service/OrderMainService.php
index c470835..eefec4a 100644
--- a/application/admin/service/OrderMainService.php
+++ b/application/admin/service/OrderMainService.php
@@ -308,6 +308,26 @@ class OrderMainService
         if (!empty($param['endMoney']) && !empty($param['startMoney'])) {
             $where['total_amount'] = ["between",[$param['startMoney'],$param['endMoney']]];
         }
+        //成本区间查询
+        if (!empty($param['startCost'])&& empty($param['endCost'])) {
+            $where['cost_amount'] = [">=",$param['startCost']];
+        }
+        if (!empty($param['endCost']) && empty($param['startCost'])) {
+            $where['cost_amount'] = ["<=",$param['endCost']];
+        }
+        if (!empty($param['endCost']) && !empty($param['startCost'])) {
+            $where['cost_amount'] = ["between",[$param['startCost'],$param['endCost']]];
+        }
+        //利润区间查询
+        if (!empty($param['startProfit'])&& empty($param['endProfit'])) {
+            $where['profit_amount'] = [">=",$param['startProfit']];
+        }
+        if (!empty($param['endProfit']) && empty($param['startProfit'])) {
+            $where['profit_amount'] = ["<=",$param['endProfit']];
+        }
+        if (!empty($param['endProfit']) && !empty($param['startProfit'])) {
+            $where['profit_amount'] = ["between",[$param['startProfit'],$param['endProfit']]];
+        }
         //时间区间查询
         if (!empty($param['startTime']) && empty($param['endTime'])) {
             $where['create_time'] = [">=",$param['startTime']." 00:00:00"];
diff --git a/application/admin/view/order_main/index.html b/application/admin/view/order_main/index.html
index 4adcb7a..51db32c 100755
--- a/application/admin/view/order_main/index.html
+++ b/application/admin/view/order_main/index.html
@@ -31,10 +31,12 @@
                         :value="item.id">
                 </el-option>
             </el-select>
-        </div>
-        <div class="header-search" style="width: 100%;margin-bottom: 10px">
             <span>用户名</span>
             <el-input v-model="search.user_name" style="width: 150px;" placeholder="请输入内容" clearable></el-input>
+            <span>手机号</span>
+            <el-input v-model="search.user_phone" style="width: 150px;" placeholder="请输入内容" clearable></el-input>
+        </div>
+        <div class="header-search" style="width: 100%;margin-bottom: 10px">
             <span>渠道订单号：</span>
             <el-input v-model="search.channel_order_no" style="width: 150px;" placeholder="请输入内容" clearable></el-input>
             <span>渠道：</span>
@@ -64,14 +66,6 @@
                         :value="item.id">
                 </el-option>
             </el-select>
-        </div>
-        <div class="header-search" style="width: 100%;margin-bottom: 10px">
-            <span>手机号</span>
-            <el-input v-model="search.user_phone" style="width: 150px;" placeholder="请输入内容" clearable></el-input>
-            <span>金额</span>
-            <el-input-number v-model="search.startMoney" style="width: 170px;" placeholder="请输入内容" clearable></el-input-number>
-            ~
-            <el-input-number v-model="search.endMoney" style="width: 170px;" placeholder="请输入内容" clearable></el-input-number>
             <span>时间</span>
             <el-date-picker
                     style="width: 150px;"
@@ -88,6 +82,21 @@
                     type="date"
                     placeholder="选择日期">
             </el-date-picker>
+        </div>
+        <div class="header-search" style="width: 100%;margin-bottom: 10px">
+            <span>金额</span>
+            <el-input-number v-model="search.startMoney" style="width: 170px;" placeholder="请输入内容" clearable></el-input-number>
+            ~
+            <el-input-number v-model="search.endMoney" style="width: 170px;" placeholder="请输入内容" clearable></el-input-number>
+            <span>成本</span>
+            <el-input-number v-model="search.startCost" style="width: 170px;" placeholder="请输入内容" clearable></el-input-number>
+            ~
+            <el-input-number v-model="search.endCost" style="width: 170px;" placeholder="请输入内容" clearable></el-input-number>
+            <span>利润</span>
+            <el-input-number v-model="search.startProfit" style="width: 170px;" placeholder="请输入内容" clearable></el-input-number>
+            ~
+            <el-input-number v-model="search.endProfit" style="width: 170px;" placeholder="请输入内容" clearable></el-input-number>
+
             <el-button type="primary" icon="el-icon-search" @click="getData(1)">搜索</el-button>
             <el-button type="primary" icon="el-icon-plus"  @click="addShow=true" >新增</el-button>
         </div>
@@ -260,6 +269,10 @@
                     "create_id":"",
                     "startMoney":"",
                     "endMoney":"",
+                    "startCost":"",
+                    "endCost":"",
+                    "startProfit":"",
+                    "endProfit":"",
                     "startTime":"",
                     "endTime":"",
                     "pageNum":1,