修改秒杀时段id

This commit is contained in:
halfninety
2022-11-20 16:48:56 +08:00
parent 83ee1c6129
commit ea2a57f0a0
8 changed files with 514 additions and 5 deletions

View File

@ -1,7 +1,9 @@
package cn.iocoder.yudao.module.promotion.controller.admin.seckillactivity;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.annotations.*;
@ -14,11 +16,13 @@ import java.io.IOException;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.*;
import cn.iocoder.yudao.module.promotion.controller.admin.seckillactivity.vo.*;
@ -65,6 +69,9 @@ public class SeckillActivityController {
@PreAuthorize("@ss.hasPermission('promotion:seckill-activity:query')")
public CommonResult<SeckillActivityRespVO> getSeckillActivity(@RequestParam("id") Long id) {
SeckillActivityDO seckillActivity = seckillActivityService.getSeckillActivity(id);
if (seckillActivity == null) {
return success(null);
}
return success(SeckillActivityConvert.INSTANCE.convert(seckillActivity));
}

View File

@ -20,6 +20,6 @@ public class SeckillActivityCreateReqVO extends SeckillActivityBaseVO {
@ApiModelProperty(value = "秒杀时段id", required = true)
@NotNull(message = "秒杀时段id不能为空")
private Long timeId;
private String timeId;
}

View File

@ -19,7 +19,7 @@ public class SeckillActivityExportReqVO {
private Integer status;
@ApiModelProperty(value = "秒杀时段id")
private Long timeId;
private String timeId;
@ApiModelProperty(value = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)

View File

@ -21,7 +21,7 @@ public class SeckillActivityPageReqVO extends PageParam {
private Integer status;
@ApiModelProperty(value = "秒杀时段id")
private Long timeId;
private String timeId;
@ApiModelProperty(value = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)

View File

@ -4,6 +4,8 @@ import lombok.*;
import java.util.*;
import io.swagger.annotations.*;
import javax.validation.constraints.NotNull;
@ApiModel("管理后台 - 秒杀活动 Response VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ -22,4 +24,7 @@ public class SeckillActivityRespVO extends SeckillActivityBaseVO {
@ApiModelProperty(value = "创建时间", required = true)
private Date createTime;
@ApiModelProperty(value = "秒杀时段id", required = true)
private String timeId;
}

View File

@ -24,6 +24,6 @@ public class SeckillActivityUpdateReqVO extends SeckillActivityBaseVO {
@ApiModelProperty(value = "秒杀时段id", required = true)
@NotNull(message = "秒杀时段id不能为空")
private Long timeId;
private String timeId;
}

View File

@ -55,7 +55,7 @@ public class SeckillActivityDO extends BaseDO {
/**
* 秒杀时段id
*/
private Long timeId;
private String timeId;
/**
* 付款订单数
*/