From dd07e8a4be18c231270f008bd90267b33264d1aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=AE=87=E8=88=AA?= <653809315@qq.com>
Date: Mon, 27 Nov 2023 11:01:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=88=B0=E5=88=97=E8=A1=A8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=89=8B=E6=9C=BA=E5=8F=B7=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/gfwl/common/entity/BusOrder.java    |  3 +++
 .../main/resource/mapper/common/BusOrderMapper.xml    |  9 ++++++---
 .../src/main/resource/templates/app/busOrder.html     | 11 ++++++-----
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/order-food-java/src/main/java/com/gfwl/common/entity/BusOrder.java b/order-food-java/src/main/java/com/gfwl/common/entity/BusOrder.java
index 1b999e9..4d1ad87 100644
--- a/order-food-java/src/main/java/com/gfwl/common/entity/BusOrder.java
+++ b/order-food-java/src/main/java/com/gfwl/common/entity/BusOrder.java
@@ -186,4 +186,7 @@ public class BusOrder extends DataEntity<BusOrder> {
     @TableField(exist = false)
     @ApiModelProperty("头像")
     private String userHeader;
+
+    @TableField(exist = false)
+    private String phoneNumber;
 }
diff --git a/order-food-java/src/main/resource/mapper/common/BusOrderMapper.xml b/order-food-java/src/main/resource/mapper/common/BusOrderMapper.xml
index e180dd1..ecfcae0 100644
--- a/order-food-java/src/main/resource/mapper/common/BusOrderMapper.xml
+++ b/order-food-java/src/main/resource/mapper/common/BusOrderMapper.xml
@@ -4,7 +4,7 @@
 
     <!-- 关联查询sql -->
     <sql id="relSelect">
-        SELECT a.*,b.nick_name as userName,b.heads as userHeader
+        SELECT a.*,b.nick_name as userName,b.heads as userHeader , b.phones AS phoneNumber
         FROM bus_order a
         LEFT JOIN bus_user b on a.user_id=b.id
         <where>
@@ -13,6 +13,9 @@
                 <if test="page.pageData.payTime != null">
                     AND DATE_FORMAT(a.pay_time, '%Y-%m-%d') LIKE CONCAT('%', DATE_FORMAT(#{page.pageData.payTime},'%Y-%m-%d'), '%')
                 </if>
+                <if test="page.pageData.phoneNumber != null">
+                    AND b.phones LIKE CONCAT('%', #{page.pageData.phoneNumber}, '%')
+                </if>
             </if>
             or (a.order_type=2 )
             <if test="page!=null and page.pageData!=null">
@@ -73,8 +76,8 @@
                 <if test="page.pageData.names != null">
                     AND a.names LIKE CONCAT('%', #{page.pageData.names}, '%')
                 </if>
-                <if test="page.pageData.phones != null">
-                    AND a.phones LIKE CONCAT('%', #{page.pageData.phones}, '%')
+                <if test="page.pageData.phoneNumber != null">
+                    AND b.phones LIKE CONCAT('%', #{page.pageData.phoneNumber}, '%')
                 </if>
                 <if test="page.pageData.isEvaluation != null">
                     AND a.is_evaluation = #{page.pageData.isEvaluation}
diff --git a/order-food-java/src/main/resource/templates/app/busOrder.html b/order-food-java/src/main/resource/templates/app/busOrder.html
index acb3d89..49d2506 100644
--- a/order-food-java/src/main/resource/templates/app/busOrder.html
+++ b/order-food-java/src/main/resource/templates/app/busOrder.html
@@ -80,6 +80,12 @@
                             <input name="payTime" id="payTimeSearch" class="layui-input" placeholder="输入支付时间"/>
                         </div>
                     </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">手机号:</label>
+                        <div class="layui-input-inline">
+                            <input name="phoneNumber" id="phoneNumberSearch" class="layui-input" placeholder="输入手机号"/>
+                        </div>
+                    </div>
                     <div class="layui-inline">&emsp;
                         <button class="layui-btn icon-btn" lay-filter="busOrderTbSearch" lay-submit>
                             <i class="layui-icon">&#xe615;</i>搜索
@@ -383,11 +389,6 @@
             });
         }
 
-        function exportExcel(data) {
-            // $.get("/busOrder/exportExcel", data, function (res) {")
-            console.log(data)
-        }
-
 
     })
     ;