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 3ffe099..b80c846 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 @@ -13,6 +13,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.math.BigDecimal; +import java.time.LocalDateTime; import java.util.Map; @Data @@ -53,6 +54,9 @@ public class WithdrawAudit extends Entity { @ApiModelProperty("汇款凭证") private String remitUrl; + @ApiModelProperty("汇款时间") + private LocalDateTime remitDateTime; + @ApiModelProperty("第三方账号的信息") @TableField(typeHandler = JacksonTypeHandler.class) private Map extDetailsInfo; diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/withdrawaudit/user/response/UserPageWithdrawAuditVo.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/withdrawaudit/user/response/UserPageWithdrawAuditVo.java index a6dedcb..2b28243 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/withdrawaudit/user/response/UserPageWithdrawAuditVo.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/withdrawaudit/user/response/UserPageWithdrawAuditVo.java @@ -58,6 +58,10 @@ public class UserPageWithdrawAuditVo { @ApiModelProperty("汇款凭证") private String remitUrl; + @ApiModelProperty("汇款时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime remitDateTime; + @ApiModelProperty("申请时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime applyTime; diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/withdrawaudit/WithdrawAuditApplicationService.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/withdrawaudit/WithdrawAuditApplicationService.java index 65e3394..f2b066c 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/withdrawaudit/WithdrawAuditApplicationService.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/withdrawaudit/WithdrawAuditApplicationService.java @@ -25,6 +25,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.math.BigDecimal; +import java.time.LocalDateTime; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -103,6 +104,7 @@ public class WithdrawAuditApplicationService extends BaseApplicationService { if (!existWithdrawAudit.getRemitStatus()) { if (withdrawAudit.getRemitStatus() && WithdrawAuditStatus.PASS_VERIFICATION.equals(existWithdrawAudit.getStatus())) { //同意汇款 + withdrawAudit.setRemitDateTime(LocalDateTime.now()); BaseDomainEvent event = withdrawAuditAggregate.remit(withdrawAudit); this.sendEvent(event); } else if (!withdrawAudit.getRemitStatus()) { diff --git a/dating-agency-mall-server/src/main/resources/mapper/withdrawaudit/WithdrawAuditViewMapper.xml b/dating-agency-mall-server/src/main/resources/mapper/withdrawaudit/WithdrawAuditViewMapper.xml index 0e15bd9..2b98d08 100644 --- a/dating-agency-mall-server/src/main/resources/mapper/withdrawaudit/WithdrawAuditViewMapper.xml +++ b/dating-agency-mall-server/src/main/resources/mapper/withdrawaudit/WithdrawAuditViewMapper.xml @@ -22,6 +22,7 @@ dwa.`status`, dwa.`remit_status`, dwa.remit_url, + dwa.remit_date_time, dwa.`create_time` as applyTime, dwa.withdraw_type, dwa.ext_details_info