From 755262ba9a1a3c0573a0e910bbd0a353e9e2a2c5 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 16 六月 2021 16:39:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-db/src/main/resources/mapper/store/UserStorehouseServiceDaoImplMapper.xml |   61 ++++++++++++++++++++----------
 1 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/store/UserStorehouseServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/store/UserStorehouseServiceDaoImplMapper.xml
index 3d3c7c8..a9eabb7 100644
--- a/java110-db/src/main/resources/mapper/store/UserStorehouseServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/store/UserStorehouseServiceDaoImplMapper.xml
@@ -13,6 +13,13 @@
         )
     </insert>
 
+    <insert id="saveUserStorehouses" parameterType="Map">
+        insert into user_storehouse(
+        res_name,b_id,store_id,stock,res_id,user_id,us_id
+        ) values (
+        #{resName},'-1',#{storeId},#{stock},#{resId},#{userId},#{usId}
+        )
+    </insert>
 
     <!-- 鏌ヨ涓汉鐗╁搧淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
     <select id="getBusinessUserStorehouseInfo" parameterType="Map" resultType="Map">
@@ -44,9 +51,7 @@
         <if test="usId !=null and usId != ''">
             and t.us_id= #{usId}
         </if>
-
     </select>
-
 
     <!-- 淇濆瓨涓汉鐗╁搧淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
     <insert id="saveUserStorehouseInfoInstance" parameterType="Map">
@@ -76,18 +81,20 @@
         <if test="usId !=null and usId != ''">
             and t.us_id= #{usId}
         </if>
-
     </insert>
-
 
     <!-- 鏌ヨ涓汉鐗╁搧淇℃伅 add by wuxw 2018-07-03 -->
     <select id="getUserStorehouseInfo" parameterType="Map" resultType="Map">
         select t.res_name,t.res_name resName,t.status_cd,t.status_cd statusCd,t.b_id,t.b_id bId,t.store_id,t.store_id
-        storeId,t.stock,t.res_id,t.res_id resId,t.user_id,t.user_id userId,t.us_id,t.us_id usId
-        from user_storehouse t
-        where 1 =1
+        storeId,t.stock,t.res_id,t.res_id resId,t.user_id,t.user_id userId,t.us_id,t.us_id usId,rs.res_code resCode,
+        rs.out_low_price outLowPrice,rs.out_high_price outHighPrice,rst.name rstName,rss.spec_name specName from
+        user_storehouse t
+        left join resource_store rs on t.res_id = rs.res_id and rs.status_cd = '0'
+        left join resource_store_type rst on rs.rst_id = rst.rst_id
+        left join resource_store_specification rss on rs.rss_id = rss.rss_id
+        where t.stock &gt; 0
         <if test="resName !=null and resName != ''">
-            and t.res_name= #{resName}
+            and t.res_name like '%${resName}%'
         </if>
         <if test="statusCd !=null and statusCd != ''">
             and t.status_cd= #{statusCd}
@@ -104,8 +111,17 @@
         <if test="resId !=null and resId != ''">
             and t.res_id= #{resId}
         </if>
+        <if test="resCode !=null and resCode != ''">
+            and rs.res_code= #{resCode}
+        </if>
         <if test="userId !=null and userId != ''">
             and t.user_id= #{userId}
+        </if>
+        <if test="rstId !=null and rstId != ''">
+            and rs.rst_id= #{rstId}
+        </if>
+        <if test="rssId !=null and rssId != ''">
+            and rs.rss_id= #{rssId}
         </if>
         <if test="usId !=null and usId != ''">
             and t.us_id= #{usId}
@@ -114,9 +130,7 @@
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>
-
     </select>
-
 
     <!-- 淇敼涓汉鐗╁搧淇℃伅 add by wuxw 2018-07-03 -->
     <update id="updateUserStorehouseInfoInstance" parameterType="Map">
@@ -130,9 +144,7 @@
         <if test="storeId !=null and storeId != ''">
             , t.store_id= #{storeId}
         </if>
-        <if test="stock !=null and stock != ''">
-            , t.stock= #{stock}
-        </if>
+        , t.stock= #{stock}
         <if test="resId !=null and resId != ''">
             , t.res_id= #{resId}
         </if>
@@ -146,16 +158,17 @@
         <if test="usId !=null and usId != ''">
             and t.us_id= #{usId}
         </if>
-
     </update>
 
     <!-- 鏌ヨ涓汉鐗╁搧鏁伴噺 add by wuxw 2018-07-03 -->
     <select id="queryUserStorehousesCount" parameterType="Map" resultType="Map">
-        select count(1) count
-        from user_storehouse t
-        where 1 =1
+        select count(1) count from user_storehouse t
+        left join resource_store rs on t.res_id = rs.res_id and rs.status_cd = '0'
+        left join resource_store_type rst on rs.rst_id = rst.rst_id and rst.status_cd = '0'
+        left join resource_store_specification rss on rs.rss_id = rss.rss_id
+        where 1 = 1 and t.stock &gt; 0
         <if test="resName !=null and resName != ''">
-            and t.res_name= #{resName}
+            and t.res_name like '%${resName}%'
         </if>
         <if test="statusCd !=null and statusCd != ''">
             and t.status_cd= #{statusCd}
@@ -172,14 +185,20 @@
         <if test="resId !=null and resId != ''">
             and t.res_id= #{resId}
         </if>
+        <if test="resCode !=null and resCode != ''">
+            and rs.res_code= #{resCode}
+        </if>
         <if test="userId !=null and userId != ''">
             and t.user_id= #{userId}
+        </if>
+        <if test="rstId !=null and rstId != ''">
+            and rs.rst_id= #{rstId}
+        </if>
+        <if test="rssId !=null and rssId != ''">
+            and rs.rss_id= #{rssId}
         </if>
         <if test="usId !=null and usId != ''">
             and t.us_id= #{usId}
         </if>
-
-
     </select>
-
 </mapper>

--
Gitblit v1.8.0