From 53e7558400dcacecdce70e39ebfe1727740f9296 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 25 十一月 2023 17:20:06 +0800
Subject: [PATCH] 重写课包支付和排课逻辑

---
 cloud-server-other/src/main/resources/mapper/SiteMapper.xml |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/cloud-server-other/src/main/resources/mapper/SiteMapper.xml b/cloud-server-other/src/main/resources/mapper/SiteMapper.xml
index 2e37209..8a54140 100644
--- a/cloud-server-other/src/main/resources/mapper/SiteMapper.xml
+++ b/cloud-server-other/src/main/resources/mapper/SiteMapper.xml
@@ -30,7 +30,9 @@
         left join t_site_type c on (a.siteTypeId = c.id)
         where a.state = 1
         <if test="null != item.startTime and '' != item.startTime and null != item.endTime and '' != item.endTime">
-            and CONCAT(DATE_FORMAT(now(), '%Y-%m-%d'), ' ', a.appointmentStartTime) &lt;=  CONCAT(DATE_FORMAT(now(), '%Y-%m-%d'), ' ', #{item.startTime}) and CONCAT(DATE_FORMAT(now(), '%Y-%m-%d'), ' ', a.appointmentEndTime) &gt;=  CONCAT(DATE_FORMAT(now(), '%Y-%m-%d'), ' ', #{item.endTime})
+            and CONCAT(DATE_FORMAT(now(), '%Y-%m-%d'), ' ', a.appointmentStartTime) &lt;= CONCAT(DATE_FORMAT(now(),
+            '%Y-%m-%d'), ' ', #{item.startTime}) and CONCAT(DATE_FORMAT(now(), '%Y-%m-%d'), ' ', a.appointmentEndTime)
+            &gt;= CONCAT(DATE_FORMAT(now(), '%Y-%m-%d'), ' ', #{item.endTime})
         </if>
         <if test="null != item.siteTypeId">
             and a.siteTypeId = #{item.siteTypeId}
@@ -48,7 +50,6 @@
     </select>
 
 
-
     <select id="queryMySite" resultType="com.dsh.other.model.QueryMySiteVo">
         select
         a.id,
@@ -59,7 +60,7 @@
         c.lon as storeLon,
         c.lat as storeLat,
         a.payMoney as payMoney,
-        a.payType  as payType,
+        a.payType as payType,
         a.isHalf as isHalf,
         CONCAT(DATE_FORMAT(a.startTime, '%Y-%m-%d %H:%i'), '-', DATE_FORMAT(a.endTime, '%H:%i')) as appointment,
         a.`status`,
@@ -81,14 +82,14 @@
         where
         t1.sign=0
         <if test="query.objectType == 2">
-        and t1.cityManagerId = #{query.objectId}
+            and t1.cityManagerId = #{query.objectId}
         </if>
         <if test="query.objectType == 3">
-        and t2.id = #{query.objectId}
+            and t2.id = #{query.objectId}
         </if>
-            <if test="query.city!=null and query.city!= ''">
-                and t1.city = #{query.city}
-            </if>
+        <if test="query.city!=null and query.city!= ''">
+            and t1.city = #{query.city}
+        </if>
         <if test="query.province!=null and query.province!= ''">
             and t1.province = #{query.province}
         </if>

--
Gitblit v1.7.1