From 5afea026085c1290b24ecf73be054ad7d7d78f84 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 19 九月 2024 14:49:44 +0800
Subject: [PATCH] 2024-09-19 朱宝民 消费记录接口，仅显示消费金额大于0的记录
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml | 55 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 36 insertions(+), 19 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
index 77b6343..e217ed6 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
@@ -624,6 +624,14 @@
AND cli.name like CONCAT('%',#{clientName},'%')
</if>
+ <if test = "onlyGift != null and onlyGift ==true">
+ AND ope.gift > 0
+ </if>
+
+ <if test = "cashierId != null and cashierId > 0">
+ AND ope.operator = #{cashierId}
+ </if>
+
<if test = "timeStart != null and timeStop != null">
AND ope.operate_dt BETWEEN #{timeStart} AND #{timeStop}
</if>
@@ -633,25 +641,26 @@
<!--鏍规嵁鎸囧畾鏉′欢鑾峰彇鏀舵嵁鍒楄〃-->
<select id="getReceipts" resultType="com.dy.pipIrrGlobal.voSe.VoReceipt">
SELECT
- CAST(ope.id AS char) AS orderNumber,
- tow.name AS townName,
- vil.name AS villageName,
- cli.`name`,
- cli.phone,
- CAST(cli.clientNum AS char) AS clientNum,
- CAST(card.cardNum AS char) AS cardNum,
- (CASE
- WHEN ope.operate_type = 1 THEN '寮�鍗�'
- WHEN ope.operate_type = 2 THEN '鍏呭��'
- END) AS operateType,
- IFNULL(ope.trade_amount,0) AS waterCost,
- IFNULL(ope.card_cost,0) AS cardCost,
- (IFNULL(ope.trade_amount,0) + IFNULL(ope.card_cost,0)) AS amount,
- card.money,
- pay.`name` AS paymentName,
- us.`name` AS operatorName,
- ope.operate_dt AS operateTime,
- NOW() AS currentTime
+ ope.id AS orderNumber,
+ tow.name AS townName,
+ vil.name AS villageName,
+ cli.`name`,
+ cli.phone,
+ cli.clientNum,
+ card.cardNum,
+ (CASE
+ WHEN ope.operate_type = 1 THEN '寮�鍗�'
+ WHEN ope.operate_type = 2 THEN '鍏呭��'
+ END) AS operateType,
+ IFNULL(ope.trade_amount,0) AS waterCost,
+ IFNULL(ope.gift,0) AS gift,
+ IFNULL(ope.card_cost,0) AS cardCost,
+ (IFNULL(ope.trade_amount,0) + IFNULL(ope.card_cost,0)) AS amount,
+ card.money,
+ pay.`name` AS paymentName,
+ us.`name` AS operatorName,
+ ope.operate_dt AS operateTime,
+ NOW() AS currentTime
FROM se_card_operate ope
INNER JOIN se_client cli ON ope.client_id = cli.id
INNER JOIN se_client_card card ON ope.card_id = card.id
@@ -669,6 +678,14 @@
AND cli.name like CONCAT('%',#{clientName},'%')
</if>
+ <if test = "onlyGift != null and onlyGift ==true">
+ AND ope.gift > 0
+ </if>
+
+ <if test = "cashierId != null and cashierId > 0">
+ AND ope.operator = #{cashierId}
+ </if>
+
<if test = "timeStart != null and timeStop != null">
AND ope.operate_dt BETWEEN #{timeStart} AND #{timeStop}
</if>
--
Gitblit v1.8.0