From 76ee99383a78e21f6309bb7a6842ca181bc2aa85 Mon Sep 17 00:00:00 2001 From: Derran Date: Thu, 15 May 2025 15:41:05 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=80=80=E6=AC=BE=E7=94=B3?= =?UTF-8?q?=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/aggregate/ora/entity/OrderRefundApplication.java | 6 ++++++ .../UserAuditOrderRefundApplicationByOperationDto.java | 3 +++ .../user/request/UserAuditOrderRefundApplicationDto.java | 3 +++ .../UserPageMarriageBountyOrderRefundApplicationVo.java | 6 ++++++ .../resources/mapper/ora/OrderRefundApplicationMapper.xml | 2 ++ 5 files changed, 20 insertions(+) diff --git a/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/ora/entity/OrderRefundApplication.java b/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/ora/entity/OrderRefundApplication.java index 5078d3e..bf60b7f 100644 --- a/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/ora/entity/OrderRefundApplication.java +++ b/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/ora/entity/OrderRefundApplication.java @@ -40,6 +40,12 @@ public class OrderRefundApplication extends Entity { @ApiModelProperty("财务审核状态") private OrderRefundApplicationStatus status; + @ApiModelProperty("运营审批备注") + private String operationRemark; + + @ApiModelProperty("财务审批备注") + private String remark; + public static OrderRefundApplication build(Long orderId, RefundOrderTypeEnum refundOrderType, BigDecimal refundAmount, diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/ora/user/request/UserAuditOrderRefundApplicationByOperationDto.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/ora/user/request/UserAuditOrderRefundApplicationByOperationDto.java index b7c9a7a..6c3a827 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/ora/user/request/UserAuditOrderRefundApplicationByOperationDto.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/ora/user/request/UserAuditOrderRefundApplicationByOperationDto.java @@ -21,6 +21,9 @@ public class UserAuditOrderRefundApplicationByOperationDto implements Trans2Doma @NotNull(message = "运营审核状态不能为空") private OrderRefundApplicationStatus operationStatus; + @ApiModelProperty("运营审批备注") + private String operationRemark; + @Override public OrderRefundApplication trans2Domain() { return TypeConvertUtils.convert(this, OrderRefundApplication.class); diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/ora/user/request/UserAuditOrderRefundApplicationDto.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/ora/user/request/UserAuditOrderRefundApplicationDto.java index 974304a..ca05e47 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/ora/user/request/UserAuditOrderRefundApplicationDto.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/ora/user/request/UserAuditOrderRefundApplicationDto.java @@ -19,6 +19,9 @@ public class UserAuditOrderRefundApplicationDto implements Trans2DomainAssembler @ApiModelProperty("审核状态") private OrderRefundApplicationStatus status; + @ApiModelProperty("财务审批备注") + private String remark; + @Override public OrderRefundApplication trans2Domain() { return TypeConvertUtils.convert(this, OrderRefundApplication.class); diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/ora/user/response/UserPageMarriageBountyOrderRefundApplicationVo.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/ora/user/response/UserPageMarriageBountyOrderRefundApplicationVo.java index f49999c..91c9b95 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/ora/user/response/UserPageMarriageBountyOrderRefundApplicationVo.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/ora/user/response/UserPageMarriageBountyOrderRefundApplicationVo.java @@ -43,6 +43,12 @@ public class UserPageMarriageBountyOrderRefundApplicationVo { @ApiModelProperty("财务审核状态") private OrderRefundApplicationStatus status; + @ApiModelProperty("运营审批备注") + private String operationRemark; + + @ApiModelProperty("财务审批备注") + private String remark; + @ApiModelProperty("申请时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime applyTime; diff --git a/dating-agency-mall-server/src/main/resources/mapper/ora/OrderRefundApplicationMapper.xml b/dating-agency-mall-server/src/main/resources/mapper/ora/OrderRefundApplicationMapper.xml index 4daa555..b36c4ad 100644 --- a/dating-agency-mall-server/src/main/resources/mapper/ora/OrderRefundApplicationMapper.xml +++ b/dating-agency-mall-server/src/main/resources/mapper/ora/OrderRefundApplicationMapper.xml @@ -14,6 +14,8 @@ dora.order_amount, dora.`operation_status`, dora.`status`, + dora.operation_remark, + dora.remark, dora.create_time as applyTime from da_order_refund_application as dora LEFT JOIN da_marriage_bounty_order as dmbo on dmbo.id=dora.order_id