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 0c06439c6..357edb001 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,10 +26,6 @@ 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/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 efcb97f78..f02777ae8 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 @@ -3,6 +3,7 @@ package com.cf.imes.module.system.controller.admin.funds.purchase.vo; import com.cf.imes.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -39,7 +40,8 @@ public class PurchaseRecordPageReqVO extends PageParam { @Schema(description = "操作人") private String creator; - - + @Schema(description = "订单号") + @Size(max = 64, message = "订单号长度不能超过64个字符") + private String orderNo; } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/purchase/vo/PurchaseRecordRespVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/purchase/vo/PurchaseRecordRespVO.java index 72f150122..7e20a41ce 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/purchase/vo/PurchaseRecordRespVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/purchase/vo/PurchaseRecordRespVO.java @@ -33,6 +33,10 @@ public class PurchaseRecordRespVO { @ExcelProperty("产品名称") private String productName; + @Schema(description = "订单号") + @ExcelProperty("订单号") + private String orderNo; + @Schema(description = "购买时长", example = "1") @ExcelProperty("购买时长") private Integer purchaseDuration; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/funds/purchase/PurchaseRecordDO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/funds/purchase/PurchaseRecordDO.java index 3c8cbf885..4c7c60f3d 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/funds/purchase/PurchaseRecordDO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/funds/purchase/PurchaseRecordDO.java @@ -65,6 +65,10 @@ public class PurchaseRecordDO extends BaseDO { */ private String productName; + /** + * 订单号 + */ + private String orderNo; /** * 购买时长 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 cdf3b7152..3f5d69d6d 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 @@ -44,6 +44,7 @@ public interface PurchaseRecordMapper extends BaseMapperX { .eq(PurchaseRecordDO::getDeleted, false) .eqIfPresent(PurchaseRecordDO::getOrganId, pageReqVO.getOrganId()) .likeIfPresent(PurchaseRecordDO::getProductName, pageReqVO.getProductName()) + .likeIfPresent(PurchaseRecordDO::getOrderNo, pageReqVO.getOrderNo()) .eqIfPresent(PurchaseRecordDO::getPurchaseDuration, pageReqVO.getPurchaseDuration()) .betweenIfPresent(PurchaseRecordDO::getCreateTime, pageReqVO.getCreateTime()) .likeIfPresent(PurchaseRecordDO::getCreator, pageReqVO.getCreator()) 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 0cd413680..87c4cb98b 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,7 +31,6 @@ public interface IncomeExpenseDetailsMapper extends BaseMapperX