From f42983b35c738a28ed4b9d1732d1045c5f2a19bb Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期日, 09 五月 2021 16:57:12 +0800
Subject: [PATCH] 优化代码

---
 java110-db/src/main/resources/mapper/store/ResourceStoreServiceDaoImplMapper.xml |   73 ++++++++++++++++++++++++++----------
 1 files changed, 53 insertions(+), 20 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 3fe2b71..b8f69c2
--- a/java110-db/src/main/resources/mapper/store/ResourceStoreServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/store/ResourceStoreServiceDaoImplMapper.xml
@@ -7,21 +7,23 @@
     <!-- 淇濆瓨璧勬簮淇℃伅 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,goods_type,
-        unit_code,remark,out_low_price,out_high_price,show_mobile,create_time,sh_id
+        res_name,operate,price,res_code,description,store_id,stock,warning_stock,b_id,res_id,goods_type,
+        unit_code,remark,out_low_price,out_high_price,show_mobile,create_time,sh_id,average_price
         ) values (
-        #{resName},#{operate},#{price},#{resCode},#{description},#{storeId},#{stock},#{bId},#{resId},
-        #{goodsType},#{unitCode},#{remark},#{outLowPrice},#{outHighPrice},#{showMobile},#{createTime},#{shId}
+        #{resName},#{operate},#{price},#{resCode},#{description},#{storeId},#{stock},#{warningStock},#{bId},#{resId},
+        #{goodsType},#{unitCode},#{remark},#{outLowPrice},#{outHighPrice},#{showMobile},#{createTime},#{shId},#{averagePrice}
         )
     </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.goods_type,t.goods_type goodsType,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.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 != ''">
@@ -45,6 +47,9 @@
         <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>
@@ -69,6 +74,9 @@
         <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>
@@ -77,11 +85,12 @@
     <!-- 淇濆瓨璧勬簮淇℃伅鑷� 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,goods_type,unit_code,remark,
-        out_low_price,out_high_price,show_mobile,create_time,sh_id
-        ) select t.res_name,t.price,t.res_code,t.description,'0',t.store_id,t.stock,t.b_id,t.res_id,t.goods_type,
-        t.unit_code,t.remark,t.out_low_price,t.out_high_price,t.show_mobile,t.create_time,t.sh_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,goods_type,unit_code,remark,
+        out_low_price,out_high_price,show_mobile,create_time,sh_id,average_price
+        ) 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.goods_type,
+        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
+        from business_resource_store t where 1=1
         <if test="resName !=null and resName != ''">
             and t.res_name= #{resName}
         </if>
@@ -101,6 +110,9 @@
         <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>
@@ -125,6 +137,9 @@
         <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>
@@ -133,14 +148,16 @@
     <!-- 鏌ヨ璧勬簮淇℃伅 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,t.out_low_price,
-        t.out_low_price outLowPrice,td.name goodsTypeName,t.out_high_price,t.out_high_price outHighPrice,t.goods_type,
+        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.out_low_price outLowPrice,rst.name goodsTypeName,t.out_high_price,t.out_high_price outHighPrice,t.goods_type,
         t.goods_type goodsType,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.create_time,t.create_time createTime,t.sh_id,t.sh_id shId,sh.sh_name shName,t.average_price,t.average_price
+        averagePrice
         from resource_store t
-        left join t_dict td on t.goods_type = td.status_cd and td.table_name = 'resource_store' and td.table_columns ='goods_type'
+        left join resource_store_type rst on t.goods_type = rst.goods_type and rst.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
+        where 1 = 1
         <if test="resName !=null and resName != ''">
             and t.res_name like concat('%',#{resName},'%')
         </if>
@@ -177,6 +194,9 @@
         <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>
@@ -190,10 +210,13 @@
             and sh.sh_type= #{shType}
         </if>
         <if test="shObjId !=null and shObjId != ''">
-            and sh.sh_ob_id= #{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
@@ -243,11 +266,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 != ''">
@@ -285,6 +312,9 @@
         <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>
@@ -313,11 +343,14 @@
             and t.sh_id= #{shId}
         </if>
         <if test="shObjId !=null and shObjId != ''">
-            and sh.sh_ob_id= #{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>

--
Gitblit v1.8.0