From 7b0169e4bc51bbd72774a3c9ad77fc227ce952d5 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Thu, 1 Jun 2023 23:18:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=8D=95=E7=AE=A1=E7=90=86=E5=BE=85?=
 =?UTF-8?q?=E4=BB=98=E6=AC=BE=E5=8F=8A=E5=B7=B2=E5=8F=91=E5=B8=83=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/order/pc-master.html  | 27 ++++++++++++-------
 .../com/ghy/order/domain/OrderMaster.java     |  2 ++
 .../mapper/order/OrderMasterMapper.xml        |  6 +++++
 3 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/ghy-admin/src/main/resources/templates/order/pc-master.html b/ghy-admin/src/main/resources/templates/order/pc-master.html
index d72168e5..8c32b207 100644
--- a/ghy-admin/src/main/resources/templates/order/pc-master.html
+++ b/ghy-admin/src/main/resources/templates/order/pc-master.html
@@ -61,16 +61,15 @@
                 <form id="order-form" class="m">
                     <input type="hidden" id="deptId" name="deptId">
                     <input type="hidden" id="parentId" name="parentId">
-                    <input type="hidden" id="orderStatus" name="orderStatus"/>
                     <div>
                         <select id="allOrServing">
                             <option value="">全部</option>
                             <option value="">在途</option>
                         </select>
-                        <a class="btn btn-default btn-outline">
+                        <a class="btn btn-default btn-outline" onclick="searchOrderList({orderStatus: 0, sysPayStatus: 0, orderMode: '02'})">
                             待付款
                         </a>
-                        <a class="btn btn-default btn-outline">
+                        <a class="btn btn-default btn-outline" onclick="searchOrderList({orderStatus: 0, workerId: -1})">
                             已发布
                         </a>
                         <a class="btn btn-default btn-outline">
@@ -79,19 +78,19 @@
                         <a class="btn btn-default btn-outline">
                             未排班
                         </a>
-                        <a class="btn btn-default btn-outline" onclick="searchByOrderStatus(2)">
+                        <a class="btn btn-default btn-outline" onclick="searchOrderList({orderStatus: 2})">
                             待上门
                         </a>
-                        <a class="btn btn-default btn-outline" onclick="searchByOrderStatus(3)">
+                        <a class="btn btn-default btn-outline" onclick="searchOrderList({orderStatus: 3})">
                             进行中
                         </a>
-                        <a class="btn btn-default btn-outline" onclick="searchByOrderStatus(4)">
+                        <a class="btn btn-default btn-outline" onclick="searchOrderList({orderStatus: 4})">
                             确认审核
                         </a>
-                        <a class="btn btn-default btn-outline" onclick="searchByOrderStatus(5)">
+                        <a class="btn btn-default btn-outline" onclick="searchOrderList({orderStatus: 5})">
                             完成
                         </a>
-                        <a class="btn btn-default btn-outline" onclick="searchByOrderStatus(6)">
+                        <a class="btn btn-default btn-outline" onclick="searchOrderList({orderStatus: 6})">
                             关闭
                         </a>
                         <a class="btn btn-default btn-outline" onclick="">
@@ -305,6 +304,7 @@
 
     var editFlag = [[${@permission.hasPermi('order:order:edit')}]];
     var prefix = ctx + "order/master";
+    var customParams = {};
 
     $(function () {
         var panehHidden = false;
@@ -414,6 +414,7 @@
         var options = {
             url: prefix + "/list",
             exportUrl: prefix + "/export",
+            queryParams: queryParams,
             sortName: "createTime",
             sortOrder: "desc",
             modalName: "订单",
@@ -520,6 +521,12 @@
         $.table.init(options);
     }
 
+    function queryParams(params) {
+        var search = $.table.queryParams(params);
+        Object.assign(search, customParams)
+        return search;
+    }
+
     function detail(id) {
         var url = "order/goods?orderId=" + id;
         $.modal.open("商品信息", url);
@@ -539,8 +546,8 @@
         });
     }
 
-    function searchByOrderStatus(orderStatus) {
-        $('#orderStatus').val(orderStatus);
+    function searchOrderList(params) {
+        customParams = params;
         $.table.search();
     }
 
diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java
index c496a307..2f9346f7 100644
--- a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java
+++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java
@@ -141,4 +141,6 @@ public class OrderMaster extends BaseEntity {
     private Integer timeoutFineTimes;
 
     private String orderMode;
+
+    private Integer sysPayStatus;
 }
diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
index 8ffe7262..2874b1f1 100644
--- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
+++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
@@ -135,6 +135,12 @@
                 AND ( (om.order_mode in ('01','03','04'))
                      OR (om.order_mode = '02' and fm.pay_status = 1) )
             </if>
+            <if test="sysPayStatus != null">
+                AND fm.pay_status = #{sysPayStatus}
+            </if>
+            <if test="orderMode != null and orderMode != ''">
+                AND om.order_mode = #{orderMode}
+            </if>
             <if test="goodsCategoryId != null">
                 AND g.dept_goods_category_id = #{goodsCategoryId}
             </if>