From bf60845c8da9d0099ef25c8e6703351055865a8e Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Thu, 29 Jul 2021 20:35:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignWriteoffDao.xml | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignWriteoffDao.xml b/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignWriteoffDao.xml
index 2a3fa33..748d06f 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignWriteoffDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignWriteoffDao.xml
@@ -63,7 +63,7 @@
f.receive_address receiveAddress
FROM
activity_sign_writeoff 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 shop_activities c on a.act_id= c.id
left join activity_sign_award_set d on a.award_id= d.id
left join activity_sign_receive_record e on a.receive_id= e.id
@@ -89,7 +89,7 @@
b.nick_name zjr
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
where a.user_id = #{userId} and a.award_id = #{receiveId}
</select>
@@ -101,4 +101,13 @@
where a.id = #{logisticsId}
</select>
+ <select id="selectActivitySignWriteoffByUserIDAndReceiveId" resultType="com.matrix.system.activity.entity.ActivitySignWriteoff">
+ SELECT
+ *
+ FROM
+ activity_sign_writeoff a
+ where a.receive_id = #{receiveId}
+ and a.user_id = #{userId}
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1