From ae012f4ee3b7cee1c9a55f88f4ed5fdfcdb1f1e4 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Mon, 2 Jun 2025 20:39:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/model/appletOrderDateFrequency/index.vue            | 8 ++++++--
 .../java/com/ruoyi/applet/contoller/ApiAppletOrderController.java | 2 ++
 .../src/main/java/com/ruoyi/model/domain/AppletOrder.java         | 4 ++--
 .../model/service/impl/AppletOrderDateFrequencyServiceImpl.java   | 4 +++-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/CatmDogd-Mall-Front-test/src/views/model/appletOrderDateFrequency/index.vue b/CatmDogd-Mall-Front-test/src/views/model/appletOrderDateFrequency/index.vue
index 9a69524..9ac5017 100644
--- a/CatmDogd-Mall-Front-test/src/views/model/appletOrderDateFrequency/index.vue
+++ b/CatmDogd-Mall-Front-test/src/views/model/appletOrderDateFrequency/index.vue
@@ -7,8 +7,12 @@
                     @keyup.enter.native="handleQuery" />
             </el-form-item>
             <el-form-item label="服务日期" prop="serviceDate">
-                <el-input v-model="queryParams.serviceDate" placeholder="请输入服务日期" clearable size="small"
-                    @keyup.enter.native="handleQuery" />
+                <el-date-picker v-model="queryParams.serviceDate" 
+                type="date" 
+                placeholder="请选择服务日期" 
+                clearable size="small" 
+                format="yyyy-MM-dd" 
+                value-format="yyyy-MM-dd" />
             </el-form-item>
             <!-- <el-form-item label="省份" prop="receiverProvince">
                 <el-input v-model="queryParams.receiverProvince" placeholder="请输入省份" clearable size="small"
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletOrderController.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletOrderController.java
index abf6d27..dd7c38c 100644
--- a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletOrderController.java
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletOrderController.java
@@ -111,6 +111,8 @@ public class ApiAppletOrderController extends BaseController {
         List<AppletOrderItem> itemList = null;
         if(appletOrder.getType().equals("0")){
 
+            // TODO 这里需要加上伴宠师等级的筛选
+
             list = appletOrderService.selectAppletOrderListLikeUserIdJson(appletOrder);
             for (AppletOrder order : list) {
                 H5OrderVO h5OrderVO = h5OrderService.orderDetail(order.getOrderId());
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrder.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrder.java
index 9c67eb0..741b412 100644
--- a/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrder.java
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrder.java
@@ -46,7 +46,7 @@ public class AppletOrder {
     private LocalDateTime payTime;
 
     /** 订单状态 */
-    @Excel(name = "订单状态")
+    @Excel(name = "订单状态 好像是接单状态")
     private Integer status;
 
     /** 派单次数 */
@@ -61,7 +61,7 @@ public class AppletOrder {
     @Excel(name = "地址")
     private String address;
 
-    /** 订单类型 */
+    /** 订单类型 0系统派单 1指定伴宠师 */
     @Excel(name = "订单类型")
     private String type;
 
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletOrderDateFrequencyServiceImpl.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletOrderDateFrequencyServiceImpl.java
index f3755f3..7f84539 100644
--- a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletOrderDateFrequencyServiceImpl.java
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletOrderDateFrequencyServiceImpl.java
@@ -90,7 +90,9 @@ public class AppletOrderDateFrequencyServiceImpl extends ServiceImpl<AppletOrder
 
         LambdaQueryChainWrapper<AppletOrderDateFrequency> qw = lambdaQuery()
                 .eq(frequency.getOrderId() != null, AppletOrderDateFrequency::getOrderId, frequency.getOrderId())
-                .eq(frequency.getMasterId() != null, AppletOrderDateFrequency::getMasterId, frequency.getMasterId())
+                .eq(frequency.getMasterId() != null, AppletOrderDateFrequency::getMasterId, frequency.getMasterId())//伴宠师
+                .eq(frequency.getUserId() != null, AppletOrderDateFrequency::getUserId, frequency.getUserId())//下单用户
+                .eq(frequency.getServiceDate() != null, AppletOrderDateFrequency::getServiceDate, frequency.getServiceDate())//下单用户
                 .orderByAsc(AppletOrderDateFrequency::getServiceDate);
 
         if (frequency.getStatus() != null){