订单退款申请

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<OrderRefundApplication> {
     @ApiModelProperty("财务审核状态")
     private OrderRefundApplicationStatus status;
 
+    @ApiModelProperty("运营审批备注")
+    private String operationRemark;
+
+    @ApiModelProperty("财务审批备注")
+    private String remark;
+
     public static OrderRefundApplication build(Long orderId,
                                                RefundOrderTypeEnum refundOrderType,
                                                BigDecimal refundAmount,

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

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

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;

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