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