From 7fe6d026bcc8f993ce76437d01607e591cc671fe Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 25 十一月 2023 17:20:02 +0800
Subject: [PATCH] 重写课包支付和排课逻辑
---
cloud-server-activity/src/main/resources/mapper/UserPointsMerchandiseMapper.xml | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/cloud-server-activity/src/main/resources/mapper/UserPointsMerchandiseMapper.xml b/cloud-server-activity/src/main/resources/mapper/UserPointsMerchandiseMapper.xml
index bc20cc5..6c653cc 100644
--- a/cloud-server-activity/src/main/resources/mapper/UserPointsMerchandiseMapper.xml
+++ b/cloud-server-activity/src/main/resources/mapper/UserPointsMerchandiseMapper.xml
@@ -14,8 +14,6 @@
</where>
-
-
</update>
@@ -27,17 +25,18 @@
<select id="getConsumeDetails" resultType="com.dsh.activity.entity.ConsumeDetail">
SELECT
- CASE tm.type
- WHEN 1 THEN '实体购买'
- WHEN 2 THEN '课包购买'
- WHEN 3 THEN '门票购买'
- WHEN 4 THEN '优惠券购买'
- END AS consumeName ,DATE_FORMAT(pm.insertTime, '%m-%d %H:%i')as `consumeTime`,2 as type,CONCAT('-',tm.cash) as consumeAmount
+ CASE tm.type
+ WHEN 1 THEN '实体购买'
+ WHEN 2 THEN '课包购买'
+ WHEN 3 THEN '门票购买'
+ WHEN 4 THEN '优惠券购买'
+ END AS consumeName ,DATE_FORMAT(pm.insertTime, '%m-%d %H:%i')as `consumeTime`,2 as type,CONCAT('-',tm.cash) as
+ consumeAmount
FROM t_user_points_merchandise pm
- LEFT JOIN t_points_merchandise tm ON tm.id = pm.pointsMerchandiseId
+ LEFT JOIN t_points_merchandise tm ON tm.id = pm.pointsMerchandiseId
WHERE pm.pointsMerchandiseId IN(
- SELECT id
- FROM t_points_merchandise WHERE redemptionMethod IN (2,3)
+ SELECT id
+ FROM t_points_merchandise WHERE redemptionMethod IN (2,3)
)
<if test="null != monthStart and '' != monthStart and null != monthEnd and '' != monthEnd">
--
Gitblit v1.7.1