From 7e7f901b2172281dc294dfbc67e6ad00625f09f4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 10:11:21 +0800
Subject: [PATCH] 合并代码

---
 cloud-server-other/src/main/resources/mapper/SiteMapper.xml |   91 +++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 87 insertions(+), 4 deletions(-)

diff --git a/cloud-server-other/src/main/resources/mapper/SiteMapper.xml b/cloud-server-other/src/main/resources/mapper/SiteMapper.xml
index 592245c..d87e266 100644
--- a/cloud-server-other/src/main/resources/mapper/SiteMapper.xml
+++ b/cloud-server-other/src/main/resources/mapper/SiteMapper.xml
@@ -1,7 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.dsh.other.mapper.SiteMapper">
-
+    <update id="changeState">
+        update t_site set
+        state = #{type}
+        <where>
+            <if test="siteIds != null and siteIds.size()>0">
+                AND t_site.id IN
+                <foreach collection="siteIds" separator="," item="id" open="(" close=")">
+                    #{id}
+                </foreach>
+            </if>
+        </where>
+    </update>
 
     <select id="querySiteList" resultType="com.dsh.other.model.QuerySiteListVo">
         select
@@ -17,9 +28,11 @@
         from t_site a
         left join t_store b on (a.storeId = b.id)
         left join t_site_type c on (a.siteTypeId = c.id)
-        where a.state = 1
+        where a.state = 1 and a.isCanBeBooked = 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}
@@ -37,7 +50,6 @@
     </select>
 
 
-
     <select id="queryMySite" resultType="com.dsh.other.model.QueryMySiteVo">
         select
         a.id,
@@ -48,6 +60,8 @@
         c.lon as storeLon,
         c.lat as storeLat,
         a.payMoney as payMoney,
+        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`,
         UNIX_TIMESTAMP(a.insertTime) * 1000 as insertTime
@@ -61,4 +75,73 @@
         </if>
         order by a.insertTime desc limit #{pageNo}, #{pageSize}
     </select>
+    <select id="listAll" resultType="com.dsh.other.model.dto.siteDto.TSiteDTO">
+        select t1.*,t2.name storeName,t3.name siteTypeName from t_site t1
+        inner join t_store t2 on t1.storeId = t2.id
+        left join t_site_type t3 on t1.siteTypeId = t3.id
+        where
+        t1.sign=0
+        <if test="query.objectType == 2">
+            and t1.cityManagerId = #{query.objectId}
+        </if>
+        <if test="query.objectType == 3">
+            and t2.id = #{query.objectId}
+        </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>
+        <if test="query.siteTypeId!=null and query.siteTypeId!= ''">
+            and t1.siteTypeId = #{query.siteTypeId}
+        </if>
+        <if test="query.storeName!=null and query.storeName!= ''">
+            and t2.name like concat('%',#{query.storeName},'%')
+        </if>
+        <if test="query.name!=null and query.name!= ''">
+            and t1.name like concat('%',#{query.name},'%')
+        </if>
+        and t1.state != 3
+
+    </select>
+    <select id="listExipre" resultType="com.dsh.other.model.dto.siteDto.TSiteDTO">
+        select t1.*,t2.name storeName,t3.name siteTypeName ,t4.name operator from t_site t1
+        inner join t_store t2 on t1.storeId = t2.id
+        left join t_site_type t3 on t1.siteTypeId = t3.id
+        left join t_operator t4 on t1.operatorId = t4.id
+        <where>
+            <if test="query.objectType == 2">
+                and t1.operatorId = #{query.objectId}
+            </if>
+            <if test="query.objectType == 3">
+                and t2.id = #{query.objectId}
+            </if>
+            <if test="query.city!=null and query.city!= ''">
+                and t1.cityCode = #{query.city}
+            </if>
+            <if test="query.province!=null and query.province!= ''">
+                and t1.provinceCode = #{query.province}
+            </if>
+            <if test="query.siteTypeId!=null and query.siteTypeId!= ''">
+                and t1.siteTypeId = #{query.siteTypeId}
+            </if>
+            <if test="query.storeName!=null and query.storeName!= ''">
+                and t2.name like concat('%',#{query.storeName},'%')
+            </if>
+            <if test="query.name!=null and query.name!= ''">
+                and t1.name like concat('%',#{query.name},'%')
+            </if>
+
+            <if test="query.opId!=null ">
+                and t1.operatorId =#{query.opId}
+            </if>
+            and t1.state != 3 and t1.sign=0
+        </where>
+
+        ORDER BY insertTime desc
+    </select>
+    <select id="getSMIDByOperatorId" resultType="java.lang.String">
+        select alipayNum from t_operator_user where operatorId = #{id}
+    </select>
 </mapper>

--
Gitblit v1.7.1