diff --git a/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/rpa/entity/RafflePrizeActivity.java b/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/rpa/entity/RafflePrizeActivity.java index 15f1e74..94ca53d 100644 --- a/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/rpa/entity/RafflePrizeActivity.java +++ b/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/rpa/entity/RafflePrizeActivity.java @@ -33,7 +33,7 @@ public class RafflePrizeActivity extends Entity { private String description; @ApiModelProperty("参加条件") - private RafflePrizeActivityConditionEnum condition; + private RafflePrizeActivityConditionEnum activityCondition; @ApiModelProperty("启用状态") private Boolean enable; diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/rpa/user/request/UserCreateRafflePrizeActivityDto.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/rpa/user/request/UserCreateRafflePrizeActivityDto.java index 1f3cbf0..693be77 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/rpa/user/request/UserCreateRafflePrizeActivityDto.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/rpa/user/request/UserCreateRafflePrizeActivityDto.java @@ -33,7 +33,7 @@ public class UserCreateRafflePrizeActivityDto implements Trans2DomainAssembler itemList; diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/rpa/user/request/UserEditRafflePrizeActivityDto.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/rpa/user/request/UserEditRafflePrizeActivityDto.java index b3ec111..475ab9d 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/rpa/user/request/UserEditRafflePrizeActivityDto.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/rpa/user/request/UserEditRafflePrizeActivityDto.java @@ -41,9 +41,9 @@ public class UserEditRafflePrizeActivityDto implements Trans2DomainAssembler itemList; @Override diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/rpa/user/response/UserGetRafflePrizeActivityDetailyByOperatorVo.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/rpa/user/response/UserGetRafflePrizeActivityDetailyByOperatorVo.java index a81c40f..a76cd83 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/rpa/user/response/UserGetRafflePrizeActivityDetailyByOperatorVo.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/rpa/user/response/UserGetRafflePrizeActivityDetailyByOperatorVo.java @@ -32,7 +32,7 @@ public class UserGetRafflePrizeActivityDetailyByOperatorVo { private String description; @ApiModelProperty("参加条件") - private RafflePrizeActivityConditionEnum condition; + private RafflePrizeActivityConditionEnum activityCondition; @ApiModelProperty("启用状态") private Boolean enable; diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/rpa/user/response/UserPageRafflePrizeActivityByOperatorVo.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/rpa/user/response/UserPageRafflePrizeActivityByOperatorVo.java index f9694b4..e04d83a 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/rpa/user/response/UserPageRafflePrizeActivityByOperatorVo.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/rpa/user/response/UserPageRafflePrizeActivityByOperatorVo.java @@ -31,7 +31,7 @@ public class UserPageRafflePrizeActivityByOperatorVo { private String description; @ApiModelProperty("参加条件") - private RafflePrizeActivityConditionEnum condition; + private RafflePrizeActivityConditionEnum activityCondition; @ApiModelProperty("启用状态") private Boolean enable; diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/rpa/impl/RafflePrizeActivityQueryServiceImpl.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/rpa/impl/RafflePrizeActivityQueryServiceImpl.java index 703e3b4..01142cb 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/rpa/impl/RafflePrizeActivityQueryServiceImpl.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/rpa/impl/RafflePrizeActivityQueryServiceImpl.java @@ -41,10 +41,10 @@ public class RafflePrizeActivityQueryServiceImpl implements RafflePrizeActivityQ } @Override - public RafflePrizeActivity queryEnableBy(RafflePrizeActivityConditionEnum condition) { + public RafflePrizeActivity queryEnableBy(RafflePrizeActivityConditionEnum activityCondition) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - if (Objects.nonNull(condition)) { - wrapper.eq(RafflePrizeActivity::getCondition, condition); + if (Objects.nonNull(activityCondition)) { + wrapper.eq(RafflePrizeActivity::getActivityCondition, activityCondition); } wrapper.eq(RafflePrizeActivity::getEnable, true); LocalDateTime now = LocalDateTime.now(); diff --git a/dating-agency-mall-server/src/main/resources/mapper/rpa/RafflePrizeActivityMapper.xml b/dating-agency-mall-server/src/main/resources/mapper/rpa/RafflePrizeActivityMapper.xml index 80bb7f0..84aa63a 100644 --- a/dating-agency-mall-server/src/main/resources/mapper/rpa/RafflePrizeActivityMapper.xml +++ b/dating-agency-mall-server/src/main/resources/mapper/rpa/RafflePrizeActivityMapper.xml @@ -10,7 +10,7 @@ start_time, end_time, description, - `condition`, + activity_condition, `enable` FROM da_raffle_prize_activity