From f6d898060ce3ab0bbca1924fad724858d4adc296 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Fri, 22 Jan 2021 13:07:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api' into api

---
 zq-erp/src/main/resources/mybatis/mapper/hive/SysVipLabelDao.xml |   77 ++++++++++++++++++++++++++++++++------
 1 files changed, 64 insertions(+), 13 deletions(-)

diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysVipLabelDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysVipLabelDao.xml
index 26606d4..da750be 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysVipLabelDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysVipLabelDao.xml
@@ -9,16 +9,50 @@
             create_time,
             create_by,
             id,
-            vip_id,
-            label
+            label,
+            shop_id,
+            company_id,
+            is_all,
+            user_id,
+            color
         ) values (
             #{createTime},
             #{createBy},
             #{id},
-            #{vipId},
-            #{label}
+            #{label},
+            #{shopId},
+            #{companyId},
+            #{isAll},
+            #{userId},
+            #{color}
         )
     </insert>
+
+    <insert id="insertRelate" parameterType="com.matrix.system.hive.bean.SysVipLabel" useGeneratedKeys="true"
+            keyProperty="id">
+        insert sys_vip_label_relate (
+            id,
+            label_id,
+            vip_id
+        ) values (
+            #{id},
+            #{labelId},
+            #{vipId}
+        )
+    </insert>
+
+    <update id="update">
+        update sys_vip_label
+        <set>
+            <if test="label != null and label !='' ">
+                label = #{label},
+            </if>
+            <if test="color != null and color !='' ">
+                color = #{color},
+            </if>
+        </set>
+        WHERE ID=#{id}
+    </update>
 
     <delete id="deleteById">
         delete from sys_vip_label
@@ -27,26 +61,43 @@
 
 
     <select id="selectByVipId" resultType="com.matrix.system.hive.bean.SysVipLabel">
-        select *
-        from sys_vip_label
-        where vip_id=#{vipId}
+        select b.*
+        from sys_vip_label_relate a
+        inner join sys_vip_label b on a.label_id=b.id
+        where a.vip_id=#{vipId}
     </select>
 
     <select id="selectByModel" resultType="com.matrix.system.hive.bean.SysVipLabel">
-        select * from sys_vip_label
+        select
+            create_time createTime,
+            create_by createBy,
+            id,
+            label,
+            shop_id shopId,
+            company_id companyId,
+            is_all isAll,
+            user_id userId,
+            color
+        from sys_vip_label
         where 1=1
         <if test="record!=null">
             <if test="record.label!=null  and record.label!=''">
-                and label=#{record.label}
+                and label like CONCAT('%', CONCAT(#{record.label},'%'))
             </if>
-            <if test="record.vipId!=null">
-                and vip_id=#{record.vipId}
+            <if test="record.isAll!=null  and record.isAll!=0">
+                and is_all=#{record.isAll}
+            </if>
+            <if test="record.userId!=null  and record.userId!=''">
+                and user_id=#{record.userId}
+            </if>
+            <if test="record.companyId!=null  and record.companyId!=''">
+                and company_id=#{record.companyId}
             </if>
         </if>
     </select>
 
-    <delete id="deleteByVipId">
-        delete from sys_vip_label
+    <delete id="deleteRelateByVipId">
+        delete from sys_vip_label_relate
         where vip_id=#{vipId}
     </delete>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1