抽奖活动字段调整

peng

3 天以前 23d4943535b59e54de1399d159d0209638c68657

抽奖活动字段调整

 framework/src/main/java/cn/lili/modules/lmk/domain/entity/PrizeActivity.java

@@ -28,12 +28,12 @@
    /** 活动描述 */
    private String activityDes;

    @TableField(value = "begin_time", typeHandler = LocalDateTimeTypeHandler.class)
    @TableField(value = "begin_time")
    /** 活动开始时间 */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date beginTime;

    @TableField(value = "end_time", typeHandler = LocalDateTimeTypeHandler.class)
    @TableField(value = "end_time")
    /** 活动结束时间 */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date endTime;

 framework/src/main/java/cn/lili/modules/lmk/domain/entity/PrizeGrantRecord.java

@@ -36,7 +36,7 @@

    @TableField("prize_id")
    /** 奖品id */
    private Long prizeId;
    private String prizeId;

    @TableField("prize_name")
    /** 奖品名称 */

 framework/src/main/java/cn/lili/modules/lmk/domain/entity/PrizeRecord.java

@@ -52,7 +52,7 @@

    @TableField("prize_id")
    /** 奖品id */
    private Long prizeId;
    private String prizeId;


    @TableField("prize_name")

 framework/src/main/java/cn/lili/modules/lmk/domain/vo/PrizeProbabilityVO.java

@@ -6,6 +6,6 @@

@Data
public class PrizeProbabilityVO {
    private Long prizeId;
    private String prizeId;
    private BigDecimal[][] probability;
}

 framework/src/main/java/cn/lili/modules/lmk/service/impl/PrizeServiceImpl.java

@@ -110,13 +110,13 @@
        //当天抽奖记录汇总
        List<PrizeRecordTimeVO> prizeRecordListByTime;
        //还能抽奖商品map集合
        Map<Long, ActivityRefPrize> canPrizeMap;
        Map<String, ActivityRefPrize> canPrizeMap;
        //待构建抽奖概率商品集合
        List<ActivityRefPrize> refPrizeList;
        //概率集合
        List<PrizeProbabilityVO> prizeProbabilityList;
        //中奖商品id
        Long prizeWon = null;
        String prizeWon = null;

        prizeActivity = prizeActivityService.getById(prizeId);
        if (prizeActivity == null) {
@@ -127,8 +127,8 @@
        if (new Date().after(activityEndtime)) {
            throw new ServiceException("当前活动已经结束");
        }
        if (!EnableStatusEnums.ENABLE.name().equals(prizeActivity.getEnableStatus())) {
            throw new ServiceException("活动还没有开始");
        if (!PrizeActivityStatusEnum.ON.name().equals(prizeActivity.getEnableStatus())) {
            throw new ServiceException("活动还没有启用");
        }
        //查询当天的抽奖卷
        LocalDate now = LocalDate.now();