From 7b64e3cebf5e95f57875d59198809b874f6c41fb Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 21 Apr 2021 15:59:35 +0800
Subject: [PATCH] merge score_shop

---
 zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignRecordDao.xml |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignRecordDao.xml b/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignRecordDao.xml
index 59fe364..f84a474 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignRecordDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignRecordDao.xml
@@ -9,9 +9,19 @@
         FROM
         activity_sign_record a
         where
-            a.actId = #{actId}
-            and a.open_id = #{userId}
-            and a.sign_time like concat('%',#{format},'%')
+            a.activity_id = #{actId}
+            and a.user_id = #{userId}
+            and a.sign_time like concat('%',DATE(#{format}),'%')
+    </select>
+
+    <select id="selectRecordByMonth" resultType="com.matrix.system.shopXcx.api.vo.ActivitySignRecordVo">
+        SELECT
+            *
+        FROM
+            activity_sign_record a
+        where a.sign_time like concat('%',DATE_FORMAT(#{date},'%Y-%m'),'%')
+          and a.activity_id = #{actId}
+          and a.user_id = #{userId}
     </select>
 
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1