diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/purchase/vo/PurchaseRecordPageReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/purchase/vo/PurchaseRecordPageReqVO.java index b92e09619..453d886a9 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/purchase/vo/PurchaseRecordPageReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/purchase/vo/PurchaseRecordPageReqVO.java @@ -2,6 +2,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.products.DurationUnitValid; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.DecimalMax; import jakarta.validation.constraints.DecimalMin; @@ -37,9 +38,17 @@ public class PurchaseRecordPageReqVO extends PageParam { @Schema(description = "购买时长") private Integer purchaseDuration; + @Schema(description = "购买时长单位") + @DurationUnitValid + private Integer purchaseDurationUnit; + @Schema(description = "赠送时长") private Integer giftDuration; + @Schema(description = "赠送时长单位") + @DurationUnitValid + private Integer giftDurationUnit; + @Schema(description = "购买时间", example = "[2022-07-01 01:01:01 ,2022-07-01 01:01:01]") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) 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 ff67f6721..d1d21433b 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 @@ -47,7 +47,9 @@ public interface PurchaseRecordMapper extends BaseMapperX { .likeIfPresent(PurchaseRecordDO::getProductName, pageReqVO.getProductName()) .likeIfPresent(PurchaseRecordDO::getId, pageReqVO.getId()) .eqIfPresent(PurchaseRecordDO::getPurchaseDuration, pageReqVO.getPurchaseDuration()) + .eqIfPresent(PurchaseRecordDO::getPurchaseDurationUnit, pageReqVO.getPurchaseDurationUnit()) .eqIfPresent(PurchaseRecordDO::getGiftDuration, pageReqVO.getGiftDuration()) + .eqIfPresent(PurchaseRecordDO::getGiftDurationUnit, pageReqVO.getGiftDurationUnit()) .betweenIfPresent(PurchaseRecordDO::getCreateTime, pageReqVO.getCreateTime()) .likeIfPresent(PurchaseRecordDO::getCreator, pageReqVO.getCreator()) .eqIfPresent(PurchaseRecordDO::getTotalAmount, pageReqVO.getProductPrice())