diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/other/domain/entity/PackageDetailEntity.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/other/domain/entity/PackageDetailEntity.java index 4e6793f..525a7c5 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/other/domain/entity/PackageDetailEntity.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/other/domain/entity/PackageDetailEntity.java @@ -69,6 +69,11 @@ public class PackageDetailEntity { */ private Integer state; + /** + * 有效天数 + */ + private Integer effectiveDay; + /** * 分销商ID */ diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/other/domain/form/PackageDetailAddForm.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/other/domain/form/PackageDetailAddForm.java index 465224a..32db8a5 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/other/domain/form/PackageDetailAddForm.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/other/domain/form/PackageDetailAddForm.java @@ -42,6 +42,9 @@ public class PackageDetailAddForm { @Schema(description = "状态(0:下架;1:上架)") private Integer state; + @Schema(description = "有效天数") + private Integer effectiveDay; + @Schema(description = "分销商ID") private Integer distributorId; diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/other/domain/form/PackageDetailUpdateForm.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/other/domain/form/PackageDetailUpdateForm.java index 8858a4e..c3f7701 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/other/domain/form/PackageDetailUpdateForm.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/other/domain/form/PackageDetailUpdateForm.java @@ -47,6 +47,9 @@ public class PackageDetailUpdateForm { @Schema(description = "状态(0:下架;1:上架)") private Integer state; + @Schema(description = "有效天数") + private Integer effectiveDay; + @Schema(description = "分销商ID") private Integer distributorId; diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/other/domain/vo/PackageDetailVO.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/other/domain/vo/PackageDetailVO.java index 8e2dee4..529f14c 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/other/domain/vo/PackageDetailVO.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/other/domain/vo/PackageDetailVO.java @@ -46,6 +46,9 @@ public class PackageDetailVO { @Schema(description = "状态(0:下架;1:上架)") private Integer state; + @Schema(description = "有效天数") + private Integer effectiveDay; + @Schema(description = "分销商ID") private Integer distributorId; diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/other/domain/vo/PaymentOrderVO.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/other/domain/vo/PaymentOrderVO.java index 7f2d42a..927e7eb 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/other/domain/vo/PaymentOrderVO.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/other/domain/vo/PaymentOrderVO.java @@ -2,6 +2,8 @@ package net.lab1024.sa.admin.module.business.other.domain.vo; import io.swagger.v3.oas.annotations.media.Schema; import java.time.LocalDateTime; +import java.util.Date; + import lombok.Data; /** @@ -55,6 +57,15 @@ public class PaymentOrderVO { @Schema(description = "创建时间") private LocalDateTime createTime; + @Schema(description = "有效天数") + private Integer effectiveDay; + + @Schema(description = "截止有效日期") + private Date effectiveTime; + + @Schema(description = "支付时间") + private Date payTime; + @Schema(description = "分销商ID") private Integer distributorId; diff --git a/sa-admin/src/main/resources/mapper/business/other/PackageDetailMapper.xml b/sa-admin/src/main/resources/mapper/business/other/PackageDetailMapper.xml index 10c6272..622acc9 100644 --- a/sa-admin/src/main/resources/mapper/business/other/PackageDetailMapper.xml +++ b/sa-admin/src/main/resources/mapper/business/other/PackageDetailMapper.xml @@ -14,6 +14,7 @@ t_package_detail.original_price, t_package_detail.selling_price, t_package_detail.state, + t_package_detail.effective_day, t_package_detail.distributor_id