From 8f462401f9afc98c973f9d09a19b9bad23d4fb52 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Thu, 16 Oct 2025 10:19:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A6=E6=88=B7=E6=98=8E=E7=BB=86=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E6=96=87=E6=A1=A3=E6=9B=B4=E6=AD=A3=EF=BC=8C=E8=B4=A6?= =?UTF-8?q?=E6=88=B7=E6=98=8E=E7=BB=86=E5=88=86=E9=A1=B5=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8F=B7=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../funds/balancedetails/vo/BalanceDetailsPageReqVO.java | 4 ++++ .../funds/balancedetails/vo/BalanceDetailsRespVO.java | 8 ++++---- .../incomeandexpense/IncomeExpenseDetailsMapper.java | 1 + 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/balancedetails/vo/BalanceDetailsPageReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/balancedetails/vo/BalanceDetailsPageReqVO.java index 357edb001..0c06439c6 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/balancedetails/vo/BalanceDetailsPageReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/balancedetails/vo/BalanceDetailsPageReqVO.java @@ -26,6 +26,10 @@ public class BalanceDetailsPageReqVO extends PageParam { @Size(max = 64, message = "流水号长度不能超过64个字符") private String businessNo; + @Schema(description = "订单号") + @Size(max = 64, message = "订单号长度不能超过64个字符") + private String orderNo; + @Schema(description = "交易类型") @TradeTypeEnumValid private Integer tradeType; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/balancedetails/vo/BalanceDetailsRespVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/balancedetails/vo/BalanceDetailsRespVO.java index 389b9bf81..54e1484fb 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/balancedetails/vo/BalanceDetailsRespVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/balancedetails/vo/BalanceDetailsRespVO.java @@ -49,12 +49,12 @@ public class BalanceDetailsRespVO { @ExcelProperty("产品金额") private BigDecimal productPrice; - @Schema(description = "现金支付") - @ExcelProperty("现金支付") - private BigDecimal balancePayAmount; - @Schema(description = "账户充值支付") @ExcelProperty("账户充值支付") + private BigDecimal balancePayAmount; + + @Schema(description = "支付宝和微信支付") + @ExcelProperty("支付宝和微信支付") private BigDecimal rechargePayAmount; @Schema(description = "账户赠送金支付") diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/incomeandexpense/IncomeExpenseDetailsMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/incomeandexpense/IncomeExpenseDetailsMapper.java index 87c4cb98b..0cd413680 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/incomeandexpense/IncomeExpenseDetailsMapper.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/incomeandexpense/IncomeExpenseDetailsMapper.java @@ -31,6 +31,7 @@ public interface IncomeExpenseDetailsMapper extends BaseMapperX