From 572df690f72ed4a077d934823f261dec39b3cc7d Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期二, 08 九月 2026 17:11:34 +0800
Subject: [PATCH] feat&bug：文档内容修改
---
cloud-server-activity/src/main/resources/mapper/PayHuiminMapper.xml | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/cloud-server-activity/src/main/resources/mapper/PayHuiminMapper.xml b/cloud-server-activity/src/main/resources/mapper/PayHuiminMapper.xml
index 52aaa37..57e1c7c 100644
--- a/cloud-server-activity/src/main/resources/mapper/PayHuiminMapper.xml
+++ b/cloud-server-activity/src/main/resources/mapper/PayHuiminMapper.xml
@@ -9,10 +9,13 @@
thc.huiMinName,
thc.huiMinType,
tph.salesMoney,
+ tph.paymentType,
thc.operatorId,
thc.storeIds,
tph.appUserId,
tph.paymentTime,
+ tph.refundTime,
+ tph.refundStatus,
tph.endTime,
tph.studentId,
thc.id as carId,
@@ -72,14 +75,17 @@
LEFT JOIN t_huimin_card thc ON tph.cardId = thc.id
<where>
tph.id IS NOT NULL
+ <if test="query.giftPaymentType != null">
+ AND (tph.paymentType IS NULL OR tph.paymentType != #{query.giftPaymentType})
+ </if>
<if test="query.huiMinName !=null and query.huiMinName != ''">
AND thc.huiMinName LIKE CONCAT('%',#{query.huiMinName},'%')
</if>
<if test="query.huiMinType !=null and query.huiMinType != ''">
AND thc.huiMinType = #{query.huiMinType}
</if>
- <if test="query.operatorId !=null and query.operatorId != ''">
- AND thc.huiMinType = #{query.huiMinType}
+ <if test="query.operatorId !=null">
+ AND thc.operatorId = #{query.operatorId}
</if>
<if test="query.useId !=null and query.useId != ''">
AND FIND_IN_SET(#{query.useId},thc.useIds)
@@ -122,10 +128,13 @@
thc.huiMinName,
thc.huiMinType,
tph.salesMoney,
+ tph.paymentType,
thc.operatorId,
thc.storeIds,
tph.appUserId,
tph.paymentTime,
+ tph.refundTime,
+ tph.refundStatus,
tph.endTime,
tph.studentId,
tph.status,
@@ -138,14 +147,18 @@
LEFT JOIN t_huimin_card thc ON tph.cardId = thc.id
LEFT JOIN t_huimin_record thr ON tph.appUserId= thr.appUserId AND tph.cardId= thr.huiminCardId
<where>
+ tph.id IS NOT NULL
+ <if test="query.giftPaymentType != null">
+ AND (tph.paymentType IS NULL OR tph.paymentType != #{query.giftPaymentType})
+ </if>
<if test="query.huiMinName !=null and query.huiMinName != ''">
AND thc.huiMinName LIKE CONCAT('%',#{query.huiMinName},'%')
</if>
<if test="query.huiMinType !=null and query.huiMinType != ''">
AND thc.huiMinType = #{query.huiMinType}
</if>
- <if test="query.operatorId !=null and query.operatorId != ''">
- AND thc.huiMinType = #{query.huiMinType}
+ <if test="query.operatorId !=null">
+ AND thc.operatorId = #{query.operatorId}
</if>
<if test="query.useId !=null and query.useId != ''">
AND FIND_IN_SET(#{query.useId},thc.useIds)
--
Gitblit v1.7.1