java/HongRuiTang.git

			@@ -37,12 +37,10 @@
			private Integer times;

			@ApiModelProperty("活动开始时间")
			@NotEmpty(message = "活动开始时间不能为空")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
			private LocalDateTime startTime;

			@ApiModelProperty("活动结束时间")
			@NotEmpty(message = "活动结束时间不能为空")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
			private LocalDateTime endTime;

			@@ -306,6 +306,7 @@
			//新增
			BeanUtils.copyProperties(dto, lotteryEvent);
			if (dto.getId() == null) {
			lotteryEvent.setId(IdUtils.simpleUUID());
			lotteryEvent.setCreateTime(LocalDateTime.now());
			lotteryEvent.setCreateUserId(dto.getUserId());
			}else {
			@@ -470,7 +471,7 @@
			return R.fail("该抽奖活动不存在");
			}
			LocalDateTime now = LocalDateTime.now();
			if (!now.isBefore(lotteryEvent.getStartTime()) && !now.isAfter(lotteryEvent.getEndTime())) {
			if (now.isBefore(lotteryEvent.getStartTime()) && now.isAfter(lotteryEvent.getEndTime())) {
			return R.fail("该抽奖活动不在活动时间范围内");
			}
			lotteryEvent.setEndTime(now);//将结束时间设置为当前时间

	ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MgtLotteryEventEditDTO.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventServiceImpl.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史