From 6c136351d14e132a87851f68e36709184c51f6ec Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 22 八月 2024 14:53:45 +0800
Subject: [PATCH] 2024-08-22 朱宝民 优化代码-无记录时 pageSize 赋值问题
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml | 2 +-
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryResultVo.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryResultVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryResultVo.java
index ac64d89..363e953 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryResultVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryResultVo.java
@@ -61,7 +61,7 @@
}
if(this.itemTotal == 0){
- this.pageSize = 1 ;
+ this.pageSize = 10 ;
}
if(this.pageSize == null || this.pageSize <= 0){
/**
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml
index 977aa19..c5c9dd8 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml
@@ -216,7 +216,7 @@
trade_amount AS tradeAmount,
gift,
refund_amount AS refundAmount,
- (trade_amount + gift + refund_amount) AS totalAmount,
+ (trade_amount + gift - refund_amount) AS totalAmount,
Date(operate_date) AS operateDate,
(CASE
WHEN audit_status = 1 THEN '鏈鏍�'
--
Gitblit v1.8.0