From bd59c19c6fccfc8d0bf3804c0d0c712454bd7d42 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 16 六月 2021 17:24:47 +0800
Subject: [PATCH] 修复扣款

---
 java110-db/src/main/resources/mapper/store/ResourceStoreServiceDaoImplMapper.xml |  228 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 205 insertions(+), 23 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/store/ResourceStoreServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/store/ResourceStoreServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index 5882840..1faa533
--- a/java110-db/src/main/resources/mapper/store/ResourceStoreServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/store/ResourceStoreServiceDaoImplMapper.xml
@@ -7,17 +7,24 @@
     <!-- 淇濆瓨璧勬簮淇℃伅 add by wuxw 2018-07-03 -->
     <insert id="saveBusinessResourceStoreInfo" parameterType="Map">
         insert into business_resource_store(
-        res_name,operate,price,res_code,description,store_id,stock,b_id,res_id
+        res_name,operate,price,res_code,description,store_id,stock,warning_stock,b_id,res_id,
+        unit_code,remark,out_low_price,out_high_price,show_mobile,create_time,sh_id,average_price,rst_id,rss_id
         ) values (
-        #{resName},#{operate},#{price},#{resCode},#{description},#{storeId},#{stock},#{bId},#{resId}
+        #{resName},#{operate},#{price},#{resCode},#{description},#{storeId},#{stock},#{warningStock},#{bId},#{resId},
+        #{unitCode},#{remark},#{outLowPrice},#{outHighPrice},#{showMobile},#{createTime},#{shId},
+        #{averagePrice},#{rstId},#{rssId}
         )
     </insert>
-
 
     <!-- 鏌ヨ璧勬簮淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
     <select id="getBusinessResourceStoreInfo" parameterType="Map" resultType="Map">
         select t.res_name,t.res_name resName,t.operate,t.price,t.res_code,t.res_code
-        resCode,t.description,t.store_id,t.store_id storeId,t.stock,t.b_id,t.b_id bId,t.res_id,t.res_id resId
+        resCode,t.description,t.store_id,t.store_id storeId,t.stock,t.warning_stock,t.warning_stock
+        warningStock,t.b_id,t.b_id bId,t.res_id,t.res_id resId,t.rst_id,t.rst_id rstId,t.rss_id,t.rss_id rssId,
+        t.unit_code,t.unit_code unitCode,t.remark,t.out_low_price,t.out_low_price outLowPrice,
+        t.out_high_price,t.out_high_price outHighPrice,t.show_mobile,t.show_mobile showMobile,
+        t.create_time,t.create_time createTime,t.sh_id,t.sh_id shId,
+        t.average_price,t.average_price averagePrice
         from business_resource_store t
         where 1 =1
         <if test="resName !=null and resName != ''">
@@ -32,6 +39,12 @@
         <if test="resCode !=null and resCode != ''">
             and t.res_code= #{resCode}
         </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="description !=null and description != ''">
             and t.description= #{description}
         </if>
@@ -41,22 +54,47 @@
         <if test="stock !=null and stock != ''">
             and t.stock= #{stock}
         </if>
+        <if test="warningStock !=null and warningStock != ''">
+            and t.warning_stock= #{warningStock}
+        </if>
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
         </if>
         <if test="resId !=null and resId != ''">
             and t.res_id= #{resId}
         </if>
-
+        <if test="unitCode !=null and unitCode != ''">
+            and t.unit_code= #{unitCode}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="outLowPrice !=null and outLowPrice != ''">
+            and t.out_low_price= #{outLowPrice}
+        </if>
+        <if test="outHighPrice !=null and outHighPrice != ''">
+            and t.out_high_price= #{outHighPrice}
+        </if>
+        <if test="showMobile !=null and showMobile != ''">
+            and t.show_mobile= #{showMobile}
+        </if>
+        <if test="averagePrice !=null and averagePrice != ''">
+            and t.average_price= #{averagePrice}
+        </if>
+        <if test="createTime !=null and createTime != ''">
+            and t.create_time= #{createTime}
+        </if>
     </select>
-
 
     <!-- 淇濆瓨璧勬簮淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
     <insert id="saveResourceStoreInfoInstance" parameterType="Map">
         insert into resource_store(
-        res_name,price,res_code,description,status_cd,store_id,stock,b_id,res_id
-        ) select t.res_name,t.price,t.res_code,t.description,'0',t.store_id,t.stock,t.b_id,t.res_id from
-        business_resource_store t where 1=1
+        res_name,price,res_code,description,status_cd,store_id,stock,warning_stock,b_id,res_id,unit_code,remark,
+        out_low_price,out_high_price,show_mobile,create_time,sh_id,average_price,rst_id,rss_id
+        ) select
+        t.res_name,t.price,t.res_code,t.description,'0',t.store_id,t.stock,t.warning_stock,t.b_id,t.res_id,
+        t.unit_code,t.remark,t.out_low_price,t.out_high_price,t.show_mobile,t.create_time,t.sh_id,t.average_price,t.rst_id,t.rss_id
+        from business_resource_store t where 1=1
         <if test="resName !=null and resName != ''">
             and t.res_name= #{resName}
         </if>
