From 3219ee5eb2c7de1e1401bd94cb4dc4d37195b244 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 13 四月 2022 11:04:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xinghong-dev'

---
 java110-db/src/main/resources/mapper/store/StoreV1ServiceDaoImplMapper.xml |  238 +++++++++++++++++++++++++++++++----------------------------
 1 files changed, 124 insertions(+), 114 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/store/StoreV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/store/StoreV1ServiceDaoImplMapper.xml
index f5c16d7..0ec9190 100644
--- a/java110-db/src/main/resources/mapper/store/StoreV1ServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/store/StoreV1ServiceDaoImplMapper.xml
@@ -5,138 +5,148 @@
 <mapper namespace="storeV1ServiceDaoImpl">
 
 
-
-
-
     <!-- 淇濆瓨鍟嗘埛淇℃伅淇℃伅 add by wuxw 2018-07-03 -->
     <insert id="saveStoreInfo" parameterType="Map">
         insert into s_store(
-address,store_type_cd,name,tel,state,store_id,user_id,map_y,map_x
-) values (
-#{address},#{storeTypeCd},#{name},#{tel},#{state},#{storeId},#{userId},#{mapY},#{mapX}
-)
+        address,store_type_cd,name,tel,state,store_id,user_id,map_y,map_x,nearby_landmarks
+        ) values (
+        #{address},#{storeTypeCd},#{name},#{tel},#{state},#{storeId},#{userId},#{mapY},#{mapX},#{nearbyLandmarks}
+        )
     </insert>
-
 
 
     <!-- 鏌ヨ鍟嗘埛淇℃伅淇℃伅 add by wuxw 2018-07-03 -->
     <select id="getStoreInfo" parameterType="Map" resultType="Map">
-        select  t.address,t.store_type_cd,t.store_type_cd storeTypeCd,t.name,t.tel,t.status_cd,t.status_cd statusCd,t.state,t.store_id,t.store_id storeId,t.user_id,t.user_id userId,t.map_y,t.map_y mapY,t.map_x,t.map_x mapX 
-from s_store t 
-where 1 =1 
-<if test="address !=null and address != ''">
-   and t.address= #{address}
-</if> 
-<if test="storeTypeCd !=null and storeTypeCd != ''">
-   and t.store_type_cd= #{storeTypeCd}
-</if> 
-<if test="name !=null and name != ''">
-   and t.name= #{name}
-</if> 
-<if test="tel !=null and tel != ''">
-   and t.tel= #{tel}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="storeId !=null and storeId != ''">
-   and t.store_id= #{storeId}
-</if> 
-<if test="userId !=null and userId != ''">
-   and t.user_id= #{userId}
-</if> 
-<if test="mapY !=null and mapY != ''">
-   and t.map_y= #{mapY}
-</if> 
-<if test="mapX !=null and mapX != ''">
-   and t.map_x= #{mapX}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.address,t.store_type_cd,t.store_type_cd storeTypeCd,t.name,t.tel,t.status_cd,t.status_cd
+        statusCd,t.state,t.store_id,t.store_id storeId,t.user_id,t.user_id userId,t.map_y,t.map_y mapY,t.map_x,t.map_x
+        mapX,t.create_time createTime,t.nearby_landmarks nearbyLandmarks,sa.value corporation,sa1.value foundingTime,
+        CASE t.store_type_cd
+        WHEN '800900000000' THEN '寮�鍙戝洟闃�'
+        WHEN '800900000001' THEN '杩愯惀鍥㈤槦'
+        WHEN '800900000002' THEN '浠ｇ悊鍟�'
+        WHEN '800900000003' THEN '鐗╀笟鍟嗘埛'
+        WHEN '800900000005' THEN '鍟嗗'
+        ELSE '鍏朵粬' END as storeTypeName
+        from s_store t
+        left join s_store_attr sa on t.store_id = sa.store_id and sa.spec_cd = '100201903001' and sa.status_cd='0'
+        left join s_store_attr sa1 on t.store_id = sa1.store_id and sa1.spec_cd = '100201903003' and sa1.status_cd='0'
+        where 1 =1
+        <if test="address !=null and address != ''">
+            and t.address= #{address}
+        </if>
+        <if test="storeTypeCd !=null and storeTypeCd != ''">
+            and t.store_type_cd= #{storeTypeCd}
+        </if>
+        <if test="name !=null and name != ''">
+            and t.name= #{name}
+        </if>
+        <if test="tel !=null and tel != ''">
+            and t.tel= #{tel}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="userId !=null and userId != ''">
+            and t.user_id= #{userId}
+        </if>
+        <if test="mapY !=null and mapY != ''">
+            and t.map_y= #{mapY}
+        </if>
+        <if test="mapX !=null and mapX != ''">
+            and t.map_x= #{mapX}
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
 
     </select>
 
 
