From 6c235963d6fc46b38ea59d9b19c6519b892e080b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 16 May 2022 09:42:06 +0800
Subject: [PATCH] 20220516 逻辑删除，更新字段IS_Delete字段为已删除，默认为空，删除后其余信息从查询中过滤了
---
zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml | 42 ++++++++++++++++++++++++++----------------
1 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
index 091ac7f..2ced513 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
@@ -165,6 +165,7 @@
LEFT JOIN shopping_goods_category i ON e.cate_id = i.id
left join sys_proj_services l on a.service_order_id=l.id
<where>
+ and (c.IS_DELETE is null or c.IS_DELETE = '')
<if test="record!=null">
<if
test="(record.shopId!=null and record.shopId!='') or (record.shopId!='' and record.shopId==0) ">
@@ -266,6 +267,7 @@
LEFT JOIN shopping_goods_category j ON i.parent_id = j.id
left join sys_proj_services l on a.service_order_id=l.id
<where>
+ and (c.IS_DELETE is null or c.IS_DELETE = '')
<if test="record!=null">
<if
test="(record.shopId!=null and record.shopId!='') or (record.shopId!='' and record.shopId==0) ">
@@ -889,7 +891,7 @@
left join sys_users b on a.BEATUY_ID=b.su_id
inner join sys_shop_info c on c.id=a.SHOP_ID
<where>
-
+ and (a.IS_DELETE is null or a.IS_DELETE = '')
<if test="record.vipName != null and record.vipName !=''">
and (a.vip_name like CONCAT(CONCAT('%', #{record.vipName}), '%') or a.vip_no=#{record.vipName} or a.phone = #{record.vipName})
</if>
@@ -921,7 +923,7 @@
left join sys_users b on a.BEATUY_ID=b.su_id
inner join sys_shop_info c on c.id=a.SHOP_ID
<where>
-
+ and (a.IS_DELETE is null or a.IS_DELETE = '')
<if test="record.vipName != null and record.vipName !=''">
and (a.vip_name like CONCAT(CONCAT('%', #{record.vipName}), '%') or a.vip_no=#{record.vipName} or a.phone = #{record.vipName})
</if>
@@ -1156,7 +1158,7 @@
left join sys_order_item j on a.order_item_id=j.ID
left join achieve_rule u on u.id=e.achieve_rule_id
<where>
- and a.company_id = #{record.companyId}
+ and a.company_id = #{record.companyId} and (c.IS_DELETE is null or c.IS_DELETE = '')
<if test="record.shopId != null">
and a.shop_id = #{record.shopId}
</if>
@@ -1251,7 +1253,7 @@
case when c.BEATUY_ID=a.su_id then 1 else 0 end isAppoint,
(select count(distinct date_format(n.datatime, '%Y-%m-%d')) from achieve_new n
where date_format(b.datatime, '%Y-%m') = date_format(n.datatime, '%Y-%m') and n.vip_id=c.ID
- group by date_format(n.datatime, '%Y-%m-%d'))arriveCnt,
+ group by date_format(n.datatime, '%Y-%m'))arriveCnt,
(select count(1) from sys_order o where o.statu in ('欠款', '已付款') and o.VIP_ID=c.id) orderCnt,
(select group_concat(distinct q.pay_method) payMethod from sys_order p
inner join sys_order_flow q on p.ID=q.ORDER_ID
@@ -1278,22 +1280,21 @@
inner join achieve_new y on x.order_id=y.order_id
where x.pay_method='储值卡' and date_format(x.create_time, '%Y-%m-%d') = date_format(b.datatime, '%Y-%m-%d')
and y.beault_id=a.su_id and x.vip_id=c.id) cardPay,
+ (select sum(amount) from sys_order_flow x
+ inner join achieve_new y on x.order_id=y.order_id
+ where x.pay_method not in ('储值卡','欠款') and date_format(x.create_time, '%Y-%m-%d') = date_format(b.datatime, '%Y-%m-%d')
+ and y.beault_id=a.su_id and x.vip_id=c.id) cashPay,
+ (select sum(e.goods_cash) from achieve_new e
+ inner join shopping_goods f on e.shopping_goods_id=f.id and f.is_cooperate=1
+ where e.order_type='订单' and date_format(e.datatime, '%Y-%m-%d') = date_format(b.datatime, '%Y-%m-%d')
+ and e.beault_id=a.su_id and e.vip_id=c.id) cooperateProj,
sum(proj_percentage) ticheng,
sum(IFNULL(free_consume,0) + IFNULL(his_consume,0)) consume,
- (select count(1) from achieve_new z where z.beault_id=a.su_id and c.id=z.vip_id group by z.beault_id,z.vip_id) projCnt
+ (select count(1) from achieve_new z where z.beault_id=a.su_id and c.id=z.vip_id and z.order_type='服务单' group by z.beault_id,z.vip_id) projCnt
from sys_users a
left join achieve_new b on a.su_id=b.beault_id
left join sys_vip_info c on b.vip_id=c.ID
- left join (
- select x.vip_id, count(1) arriveCnt
- from (
- select vip_id, date_format(datatime, '%Y-%m-%d')
- from achieve_new
- where date_format(curdate(), '%Y-%m') = date_format(datatime, '%Y-%m')
- group by date_format(datatime, '%Y-%m-%d'), vip_id
- ) x group by x.vip_id
- ) d on c.id=d.vip_id
- where 1=1
+ where 1=1 and (c.IS_DELETE is null or c.IS_DELETE = '')
<if test="record.companyId != null">
and a.company_id=#{record.companyId}
</if>
@@ -1339,7 +1340,7 @@
from sys_users a
left join achieve_new b on a.su_id=b.beault_id
left join sys_vip_info c on b.vip_id=c.ID
- where 1=1
+ where 1=1 and (c.IS_DELETE is null or c.IS_DELETE = '')
<if test="record.companyId != null">
and a.company_id=#{record.companyId}
</if>
@@ -1364,4 +1365,13 @@
group by date_format(b.datatime, '%Y-%m-%d'), a.su_id, c.ID
) a
</select>
+
+ <select id="selectPlInfoByVipIdAndDate" resultType="java.lang.String">
+ select group_concat(concat(name,'*', bb))
+ from (select l.name name, 0+CAST(sum(n.amount) as char) bb from sys_out_store m
+ inner join sys_out_store_item n on m.id=n.OUT_STORE_ID
+ inner join shopping_goods l on n.SKU_ID=l.id
+ where m.SERVICE_ID in (select distinct service_order_id from achieve_new where date_format(datatime, '%Y-%m-%d') = date_format(#{datatime}, '%Y-%m-%d') and vip_id=#{vipId})
+ group by l.id) a
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1