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 94ca53d..3afcff2 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 @@ -39,4 +39,8 @@ public class RafflePrizeActivity extends Entity { private Boolean enable; private transient List itemList; + + private transient List insertItemList; + private transient List updateItemList; + private transient List deleteItemList; } diff --git a/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/withdrawaudit/entity/WithdrawAudit.java b/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/withdrawaudit/entity/WithdrawAudit.java index b80c846..273a91a 100644 --- a/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/withdrawaudit/entity/WithdrawAudit.java +++ b/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/withdrawaudit/entity/WithdrawAudit.java @@ -60,4 +60,10 @@ public class WithdrawAudit extends Entity { @ApiModelProperty("第三方账号的信息") @TableField(typeHandler = JacksonTypeHandler.class) private Map extDetailsInfo; + + @ApiModelProperty("审批备注") + private String auditRemark; + + @ApiModelProperty("汇款备注") + private String remitRemark; } 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 475ab9d..b51ead6 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 @@ -60,7 +60,6 @@ public class UserEditRafflePrizeActivityDto implements Trans2DomainAssembler { @ApiModelProperty("抽奖活动项标识") - @NotNull(message = "抽奖活动项标识不能为空") private Long id; @ApiModelProperty("抽奖奖励配置标识") diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/rpc/user/request/UserCreateRafflePrizeConfigDto.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/rpc/user/request/UserCreateRafflePrizeConfigDto.java index c8d138b..61c5213 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/rpc/user/request/UserCreateRafflePrizeConfigDto.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/rpc/user/request/UserCreateRafflePrizeConfigDto.java @@ -9,13 +9,17 @@ import com.qniao.framework.utils.TypeConvertUtils; import java.math.BigDecimal; import lombok.Data; +import javax.validation.constraints.NotNull; + @Data public class UserCreateRafflePrizeConfigDto implements Trans2DomainAssembler { @ApiModelProperty("奖品类型") + @NotNull private PrizeTypeEnum prizeType; @ApiModelProperty("奖品分类") + @NotNull private PrizeCategoryEnum prizeCategory; @ApiModelProperty("奖品名称") diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/rpc/user/request/UserEditRafflePrizeConfigDto.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/rpc/user/request/UserEditRafflePrizeConfigDto.java index b1a86dd..72593a8 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/rpc/user/request/UserEditRafflePrizeConfigDto.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/rpc/user/request/UserEditRafflePrizeConfigDto.java @@ -22,9 +22,11 @@ public class UserEditRafflePrizeConfigDto implements Trans2DomainAssembler extDetailsInfo; + + @ApiModelProperty("审批备注") + private String auditRemark; + + @ApiModelProperty("汇款备注") + private String remitRemark; } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/rpa/RafflePrizeActivityApplicationService.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/rpa/RafflePrizeActivityApplicationService.java index a0b2259..ebe0d2f 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/rpa/RafflePrizeActivityApplicationService.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/rpa/RafflePrizeActivityApplicationService.java @@ -25,6 +25,7 @@ public class RafflePrizeActivityApplicationService { public void create(RafflePrizeActivity rafflePrizeActivity) { rafflePrizeActivity.setEnable(false); + rafflePrizeActivity.setInsertItemList(rafflePrizeActivity.getItemList()); rafflePrizeActivityAggregate.create(rafflePrizeActivity); } @@ -44,7 +45,7 @@ public class RafflePrizeActivityApplicationService { } } - public RafflePrizeActivityItem draw(Long id) { + public RafflePrizeActivityItem draw(Long id) { RafflePrizeActivity rafflePrizeActivity = rafflePrizeActivityRepository.load(id); int num = rafflePrizeActivity.getItemList().stream() .map(RafflePrizeActivityItem::getWinningRate).reduce(BigDecimal.ZERO, BigDecimal::add)