@@ -67,6 +105,12 @@
         <if test="resCode !=null and resCode != ''">
             and t.res_code= #{resCode}
         </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="description !=null and description != ''">
             and t.description= #{description}
         </if>
@@ -76,27 +120,78 @@
         <if test="stock !=null and stock != ''">
             and t.stock= #{stock}
         </if>
+        <if test="warningStock !=null and warningStock != ''">
+            and t.warning_stock= #{warningStock}
+        </if>
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
         </if>
         <if test="resId !=null and resId != ''">
             and t.res_id= #{resId}
         </if>
-
+        <if test="unitCode !=null and unitCode != ''">
+            and t.unit_code= #{unitCode}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="outLowPrice !=null and outLowPrice != ''">
+            and t.out_low_price= #{outLowPrice}
+        </if>
+        <if test="outHighPrice !=null and outHighPrice != ''">
+            and t.out_high_price= #{outHighPrice}
+        </if>
+        <if test="showMobile !=null and showMobile != ''">
+            and t.show_mobile= #{showMobile}
+        </if>
+        <if test="averagePrice !=null and averagePrice != ''">
+            and t.average_price= #{averagePrice}
+        </if>
+        <if test="createTime !=null and createTime != ''">
+            and t.create_time= #{createTime}
+        </if>
     </insert>
-
 
     <!-- 鏌ヨ璧勬簮淇℃伅 add by wuxw 2018-07-03 -->
     <select id="getResourceStoreInfo" parameterType="Map" resultType="Map">
         select t.res_name,t.res_name resName,t.price,t.res_code,t.res_code resCode,t.description,t.status_cd,t.status_cd
-        statusCd,t.store_id,t.store_id storeId,t.stock,t.b_id,t.b_id bId,t.res_id,t.res_id resId
+        statusCd,t.store_id,t.store_id storeId,t.stock,t.warning_stock,t.warning_stock warningStock,t.b_id,t.b_id
+        bId,t.res_id,t.res_id resId,t.out_low_price,t.rst_id,t.rst_id rstId,t.rss_id,t.rss_id rssId,
+        t.out_low_price outLowPrice,rst.name rstName,t.out_high_price,t.out_high_price outHighPrice,
+        t.unit_code,t.unit_code unitCode,t.remark,t.show_mobile,t.show_mobile showMobile,
+        t.create_time,t.create_time createTime,t.sh_id,t.sh_id shId,sh.sh_name shName,t.average_price,t.average_price
+        averagePrice,rss.spec_name rssName
         from resource_store t
-        where 1 =1
+        left join resource_store_type rst on t.rst_id = rst.rst_id and rst.status_cd = '0'
+        left join resource_store_specification rss on t.rss_id = rss.rss_id and rss.status_cd = '0'
+        left join storehouse sh on t.sh_id = sh.sh_id and t.store_id = sh.store_id and sh.status_cd = '0'
+        where 1 = 1
         <if test="resName !=null and resName != ''">
