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/activity/ActivitySignReceiveRecordDao.xml | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml b/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml
index b9f2426..0d96af4 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml
@@ -14,14 +14,18 @@
c.cumulative_day cumulativeDay,
c.award_type awardType,
c.award_name awardName,
+ c.coupon_name couponName,
+ c.score_cnt scoreCnt,
+ d.act_type actType,
c.award_rule awardRule
FROM
activity_sign_receive_record a
- LEFT JOIN biz_user b ON a.user_id = b.user_id
+ LEFT JOIN sys_vip_info b ON a.user_id = b.id
LEFT JOIN activity_sign_award_set c ON a.award_id = c.id
+ LEFT JOIN shop_activities d ON a.award_id = d.id
<where>
a.company_id = #{record.companyId}
- and a.activity_id = #{record.actId}
+ and a.activity_id = #{record.actId} and (b.IS_DELETE is null or b.IS_DELETE = '')
<if test="record.yhmc != null and record.yhmc != ''">
and b.nick_name like concat('%',#{record.yhmc},'%')
</if>
@@ -120,7 +124,7 @@
a.state state,
a.consignee_phone consigneePhone,
a.consignee_address consigneeAddress,
- a.consignee
+ a.consignee,
a.receive_time receiveTime,
a.write_off_code writeOffCode,
1 total,
@@ -131,12 +135,13 @@
b.prize_start_time prizeStartTime,
b.award_way awardWay,
b.introduce_img introduceImg,
+ b.customer_phone customerPhone,
b.award_name awardName
FROM
activity_sign_receive_record a
LEFT JOIN activity_sign_award_set b ON a.award_id = b.id
WHERE
- a.award_id = #{record.awardId}
+ a.id = #{record.awardId}
and a.company_id = #{record.companyId}
and a.user_id = #{record.userId}
</select>
--
Gitblit v1.9.1