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/StoreMapper.xml | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/cloud-server-other/src/main/resources/mapper/StoreMapper.xml b/cloud-server-other/src/main/resources/mapper/StoreMapper.xml
index 7a2579c..d34fe54 100644
--- a/cloud-server-other/src/main/resources/mapper/StoreMapper.xml
+++ b/cloud-server-other/src/main/resources/mapper/StoreMapper.xml
@@ -17,13 +17,18 @@
</select>
<select id="queryStoreByCityCode" resultType="com.dsh.other.model.BaseVo">
- select id, name from t_store where state = 1 and cityCode = #{cityCode}
+ select id, name from t_store where state = 1
+ and provinceCode = #{provinceCode}
+ <if test="cityCode !=null and cityCode !='' ">
+ and cityCode = #{cityCode}
+ </if>
+
</select>
<select id="getStoreByCityManagerId" resultType="com.dsh.other.entity.Store">
- select * from t_store where cityManagerId = #{id}
+ select * from t_store where operatorId = #{id}
</select>
<select id="getStoreByStoreStaffId" resultType="com.dsh.other.entity.Store">
- select * from t_store where storeStaffId = #{id}
+ select * from t_store where id = #{id}
</select>
<select id="getOName" resultType="java.lang.String">
select name from t_operator where id =#{operatorId}
@@ -31,4 +36,21 @@
<select id="game" resultType="java.util.Map">
select time,money from t_game_record where userId =#{appUserId} and payType =3
</select>
+ <select id="queryByStoreId" resultType="com.dsh.other.entity.OperatorUser">
+
+
+
+ SELECT * from t_operator_user WHERE operatorId =
+
+ (SELECT ts.operatorId
+ from t_store ts
+ WHERE ts.id = #{id})
+
+
+ </select>
+ <select id="getStoreInfo" resultType="com.dsh.other.model.dto.siteDto.StoreInfoDto">
+ select CONCAT(t2.name,"-",t2.phone) as info
+ from sys_user t2
+ where id = #{id}
+ </select>
</mapper>
--
Gitblit v1.7.1