From 1cc176bee0f32cb68295e60a2c47dfef04950417 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Mon, 1 Jun 2026 20:21:40 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A6=85=E9=81=93bug#1601=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/funds/purchase/vo/SalesDetailsPageReqVO.java | 5 +++++ .../dal/mysql/funds/purchase/PurchaseRecordMapper.java | 1 + 2 files changed, 6 insertions(+) diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/purchase/vo/SalesDetailsPageReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/purchase/vo/SalesDetailsPageReqVO.java index 1bb305f56..247a617e3 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/purchase/vo/SalesDetailsPageReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/purchase/vo/SalesDetailsPageReqVO.java @@ -1,6 +1,7 @@ package com.cf.imes.module.system.controller.admin.funds.purchase.vo; import com.cf.imes.framework.common.pojo.PageParam; +import com.cf.imes.module.system.validation.pay.PayChannelCodeValid; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.DecimalMax; import jakarta.validation.constraints.DecimalMin; @@ -44,4 +45,8 @@ public class SalesDetailsPageReqVO extends PageParam { @Schema(description = "交易时间", example = "[2022-07-01 01:01:01 ,2022-07-01 01:01:01]") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; + + @Schema(description = "支付方式") + @PayChannelCodeValid + private Integer paymentMethod; } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/funds/purchase/PurchaseRecordMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/funds/purchase/PurchaseRecordMapper.java index 0e3390630..ff67f6721 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/funds/purchase/PurchaseRecordMapper.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/funds/purchase/PurchaseRecordMapper.java @@ -125,6 +125,7 @@ public interface PurchaseRecordMapper extends BaseMapperX { .eqIfPresent(PurchaseRecordDO::getTotalAmount, pageReqVO.getProductPrice()) .eqIfPresent(PurchaseRecordDO::getOrganId, pageReqVO.getOrganId()) .eqIfPresent(PurchaseRecordDO::getCreator, pageReqVO.getOperator()) + .eqIfPresent(PurchaseRecordDO::getPaymentMethod, pageReqVO.getPaymentMethod()) .eq(PurchaseRecordDO::getDeleted, false) .ne(PurchaseRecordDO::getInitial, true) .orderByDesc(PurchaseRecordDO::getCreateTime)