diff --git a/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningAmountController.java b/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningAmountController.java index bfb63856..8d9708c3 100644 --- a/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningAmountController.java +++ b/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningAmountController.java @@ -59,7 +59,7 @@ public class DiscSpinningAmountController { @GetMapping("/selectDiscSpinningAmount") @ApiOperation("查询现金红包 抽奖配置") public Result selectDiscSpinningAmount(Integer page, Integer limit) { - return Result.success().put("data", discSpinningAmountService.page(new Page<>(page, limit), new QueryWrapper().orderByDesc("status").orderByAsc("random","max_amount"))); + return Result.success().put("data", discSpinningAmountService.page(new Page<>(page, limit), new QueryWrapper().orderByDesc("status").orderByAsc("num","random","max_amount"))); } } diff --git a/src/main/java/com/sqx/modules/discSpinning/entity/DiscSpinningAmount.java b/src/main/java/com/sqx/modules/discSpinning/entity/DiscSpinningAmount.java index 12ada871..985ceaeb 100644 --- a/src/main/java/com/sqx/modules/discSpinning/entity/DiscSpinningAmount.java +++ b/src/main/java/com/sqx/modules/discSpinning/entity/DiscSpinningAmount.java @@ -1,5 +1,7 @@ package com.sqx.modules.discSpinning.entity; +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; @@ -19,6 +21,7 @@ public class DiscSpinningAmount extends Model { @ApiModelProperty("主键id") private Long id; @ApiModelProperty("从第几次开始变化") + @TableField(updateStrategy = FieldStrategy.IGNORED) private Integer num; @ApiModelProperty("描述") private String name; @@ -29,6 +32,12 @@ public class DiscSpinningAmount extends Model { @ApiModelProperty("是否启动 0否1是") private Integer status; - + public void setNum(Integer num) { + if (num != null && num.equals(0)) { + this.num = null; + } else { + this.num = num; + } + } }