From 1d05d20580e92757afeac1e8e44dd4ace41ed321 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 18 May 2022 15:58:32 +0800
Subject: [PATCH] 20220516
---
zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml | 6 +++++-
1 files changed, 5 insertions(+), 1 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 2237f08..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 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>
--
Gitblit v1.9.1