From b9a422b6d3dcfb9b2e09f0dc4628425f6e9a45a9 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 20 九月 2024 09:58:56 +0800
Subject: [PATCH] 2024-09-20 朱宝民 修改充值记录余额计算方法，修改今日明细余额计算方法
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java | 3 +--
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml | 6 ++++--
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoRecharge.java | 15 ++++++++++++---
3 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoRecharge.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoRecharge.java
index fb4e01b..3d9b309 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoRecharge.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoRecharge.java
@@ -41,7 +41,7 @@
private String address;
/**
- * 姘村崱浣欓
+ * 姘村崱鏈�缁堜綑棰�
*/
private Float money;
@@ -50,13 +50,22 @@
private Integer cardCost;
- @Schema(title = "鍏呭�奸噾棰�")
+ /**
+ * 鏈鍏呭�奸噾棰�
+ */
private Float amount;
+
+ /**
+ * 鏈璧犻�侀噾棰�
+ */
+ private Float gift;
@Schema(title = "杩斿洖閲戦")
private Float refundAmount;
- @Schema(title = "鍏呭�煎悗閲戦")
+ /**
+ * 鍏呭�煎悗閲戦锛屽厖鍊兼椂浣欓 + 鏈鍏呭�奸噾棰� + 鏈璧犻�侀噾棰�
+ */
private Float afterRecharge;
@Schema(title = "鏀粯鏂瑰紡")
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java
index d65d5c7..57b15a9 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java
@@ -113,9 +113,8 @@
/**
* 浣欓
*/
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
@ColumnWidth(15)
- private Long money;
+ private Double money;
/**
* 浠樻鏂瑰紡
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..3b35dfd 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
@@ -277,8 +277,9 @@
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,
@@ -361,7 +362,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,
--
Gitblit v1.8.0