From 6e670a95d253ffef6d8baf66adb7bc08e6ea14e3 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Thu, 29 Jul 2021 20:39:07 +0800
Subject: [PATCH] bug修复
---
zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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 4892c5c..d15125a 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml
@@ -14,11 +14,15 @@
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}
@@ -86,7 +90,6 @@
LEFT JOIN activity_sign_award_set b ON a.award_id = b.id
where
b.award_type = 1
- and a.state = 1
and a.company_id = #{companyId}
and a.user_id = #{userId}
@@ -107,7 +110,6 @@
LEFT JOIN activity_sign_award_set b ON a.award_id = b.id
WHERE
b.award_type = 1
- AND a.state = 1
and a.company_id = #{record.companyId}
and a.user_id = #{record.userId}
<if test="record.sort !=null">
@@ -120,6 +122,9 @@
SELECT
a.id id,
a.state state,
+ a.consignee_phone consigneePhone,
+ a.consignee_address consigneeAddress,
+ a.consignee,
a.receive_time receiveTime,
a.write_off_code writeOffCode,
1 total,
@@ -130,6 +135,7 @@
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
--
Gitblit v1.9.1