From b497ff41e47f4ebe69b86f13f6972f34f33f4884 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 01 六月 2021 09:35:46 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/store/UserStorehouseServiceDaoImplMapper.xml | 45 ++++++++++++++++++++++++++++++++-------------
1 files changed, 32 insertions(+), 13 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/store/UserStorehouseServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/store/UserStorehouseServiceDaoImplMapper.xml
index bc941df..a9eabb7 100644
--- a/java110-db/src/main/resources/mapper/store/UserStorehouseServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/store/UserStorehouseServiceDaoImplMapper.xml
@@ -87,13 +87,14 @@
<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,rs.res_code resCode,
- td.name goodsTypeName from user_storehouse t
- left join resource_store rs on t.res_id = rs.res_id
- left join t_dict td on td.table_name = 'resource_store' and table_columns = 'goods_type'
- and rs.goods_type = td.status_cd
- where 1 = 1
+ 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 > 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}
@@ -110,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}
@@ -134,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>
@@ -154,11 +162,13 @@
<!-- 鏌ヨ涓汉鐗╁搧鏁伴噺 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 > 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}
@@ -175,9 +185,18 @@
<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>
--
Gitblit v1.8.0