-            and t.res_name= #{resName}
+            and t.res_name like concat('%',#{resName},'%')
+        </if>
+        <if test="name != null and name != ''">
+            and t.res_name = #{name}
         </if>
         <if test="price !=null and price != ''">
             and t.price= #{price}
+        </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="outLowPrice !=null and outLowPrice != ''">
+            and t.out_low_price = #{outLowPrice}
+        </if>
+        <if test="outHighPrice != null and outHighPrice != ''">
+            and t.out_high_price = #{outHighPrice}
+        </if>
+        <if test="unitCode != null and unitCode != ''">
+            and t.unit_code = #{unitCode}
+        </if>
+        <if test="remark != null and remark != ''">
+            and t.remark = #{remark}
         </if>
         <if test="resCode !=null and resCode != ''">
             and t.res_code= #{resCode}
@@ -113,18 +208,38 @@
         <if test="stock !=null and stock != ''">
             and t.stock= #{stock}
         </if>
+        <if test="warningStock !=null and warningStock != ''">
+            and t.warning_stock= #{warningStock}
+        </if>
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
         </if>
         <if test="resId !=null and resId != ''">
             and t.res_id= #{resId}
         </if>
+        <if test="shId !=null and shId != ''">
+            and t.sh_id= #{shId}
+        </if>
+        <if test="shType !=null and shType != ''">
+            and sh.sh_type= #{shType}
+        </if>
+        <if test="shObjId !=null and shObjId != ''">
+            and sh.sh_obj_id= #{shObjId}
+        </if>
+        <if test="showMobile != null and showMobile != ''">
+            and t.show_mobile = #{showMobile}
+        </if>
+        <if test="averagePrice != null and averagePrice != ''">
+            and t.average_price = #{averagePrice}
+        </if>
+        <if test="resOrderType == '20000'">
+            and t.stock > 0
+        </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 -->
     <update id="updateResourceStoreInfoInstance" parameterType="Map">
@@ -138,6 +253,27 @@
         <if test="price !=null and price != ''">
             , t.price= #{price}
         </if>
+        <if test="rstId !=null and rstId != ''">
+            , t.rst_id= #{rstId}
+        </if>
+        <if test="rssId !=null and rssId != ''">
+            , t.rss_id= #{rssId}
+        </if>
+        <if test="outLowPrice !=null and outLowPrice != ''">
+            , t.out_low_price= #{outLowPrice}
+        </if>
+        <if test="outHighPrice !=null and outHighPrice != ''">
+            , t.out_high_price= #{outHighPrice}
+        </if>
+        <if test="unitCode !=null and unitCode != ''">
+            , t.unit_code= #{unitCode}
+        </if>
+        <if test="showMobile !=null and showMobile != ''">
+            , t.show_mobile= #{showMobile}
+        </if>
+        <if test="remark !=null and remark != ''">
+            , t.remark= #{remark}
+        </if>
         <if test="resCode !=null and resCode != ''">
             , t.res_code= #{resCode}
         </if>
@@ -147,8 +283,15 @@
         <if test="storeId !=null and storeId != ''">
             , t.store_id= #{storeId}
         </if>
-        <if test="stock !=null and stock != ''">
-            , t.stock= #{stock}
+        , t.stock= #{stock}
+        <if test="warningStock !=null and warningStock != ''">
+            , t.warning_stock= #{warningStock}
+        </if>
+        <if test="shId !=null and shId != ''">
+            , t.sh_id= #{shId}
+        </if>
+        <if test="averagePrice !=null and averagePrice != ''">
+            , t.average_price= #{averagePrice}
         </if>
         where 1=1
         <if test="bId !=null and bId != ''">
@@ -157,16 +300,25 @@
         <if test="resId !=null and resId != ''">
             and t.res_id= #{resId}
         </if>
-
     </update>
 
     <!-- 鏌ヨ璧勬簮鏁伴噺 add by wuxw 2018-07-03 -->
     <select id="queryResourceStoresCount" parameterType="Map" resultType="Map">
         select count(1) count
         from resource_store t
+        left join storehouse sh on t.sh_id = sh.sh_id and t.store_id = sh.store_id and sh.status_cd = '0'
         where 1 =1
         <if test="resName !=null and resName != ''">
-            and t.res_name= #{resName}
+            and t.res_name like concat('%',#{resName},'%')
+        </if>
+        <if test="name != null and name != ''">
+            and t.res_name = #{name}
+        </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="price !=null and price != ''">
             and t.price= #{price}
@@ -186,14 +338,44 @@
         <if test="stock !=null and stock != ''">
             and t.stock= #{stock}
         </if>
+        <if test="warningStock !=null and warningStock != ''">
+            and t.warning_stock= #{warningStock}
+        </if>
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
         </if>
         <if test="resId !=null and resId != ''">
             and t.res_id= #{resId}
         </if>
-
-
+        <if test="unitCode !=null and unitCode != ''">
+            and t.unit_code= #{unitCode}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="outLowPrice !=null and outLowPrice != ''">
+            and t.out_low_price= #{outLowPrice}
+        </if>
+        <if test="outHighPrice !=null and outHighPrice != ''">
+            and t.out_high_price= #{outHighPrice}
+        </if>
+        <if test="showMobile !=null and showMobile != ''">
+            and t.show_mobile= #{showMobile}
+        </if>
+        <if test="shId !=null and shId != ''">
+            and t.sh_id= #{shId}
+        </if>
+        <if test="shObjId !=null and shObjId != ''">
+            and sh.sh_obj_id= #{shObjId}
+        </if>
+        <if test="shType !=null and shType != ''">
+            and sh.sh_type= #{shType}
+        </if>
+        <if test="averagePrice != null and averagePrice != ''">
+            and t.average_price = #{averagePrice}
+        </if>
+        <if test="resOrderType == '20000'">
+            and t.stock > 0
+        </if>
     </select>
-
 </mapper>

--
Gitblit v1.8.0