抽奖奖品活动

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<RafflePrizeActivity> {
     private String description;
 
     @ApiModelProperty("参加条件")
-    private RafflePrizeActivityConditionEnum condition;
+    private RafflePrizeActivityConditionEnum activityCondition;
 
     @ApiModelProperty("启用状态")
     private Boolean enable;

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<R
     private String description;
 
     @ApiModelProperty("参加条件")
-    private RafflePrizeActivityConditionEnum condition;
+    private RafflePrizeActivityConditionEnum activityCondition;
 
     private List<CreateRafflePrizeActivityItemDto> itemList;
 

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<Raf
     private String description;
 
     @ApiModelProperty("参加条件")
-    @Valid
-    private RafflePrizeActivityConditionEnum condition;
+    private RafflePrizeActivityConditionEnum activityCondition;
 
+    @Valid
     private List<EditRafflePrizeActivityItemDto> itemList;
 
     @Override

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;

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;

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<RafflePrizeActivity> 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();

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