From 262cf0a2aff3ddd6f4159f26e8fd086d8b0a7621 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Sat, 21 Jun 2025 14:54:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8B=E5=8D=95=E7=AB=AF?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=B4=BE=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CatmDogd-Mall-Front-test/.env.development                    |  4 ++--
 .../src/views/model/AppletOrder/index.vue                    | 12 ++++++++++--
 .../src/main/resources/mapper/model/AppletOrderMapper.xml    |  2 ++
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/CatmDogd-Mall-Front-test/.env.development b/CatmDogd-Mall-Front-test/.env.development
index 04a898d..d8a74eb 100644
--- a/CatmDogd-Mall-Front-test/.env.development
+++ b/CatmDogd-Mall-Front-test/.env.development
@@ -6,9 +6,9 @@ VUE_APP_TITLE = 下单伴宠师综合管理平台
 
 # 若依管理系统/开发环境 https://pet-admin.hhlm1688.com/api
 # VUE_APP_BASE_API = 'https://api.catmdogd.com'
-VUE_APP_BASE_API = 'https://pet-admin.hhlm1688.com/api/'
+# VUE_APP_BASE_API = 'https://pet-admin.hhlm1688.com/api/'
 # VUE_APP_BASE_API = 'http://h5.xzaiyp.top'
-# VUE_APP_BASE_API = 'http://localhost:8002'
+VUE_APP_BASE_API = 'http://localhost:8002'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/CatmDogd-Mall-Front-test/src/views/model/AppletOrder/index.vue b/CatmDogd-Mall-Front-test/src/views/model/AppletOrder/index.vue
index 994e27b..9c4f3da 100644
--- a/CatmDogd-Mall-Front-test/src/views/model/AppletOrder/index.vue
+++ b/CatmDogd-Mall-Front-test/src/views/model/AppletOrder/index.vue
@@ -48,6 +48,13 @@
                         :value="dict.value" />
                 </el-select>
             </el-form-item>
+            <el-form-item label="系统派单超时" prop="noticeSystemFlag">
+                <el-select v-model="queryParams.noticeSystemFlag" placeholder="请选择系统派单超时" clearable size="small">
+                    <el-option label="超时" :value="1" />
+                    <el-option label="未超时" :value="0" />
+                </el-select>
+            </el-form-item>
+
             <el-form-item label="请输入订单编号" label-width="300" prop="orderSn">
                 <el-input v-model="queryParams.orderSn" placeholder="请输入订单编号" clearable size="small"
                     @keyup.enter.native="handleQuery" />
@@ -243,7 +250,7 @@
 
                 <el-form-item label="伴宠师等级" prop="companionLevel" v-if="form.type == 0">
                     <el-select v-model="form.companionLevel" placeholder="请选择伴宠师等级" key="companionLevel">
-                        <el-option label="无" :value="0" />
+                        <el-option label="所有等级" :value="0" />
                         <el-option label="初级伴宠师" :value="1" />
                         <el-option label="高级伴宠师" :value="2" />
                     </el-select>
@@ -319,7 +326,8 @@ export default {
                 userIdJson: null,
                 orderSn: null,
                 orderId: null,
-                orderTime: null
+                orderTime: null,
+                noticeSystemFlag: null,
             },
             // 表单参数
             form: {},
diff --git a/ruoyi-catdog/src/main/resources/mapper/model/AppletOrderMapper.xml b/ruoyi-catdog/src/main/resources/mapper/model/AppletOrderMapper.xml
index 56c271b..8ddbc24 100644
--- a/ruoyi-catdog/src/main/resources/mapper/model/AppletOrderMapper.xml
+++ b/ruoyi-catdog/src/main/resources/mapper/model/AppletOrderMapper.xml
@@ -55,6 +55,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="orderSn != null "> and order_sn = #{orderSn}</if>
             <if test="orderId != null "> and order_id = #{orderId}</if>
             <if test="orderTime != null "> and order_time = #{orderTime}</if>
+            <if test="noticeSystemFlag == 1 "> and notice_system_flag = -1 and user_id is null</if>
+            <if test="noticeSystemFlag == 0 "> and (notice_system_flag != -1 or user_id is not null)</if>
         </where>
         order by create_time desc