From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能

---
 java110-db/src/main/resources/mapper/goods/ProductLabelServiceDaoImplMapper.xml |   34 +++++++++++++++++++++-------------
 1 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/goods/ProductLabelServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/goods/ProductLabelServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index b05ed9c..0a03593
--- a/java110-db/src/main/resources/mapper/goods/ProductLabelServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/goods/ProductLabelServiceDaoImplMapper.xml
@@ -20,11 +20,16 @@
         select t.label_id,t.label_id labelId,p.product_id productId,p.store_id storeId,t.label_cd,t.label_cd labelCd,
         p.unit_name unitName,p.is_postage isPostage,p.sort,p.bar_code barCode,p.postage,p.prod_name prodName,
         p.state,p.keyword,p.prod_desc prodDesc,p.category_id categoryId,pc.category_name categoryName,td.name stateName,
-        t.create_time createTime
+        t.create_time createTime,
+        psv.cost_price costPrice,psv.ot_price otPrice,psv.price,psv.sales,psv.stock,psv.vip_price vipPrice
         from product p
         left join product_category pc on pc.category_id = p.category_id and pc.store_id = p.store_id and pc.status_cd = '0'
         left join t_dict td on p.state = td.status_cd and td.table_name= 'product' and td.table_columns = 'state'
         left join product_label t on t.product_id = p.product_id and t.store_id = p.store_id and t.status_cd = '0'
+        left join product_spec_value psv on psv.product_id = t.product_id and psv.store_id = t.store_id and psv.is_default = 'T'
+        <if test="labelCd !=null and labelCd != ''">
+            and t.label_cd= #{labelCd}
+        </if>
         where 1 =1
         <if test="labelId !=null and labelId != ''">
             and t.label_id= #{labelId}
@@ -33,16 +38,16 @@
             and t.product_id= #{productId}
         </if>
         <if test="statusCd !=null and statusCd != ''">
-            and t.status_cd= #{statusCd}
+            and p.status_cd= #{statusCd}
         </if>
         <if test="storeId !=null and storeId != ''">
-            and t.store_id= #{storeId}
+            and p.store_id= #{storeId}
         </if>
-        <if test="labelCd !=null and labelCd != ''">
-            and t.label_cd= #{labelCd}
+        <if test='hasProduct !=null and hasProduct == "N"'>
+            and t.product_id is null
         </if>
-        <if test="hasProduct !=null and hasProduct == 'N'">
-            and p.product_id is null
+        <if test='hasProduct !=null and hasProduct == "Y"'>
+            and t.product_id is not null
         </if>
         order by t.create_time desc
         <if test="page != -1 and page != null ">
@@ -81,6 +86,9 @@
         left join product_category pc on pc.category_id = p.category_id and pc.store_id = p.store_id and pc.status_cd = '0'
         left join t_dict td on p.state = td.status_cd and td.table_name= 'product' and td.table_columns = 'state'
         left join product_label t on t.product_id = p.product_id and t.store_id = p.store_id and t.status_cd = '0'
+        <if test="labelCd !=null and labelCd != ''">
+            and t.label_cd= #{labelCd}
+        </if>
         where 1 =1
         <if test="labelId !=null and labelId != ''">
             and t.label_id= #{labelId}
@@ -89,16 +97,16 @@
             and t.product_id= #{productId}
         </if>
         <if test="statusCd !=null and statusCd != ''">
-            and t.status_cd= #{statusCd}
+            and p.status_cd= #{statusCd}
         </if>
         <if test="storeId !=null and storeId != ''">
-            and t.store_id= #{storeId}
+            and p.store_id= #{storeId}
         </if>
-        <if test="labelCd !=null and labelCd != ''">
-            and t.label_cd= #{labelCd}
+        <if test='hasProduct !=null and hasProduct == "N"'>
+            and t.product_id is null
         </if>
-        <if test="hasProduct !=null and hasProduct == 'N'">
-            and p.product_id is null
+        <if test='hasProduct !=null and hasProduct == "Y"'>
+            and t.product_id is not null
         </if>
 
 

--
Gitblit v1.8.0