审核

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<RafflePrizeActivity> {
     private Boolean enable;
 
     private transient List<RafflePrizeActivityItem> itemList;
+
+    private transient List<RafflePrizeActivityItem> insertItemList;
+    private transient List<RafflePrizeActivityItem> updateItemList;
+    private transient List<RafflePrizeActivityItem> deleteItemList;
 }

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<WithdrawAudit> {
     @ApiModelProperty("第三方账号的信息")
     @TableField(typeHandler = JacksonTypeHandler.class)
     private Map<String, String> extDetailsInfo;
+
+    @ApiModelProperty("审批备注")
+    private String auditRemark;
+
+    @ApiModelProperty("汇款备注")
+    private String remitRemark;
 }

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<Raf
     public static class EditRafflePrizeActivityItemDto implements Trans2DomainAssembler<RafflePrizeActivityItem> {
 
         @ApiModelProperty("抽奖活动项标识")
-        @NotNull(message = "抽奖活动项标识不能为空")
         private Long id;
 
         @ApiModelProperty("抽奖奖励配置标识")

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<RafflePrizeConfig> {
 
     @ApiModelProperty("奖品类型")
+    @NotNull
     private PrizeTypeEnum prizeType;
 
     @ApiModelProperty("奖品分类")
+    @NotNull
     private PrizeCategoryEnum prizeCategory;
 
     @ApiModelProperty("奖品名称")

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<Raffl
     private Long id;
 
     @ApiModelProperty("奖品类型")
+    @NotNull
     private PrizeTypeEnum prizeType;
 
     @ApiModelProperty("奖品分类")
+    @NotNull
     private PrizeCategoryEnum prizeCategory;
 
     @ApiModelProperty("奖品名称")

dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/withdrawaudit/user/request/UserAuditWithdrawAuditDto.java

@@ -20,6 +20,9 @@ public class UserAuditWithdrawAuditDto implements Trans2DomainAssembler<Withdraw
     @NotNull(message = "提现状态不能为空")
     private WithdrawAuditStatus status;
 
+    @ApiModelProperty("审批备注")
+    private String auditRemark;
+
     @Override
     public WithdrawAudit trans2Domain() {
         return TypeConvertUtils.convert(this, WithdrawAudit.class);

dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/withdrawaudit/user/request/UserRemitWithdrawAuditDto.java

@@ -22,6 +22,9 @@ public class UserRemitWithdrawAuditDto implements Trans2DomainAssembler<Withdraw
     @ApiModelProperty("汇款凭证")
     private String remitUrl;
 
+    @ApiModelProperty("汇款备注")
+    private String remitRemark;
+
     @Override
     public WithdrawAudit trans2Domain() {
         return TypeConvertUtils.convert(this, WithdrawAudit.class);

dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/withdrawaudit/user/response/UserPageWithdrawAuditVo.java

@@ -72,4 +72,10 @@ public class UserPageWithdrawAuditVo {
     @ApiModelProperty("第三方账号的信息")
     @TableField(typeHandler = JacksonTypeHandler.class)
     private Map<String, String> extDetailsInfo;
+
+    @ApiModelProperty("审批备注")
+    private String auditRemark;
+
+    @ApiModelProperty("汇款备注")
+    private String remitRemark;
 }

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)