From 6133859f01c1270a99156d5674d064cd03bf087c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 01 八月 2025 10:58:21 +0800
Subject: [PATCH] 订单导出修改
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/WithdrawDetailVO.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/WithdrawDetailVO.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/WithdrawDetailVO.java
index 7f13eac..1b10ba1 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/WithdrawDetailVO.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/WithdrawDetailVO.java
@@ -1,11 +1,13 @@
package com.ruoyi.order.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.order.entity.WithdrawRecord;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
/**
* @author HJL
@@ -17,7 +19,8 @@
@ApiModelProperty("订单id")
private String orderId;
-
+ @ApiModelProperty("拉起确认收款参数")
+ private String packageInfo;
@ApiModelProperty("订单编号")
private String orderNumber;
@@ -49,7 +52,7 @@
private String time;
@ApiModelProperty("接单时间(师傅接单或后台派单，更新该字段时间)")
- @JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date acceptTime;
@ApiModelProperty("服务人员id")
@@ -68,24 +71,24 @@
private Integer state;
@ApiModelProperty("师傅到达预约地点时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date arriveTime;
@ApiModelProperty("订单完成时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date completeTime;
@ApiModelProperty("订单补贴金额")
private BigDecimal subsidy;
- @ApiModelProperty("是否已提现(0:未提现，1:已提现)")
+ @ApiModelProperty("是否已提现(0:未提现，1:审核中 2审核通过 3:已确认收款)")
private Integer isWithdrawal;
@ApiModelProperty("提现申请状态(0待审核;1已通过;2已驳回)")
private Integer withdrawalState;
@ApiModelProperty("提现申请时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date withdrawalTime;
@ApiModelProperty("详细地址")
@@ -93,5 +96,6 @@
@ApiModelProperty("现场照片(多张照片 ','隔开)")
private String photo;
-
+ @ApiModelProperty("提现进度")
+ private List<WithdrawRecord> withdrawRecords;
}
--
Gitblit v1.7.1