From 18cbfecbf98cb3c45becf108042d21e0508576e4 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 27 九月 2024 10:28:24 +0800
Subject: [PATCH] 2024-09-27 朱宝民 生成总账时，取消当天的限制
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml | 9 +++++++--
1 files changed, 7 insertions(+), 2 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 c6b3686..57cb229 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
@@ -272,13 +272,15 @@
cli.phone,
cli.idCard,
cli.clientNum,
+ dis.name AS villageName,
cli.address,
card.money,
cardNum,
IFNULL(ope.card_cost,0) AS cardCost,
IFNULL(ope.trade_amount, 0) AS amount,
+ IFNULL(ope.gift, 0) AS gift,
IFNULL(ope.refund_amount, 0) AS refundAmount,
- (IFNULL(ope.money, 0) + IFNULL(ope.trade_amount, 0)) AS afterRecharge,
+ (IFNULL(ope.money, 0) + IFNULL(ope.trade_amount, 0) + IFNULL(ope.gift, 0)) AS afterRecharge,
pay.name AS paymentName,
ope.price,
us.name AS opr,
@@ -291,6 +293,7 @@
FROM se_card_operate ope
INNER JOIN se_client_card card ON ope.card_id = card.id
INNER JOIN se_client cli ON ope.client_id = cli.id
+ LEFT JOIN ba_district dis ON dis.id = cli.villageId
INNER JOIN ba_user us ON ope.operator = us.id
Left JOIN se_payment_method pay ON ope.payment_id = pay.id
<where>
@@ -361,7 +364,8 @@
IFNULL(ope.card_cost,0.00) AS cardCost,
IFNULL(ope.gift,0.00) AS gift,
IFNULL(ope.refund_amount,0.00) AS refundAmount,
- ope.money,
+ <!--ope.money,-->
+ (IFNULL(ope.money, 0) + IFNULL(ope.trade_amount, 0) + IFNULL(ope.gift, 0)) AS money,
pay.name AS paymentName,
ope.operate_dt as tradeTime,
us.id AS cashierId,
@@ -661,6 +665,7 @@
pay.`name` AS paymentName,
us.`name` AS operatorName,
ope.operate_dt AS operateTime,
+ ope.operator AS cashierId,
NOW() AS currentTime
FROM se_card_operate ope
INNER JOIN se_client cli ON ope.client_id = cli.id
--
Gitblit v1.8.0