From ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 17 Jul 2021 15:59:10 +0800
Subject: [PATCH] 1.	新增套餐中有效和无效的操作 2.	会员修改门店功能 3.	套餐新增编辑次数功能 4.	计算是否为赠送的条件为,全部为赠送金额购买且支付金额大于0 5.	打印小票功能调整间距,和收银人 6.	PC端服务单新增划扣金额展示

---
 zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignRecordDao.xml |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 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 ad83bc6..140d8ff 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignRecordDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignRecordDao.xml
@@ -14,4 +14,25 @@
             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>
+
+    <select id="selectListByActIdAndUserIdLikesignTime" resultType="com.matrix.system.activity.entity.ActivitySignRecord">
+        SELECT
+            *
+        FROM
+            activity_sign_record a
+        where
+            a.activity_id = #{actId}
+          and a.user_id = #{userId}
+          and a.sign_time like concat('%',DATE(#{format}),'%')
+</select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1