mirror of
http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git
synced 2026-08-14 21:52:07 +08:00
1、新增延期接口入参限制时长/单位必填;2、软件购买记录接口产品有效时间格式化;
This commit is contained in:
+2
@@ -22,9 +22,11 @@ public class ProductDelaySaveReqVO {
|
|||||||
private Long purchaseId;
|
private Long purchaseId;
|
||||||
|
|
||||||
@Schema(description = "延期时长", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
|
@Schema(description = "延期时长", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
|
||||||
|
@NotNull(message = "延期时长不能为空")
|
||||||
private Integer delayDuration;
|
private Integer delayDuration;
|
||||||
|
|
||||||
@Schema(description = "延期时长单位,0:年、1:月、2:日", example = "1")
|
@Schema(description = "延期时长单位,0:年、1:月、2:日", example = "1")
|
||||||
|
@NotNull(message = "延期时长单位不能为空")
|
||||||
@DurationUnitValid
|
@DurationUnitValid
|
||||||
private Integer delayDurationUnit;
|
private Integer delayDurationUnit;
|
||||||
|
|
||||||
|
|||||||
+4
@@ -9,6 +9,7 @@ import com.cf.imes.framework.excel.core.convert.EnumConvert;
|
|||||||
import com.cf.imes.module.system.enums.DictTypeConstants;
|
import com.cf.imes.module.system.enums.DictTypeConstants;
|
||||||
import com.cf.imes.module.system.enums.pay.InvoiceStatusEnum;
|
import com.cf.imes.module.system.enums.pay.InvoiceStatusEnum;
|
||||||
import com.cf.imes.module.system.enums.pay.ProductDurationUnitEnum;
|
import com.cf.imes.module.system.enums.pay.ProductDurationUnitEnum;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@@ -16,6 +17,8 @@ import java.math.BigDecimal;
|
|||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
|
import static com.cf.imes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
|
||||||
|
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
public class PurchaseRecordRespVO {
|
public class PurchaseRecordRespVO {
|
||||||
@@ -105,6 +108,7 @@ public class PurchaseRecordRespVO {
|
|||||||
|
|
||||||
@Schema(description = "失效时间")
|
@Schema(description = "失效时间")
|
||||||
@ExcelProperty("失效时间")
|
@ExcelProperty("失效时间")
|
||||||
|
@JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY)
|
||||||
private LocalDate endTime;
|
private LocalDate endTime;
|
||||||
|
|
||||||
@Schema(description = "操作人")
|
@Schema(description = "操作人")
|
||||||
|
|||||||
Reference in New Issue
Block a user