-
-
-    <!-- 淇敼鍟嗘埛淇℃伅淇℃伅 add by wuxw 2018-07-03 -->
+    <!-- 淇敼鍟嗘埛淇℃伅淇℃伅 add by wuxw 2018-07-03  t.nearby_landmarks nearbyLandmarks -->
     <update id="updateStoreInfo" parameterType="Map">
-        update  s_store t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="address !=null and address != ''">
-, t.address= #{address}
-</if> 
-<if test="storeTypeCd !=null and storeTypeCd != ''">
-, t.store_type_cd= #{storeTypeCd}
-</if> 
-<if test="name !=null and name != ''">
-, t.name= #{name}
-</if> 
-<if test="tel !=null and tel != ''">
-, t.tel= #{tel}
-</if> 
-<if test="state !=null and state != ''">
-, t.state= #{state}
-</if> 
-<if test="userId !=null and userId != ''">
-, t.user_id= #{userId}
-</if> 
-<if test="mapY !=null and mapY != ''">
-, t.map_y= #{mapY}
-</if> 
-<if test="mapX !=null and mapX != ''">
-, t.map_x= #{mapX}
-</if> 
- where 1=1 <if test="storeId !=null and storeId != ''">
-and t.store_id= #{storeId}
-</if> 
+        update s_store t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="address !=null and address != ''">
+            , t.address= #{address}
+        </if>
+        <if test="storeTypeCd !=null and storeTypeCd != ''">
+            , t.store_type_cd= #{storeTypeCd}
+        </if>
+
+        <if test="nearbyLandmarks !=null and nearbyLandmarks != ''">
+            , t.nearby_landmarks= #{nearbyLandmarks}
+        </if>
+        <if test="name !=null and name != ''">
+            , t.name= #{name}
+        </if>
+        <if test="tel !=null and tel != ''">
+            , t.tel= #{tel}
+        </if>
+        <if test="state !=null and state != ''">
+            , t.state= #{state}
+        </if>
+        <if test="userId !=null and userId != ''">
+            , t.user_id= #{userId}
+        </if>
+        <if test="mapY !=null and mapY != ''">
+            , t.map_y= #{mapY}
+        </if>
+        <if test="mapX !=null and mapX != ''">
+            , t.map_x= #{mapX}
+        </if>
+        where 1=1
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
 
     </update>
 
     <!-- 鏌ヨ鍟嗘埛淇℃伅鏁伴噺 add by wuxw 2018-07-03 -->
-     <select id="queryStoresCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from s_store t 
-where 1 =1 
-<if test="address !=null and address != ''">
-   and t.address= #{address}
-</if> 
-<if test="storeTypeCd !=null and storeTypeCd != ''">
-   and t.store_type_cd= #{storeTypeCd}
-</if> 
-<if test="name !=null and name != ''">
-   and t.name= #{name}
-</if> 
-<if test="tel !=null and tel != ''">
-   and t.tel= #{tel}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="storeId !=null and storeId != ''">
-   and t.store_id= #{storeId}
-</if> 
-<if test="userId !=null and userId != ''">
-   and t.user_id= #{userId}
-</if> 
-<if test="mapY !=null and mapY != ''">
-   and t.map_y= #{mapY}
-</if> 
-<if test="mapX !=null and mapX != ''">
-   and t.map_x= #{mapX}
-</if> 
+    <select id="queryStoresCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from s_store t
+        where 1 =1
+        <if test="address !=null and address != ''">
+            and t.address= #{address}
+        </if>
+        <if test="storeTypeCd !=null and storeTypeCd != ''">
+            and t.store_type_cd= #{storeTypeCd}
+        </if>
+        <if test="name !=null and name != ''">
+            and t.name= #{name}
+        </if>
+        <if test="tel !=null and tel != ''">
+            and t.tel= #{tel}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="userId !=null and userId != ''">
+            and t.user_id= #{userId}
+        </if>
+        <if test="mapY !=null and mapY != ''">
+            and t.map_y= #{mapY}
+        </if>
+        <if test="mapX !=null and mapX != ''">
+            and t.map_x= #{mapX}
+        </if>
 
 
-     </select>
+    </select>
 
 </mapper>

--
Gitblit v1.8.0