ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtLotteryEventController.java
@@ -37,7 +37,7 @@ @RequestMapping(value = "/editLotteryEvent", method = RequestMethod.POST) @Log(title = "抽奖管理", businessType = BusinessType.UPDATE,operContent = "编辑抽奖活动") @ApiOperation(value = "平台添加/修改抽奖活动【2.0】") public R<ShopLotteryDrawVo> editLotteryEvent(@Valid @RequestBody MgtLotteryEventEditDTO dto) { public R editLotteryEvent(@Valid @RequestBody MgtLotteryEventEditDTO dto) { return lotteryEventService.editLotteryEvent(dto); } @RequestMapping(value = "/pageMgtLotteryEvent", method = RequestMethod.POST) ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MgtLotteryEventEditDTO.java
@@ -1,6 +1,7 @@ package com.ruoyi.goods.domain.dto; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.system.api.domain.dto.MgtBaseDto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -37,10 +38,12 @@ @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;
@@ -1,5 +1,6 @@ package com.ruoyi.goods.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.goods.api.domain.LotteryEventPrize; import com.ruoyi.goods.domain.dto.MgtLotteryEventPrizeDTO; import com.ruoyi.goods.domain.dto.MgtLotteryEventQuestionDTO; @@ -27,8 +28,10 @@ @ApiModelProperty("可抽奖次数") private Integer times; @ApiModelProperty("活动开始时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime startTime; @ApiModelProperty("活动结束时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime endTime; /** ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventServiceImpl.java
@@ -255,7 +255,7 @@ @Override @Transactional public R<ShopLotteryDrawVo> editLotteryEvent(MgtLotteryEventEditDTO dto) { public R editLotteryEvent(MgtLotteryEventEditDTO dto) { //先检查开始-结束时间范围内，系统中是否有该活动 List<LotteryEvent> lotteryEvents = this.baseMapper.selectList(new LambdaQueryWrapper<LotteryEvent>() .eq(LotteryEvent::getDelFlag, 0)//未删除的 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/lottery/ILotteryEventService.java
@@ -59,7 +59,7 @@ * @param dto * @return */ R<ShopLotteryDrawVo> editLotteryEvent(MgtLotteryEventEditDTO dto); R editLotteryEvent(MgtLotteryEventEditDTO dto); /** * 分页查询抽奖活动 ruoyi-modules/ruoyi-goods/src/main/resources/mapper/lottery/LotteryEventMapper.xml
@@ -102,7 +102,7 @@ </otherwise> </choose> </when> <when test="dto.nameflag != null and dto.nameflag == 1"> <when test="dto.flag != null and dto.flag == 1"> -- shopIds为空但flag=1: 即查询平台创建，其他店铺没有类似的名称 AND shop_id IS NULL </when>
