From 1b9a01bf5000714b08a75a50dd1f5f3eab65d888 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 08 十二月 2023 17:18:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-other/src/main/java/com/dsh/other/service/ISiteService.java |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/cloud-server-other/src/main/java/com/dsh/other/service/ISiteService.java b/cloud-server-other/src/main/java/com/dsh/other/service/ISiteService.java
index 35db539..004f19f 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/service/ISiteService.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/service/ISiteService.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.dsh.other.entity.Site;
+import com.dsh.other.feignclient.model.SiteChangeStateVO;
 import com.dsh.other.model.*;
 import com.dsh.other.util.ResultUtil;
 
@@ -17,6 +18,7 @@
 
     /**
      * 获取场地列表
+     *
      * @param querySiteList
      * @return
      * @throws Exception
@@ -26,6 +28,7 @@
 
     /**
      * 获取场地详情
+     *
      * @param id
      * @return
      * @throws Exception
@@ -35,16 +38,18 @@
 
     /**
      * 获取场地预约日期数据
+     *
      * @param id
      * @param day
      * @return
      * @throws Exception
      */
-    List<QuerySiteTimes> querySiteTimes(Integer id, String day) throws Exception;
+    List<QuerySiteTimes> querySiteTimes(Integer id, String day, String halfName, String siteName) throws Exception;
 
 
     /**
      * 预约场地
+     *
      * @param reservationSite
      * @return
      * @throws Exception
@@ -54,6 +59,7 @@
 
     /**
      * 获取我的预约场地列表
+     *
      * @param status
      * @param pageNo
      * @param pageSize
@@ -65,6 +71,7 @@
 
     /**
      * 取消我的预约场地
+     *
      * @param id
      * @return
      * @throws Exception
@@ -74,6 +81,7 @@
 
     /**
      * 继续支付我预约的场地
+     *
      * @param id
      * @param payType
      * @return
@@ -84,9 +92,13 @@
 
     /**
      * 获取继续支付金额
+     *
      * @param id
      * @return
      * @throws Exception
      */
     ResultUtil<Map<String, Double>> queryContinuePaymentMySitePrice(Integer id) throws Exception;
+
+    Object changeState(SiteChangeStateVO vo);
+
 }

--
Gitblit v1.7.1