framework/src/main/java/cn/lili/modules/lmk/domain/form/ScanPrizeForm.java
@@ -27,15 +27,15 @@ @NotNull(message = "店铺id不能为空", groups = {Add.class, Update.class}) @ApiModelProperty("店铺id") private Long storeId; private String storeId; @NotNull(message = "店铺名称不能为空", groups = {Add.class, Update.class}) @ApiModelProperty("店铺名称") private Long storeName; private String storeName; @NotNull(message = "抽奖活动id不能为空", groups = {Add.class, Update.class}) @ApiModelProperty("抽奖活动id") private Long prizeActivityId; private String prizeActivityId; @NotBlank(message = "抽奖活动名称名称不能为空", groups = {Add.class, Update.class}) @ApiModelProperty("抽奖活动名称名称") framework/src/main/java/cn/lili/modules/lmk/domain/query/PrizeActivityQuery.java
@@ -33,5 +33,9 @@ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") public Date endTime; private String enableStatus; private Boolean popup; }
@@ -18,5 +18,9 @@ @Data @ApiModel(value = "ScanPrize查询参数", description = "店铺活动关联查询参数") public class ScanPrizeQuery extends AbsQuery { private String generateStatus; private String status; private String storeId; }
@@ -22,15 +22,15 @@ /** 店铺id */ @ApiModelProperty("店铺id") private Long storeId; private String storeId; /** 店铺名称 */ @ApiModelProperty("店铺名称") private Long storeName; private String storeName; /** 抽奖活动id */ @ApiModelProperty("抽奖活动id") private Long prizeActivityId; private String prizeActivityId; /** 抽奖活动名称名称 */ @ApiModelProperty("抽奖活动名称名称") framework/src/main/java/cn/lili/modules/lmk/service/impl/ScanPrizeServiceImpl.java
@@ -13,6 +13,7 @@ import cn.lili.modules.lmk.mapper.ScanPrizeMapper; import cn.lili.modules.lmk.service.ScanPrizeService; import cn.lili.base.Result; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.lili.modules.lmk.domain.form.ScanPrizeForm; @@ -24,12 +25,14 @@ import lombok.RequiredArgsConstructor; import cn.lili.utils.PageUtil; import org.springframework.beans.BeanUtils; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.support.TransactionSynchronization; import org.springframework.transaction.support.TransactionSynchronizationManager; import org.springframework.util.Assert; import java.util.ArrayList; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; /** @@ -107,7 +110,12 @@ */ @Override public Result page(ScanPrizeQuery query) { IPage<ScanPrizeVO> page = PageUtil.getPage(query, ScanPrizeVO.class); LambdaQueryWrapper<ScanPrize> wrapper = Wrappers.lambdaQuery(); wrapper.eq(Objects.nonNull(query.getStoreId()), ScanPrize::getStoreId, query.getStoreId()); wrapper.eq(StringUtils.isNotBlank(query.getStatus()), ScanPrize::getStatus, query.getStatus()); wrapper.eq(StringUtils.isNotBlank(query.getGenerateStatus()), ScanPrize::getGenerateStatus, query.getGenerateStatus()); baseMapper.getPage(page, query); return Result.ok().data(page.getRecords()).total(page.getTotal()); } @@ -156,6 +164,7 @@ } @Override @Transactional public Result generateStorePrize(String id) { RLock redissonLock = redissonClient.getLock(STORE_PRIZE_GENERATE + id); framework/src/main/resources/mapper/lmk/PrizeActivityMapper.xml
@@ -64,7 +64,12 @@ </if> <if test="query.beginTime != null">AND LPA.begin_time >= #{query.beginTime}</if> <if test="query.endTime != null">AND LPA.end_time <= #{query.endTime}</if> <if test="query.enableStatus !=null and query.enableStatus !=''"> AND LPA.enable_status = #{query.enableStatus} </if> <if test="query.popup !=null and query.popup !=''"> AND LPA.popup = #{query.popup} </if> </select> <resultMap id="prizeInfoMap" type="cn.lili.modules.lmk.domain.vo.PrizeDetailVO"> <id property="id" column="id"/> framework/src/main/resources/mapper/lmk/ScanPrizeMapper.xml
@@ -8,7 +8,7 @@ <result column="store_id" property="storeId" /> <result column="store_name" property="storeName" /> <result column="prize_activity_id" property="prizeActivityId" /> <result column="prize_activity_nmae" property="prizeActivityNmae" /> <result column="prize_activity_name" property="prizeActivityName" /> <result column="generate_status" property="generateStatus" /> <result column="generate_num" property="generateNum" /> <result column="claim_num" property="claimNum" /> @@ -26,7 +26,7 @@ LSP.store_id, LSP.store_name, LSP.prize_activity_id, LSP.prize_activity_nmae, LSP.prize_activity_name, LSP.generate_status, LSP.generate_num, LSP.claim_num, @@ -44,7 +44,7 @@ LSP.store_id, LSP.store_name, LSP.prize_activity_id, LSP.prize_activity_nmae, LSP.prize_activity_name, LSP.generate_status, LSP.generate_num, LSP.claim_num,
