From 634cea842c9a4f2ef1bddde07d7b5a334f0117de Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 10 十二月 2020 11:02:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xinghong-dev'
---
java110-db/src/main/resources/mapper/store/StoreServiceDaoImplMapper.xml | 45 +++++++++++++++++++++++++++++----------------
1 files changed, 29 insertions(+), 16 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/store/StoreServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/store/StoreServiceDaoImplMapper.xml
index 6cf2ec4..ae58027 100644
--- a/java110-db/src/main/resources/mapper/store/StoreServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/store/StoreServiceDaoImplMapper.xml
@@ -155,9 +155,9 @@
<!-- 鏌ヨ鍟嗘埛灞炴�т俊鎭� add by wuxw 2018-07-03 -->
<select id="getStoreAttrs" parameterType="Map" resultType="Map">
select
- sa.b_id,sa.attr_id,sa.attr_id attrId,
- sa.store_id, sa.store_id storeId,sa.spec_cd,sa.spec_cd specCd,sa.value,sa.status_cd,
- c.name
+ sa.b_id,sa.attr_id,sa.attr_id attrId,
+ sa.store_id, sa.store_id storeId,sa.spec_cd,sa.spec_cd specCd,sa.value,sa.status_cd,
+ c.name
from s_store_attr sa inner join spec c on sa.spec_cd = c.spec_cd
where
1=1
@@ -474,19 +474,19 @@
<!-- 鏌ヨ鍟嗘埛 -->
<select id="getStores" parameterType="Map" resultType="Map">
select
- s.store_id,
- s.b_id,
- s.user_id,
- s.name,s.name storeName,
- s.address,
- s.tel,
- s.store_id storeId,
- s.store_type_cd,s.store_type_cd storeTypeCd,
- s.nearby_landmarks,s.nearby_landmarks nearByLandmarks,
- s.map_x,s.map_x mapX,
- s.map_y,s.map_y mapY,
- s.status_cd,
- st.name storeTypeName
+ s.store_id,
+ s.b_id,
+ s.user_id,
+ s.name,s.name storeName,
+ s.address,
+ s.tel,
+ s.store_id storeId,
+ s.store_type_cd,s.store_type_cd storeTypeCd,
+ s.nearby_landmarks,s.nearby_landmarks nearByLandmarks,
+ s.map_x,s.map_x mapX,
+ s.map_y,s.map_y mapY,
+ s.status_cd,
+ st.name storeTypeName
from s_store s,store_type st
where s.status_cd = '0'
and s.store_type_cd = st.store_type_cd
@@ -561,4 +561,17 @@
</if>
</select>
+ <!--鏌ヨ鍛樺伐鍜屽晢鎴蜂俊鎭�-->
+ <select id="getStoreUserInfo" parameterType="Map" resultType="Map">
+ select s.store_id,s.b_id,s.user_id,s.name,s.address,s.tel,s.store_type_cd,
+ s.nearby_landmarks,s.map_x,s.map_y,s.create_time,su.store_user_id,su.rel_cd
+ from s_store s left join s_store_user su on s.store_id=su.store_id
+ <where>
+ s.status_cd = "0" and su.status_cd = "0"
+ <if test="userId != null and userId != ''">
+ and su.user_id = #{userId}
+ </if>
+ </where>
+ </select>
+
</mapper>
--
Gitblit v1.8.0