From 576c52d8d8e6fb1e738380cc5fc101a6a2b0b3a8 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 04 九月 2021 16:00:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/community/ResourceStoreServiceDaoImplBakMapper.xml | 52 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 43 insertions(+), 9 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/ResourceStoreServiceDaoImplBakMapper.xml b/java110-db/src/main/resources/mapper/community/ResourceStoreServiceDaoImplBakMapper.xml
index 670597f..15bf552 100644
--- a/java110-db/src/main/resources/mapper/community/ResourceStoreServiceDaoImplBakMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/ResourceStoreServiceDaoImplBakMapper.xml
@@ -6,11 +6,15 @@
<!-- 鏌ヨ璧勬簮鐗╁搧淇℃伅 -->
<select id="getResourceStoresInfo" parameterType="Map" resultType="Map">
- select t.res_id resId,t.store_id storeId,t.res_name resName,t.res_code resCode,t.goods_type goodsType,
+ select t.res_id resId,t.rst_id rstId,t.store_id storeId,t.res_name resName,t.res_code resCode,rst.name rstName,
t.unit_code unitCode,t.remark,t.out_low_price outLowPrice,t.out_high_price outHighPrice,
- t.show_mobile showMobile,t.description,t.price,t.stock,t.create_time createTime
+ t.show_mobile showMobile,t.description,t.price,t.stock,t.create_time createTime,t.sh_id shId,
+ t.rss_id rssId,rss.spec_name rssName,t.mini_unit_code,t.mini_unit_code miniUnitCode,
+ t.mini_unit_stock,t.mini_unit_stock miniUnitStock,t.mini_stock,t.mini_stock miniStock
from resource_store t
- where 1 = 1
+ left join resource_store_type rst on rst.rst_id = t.rst_id and rst.status_cd = '0'
+ left join resource_store_specification rss on rss.rss_id = t.rss_id and rss.status_cd = '0'
+ where 1 = 1 and t.status_cd = '0'
<if test="resId !=null and resId != ''">
and t.res_id= #{resId}
</if>
@@ -23,8 +27,11 @@
<if test="resCode !=null and resCode != ''">
and t.res_code= #{resCode}
</if>
- <if test="goodsType !=null and goodsType != ''">
- and t.goods_type= #{goodsType}
+ <if test="rstId !=null and rstId != ''">
+ and t.rst_id= #{rstId}
+ </if>
+ <if test="rssId !=null and rssId != ''">
+ and t.rss_id= #{rssId}
</if>
<if test="unitCode !=null and unitCode != ''">
and t.unit_code= #{unitCode}
@@ -49,6 +56,18 @@
</if>
<if test="stock !=null and stock != ''">
and t.stock= #{stock}
+ </if>
+ <if test="shId !=null and shId != ''">
+ and t.sh_id= #{shId}
+ </if>
+ <if test="miniUnitCode !=null and miniUnitCode != ''">
+ and t.mini_unit_code= #{miniUnitCode}
+ </if>
+ <if test="miniUnitStock !=null and miniUnitStock != ''">
+ and t.mini_unit_stock= #{miniUnitStock}
+ </if>
+ <if test="miniStock !=null and miniStock != ''">
+ and t.mini_stock= #{miniStock}
</if>
<if test="createTime !=null and createTime != ''">
and t.create_time= #{createTime}
@@ -59,21 +78,24 @@
<select id="getResourceStoresCount" parameterType="Map" resultType="Map">
select count(1) count
from resource_store t
- where 1 =1
+ where 1 =1 and t.status_cd = '0'
<if test="resId !=null and resId != ''">
and t.res_id= #{resId}
</if>
<if test="storeId !=null and storeId != ''">
and t.store_id= #{storeId}
</if>
+ <if test="rstId !=null and rstId != ''">
+ and t.rst_id= #{rstId}
+ </if>
+ <if test="rssId !=null and rssId != ''">
+ and t.rss_id= #{rssId}
+ </if>
<if test="resName !=null and resName != ''">
and t.res_name= #{resName}
</if>
<if test="resCode !=null and resCode != ''">
and t.res_code= #{resCode}
- </if>
- <if test="goodsType !=null and goodsType != ''">
- and t.goods_type= #{goodsType}
</if>
<if test="unitCode !=null and unitCode != ''">
and t.unit_code= #{unitCode}
@@ -99,6 +121,18 @@
<if test="stock !=null and stock != ''">
and t.stock= #{stock}
</if>
+ <if test="shId !=null and shId != ''">
+ and t.sh_id= #{shId}
+ </if>
+ <if test="miniUnitCode !=null and miniUnitCode != ''">
+ and t.mini_unit_code= #{miniUnitCode}
+ </if>
+ <if test="miniUnitStock !=null and miniUnitStock != ''">
+ and t.mini_unit_stock= #{miniUnitStock}
+ </if>
+ <if test="miniStock !=null and miniStock != ''">
+ and t.mini_stock= #{miniStock}
+ </if>
<if test="createTime !=null and createTime != ''">
and t.create_time= #{createTime}
</if>
--
Gitblit v1.8.0