From c6d53fb96a2e7ac88108155b604ddcef83f2fb37 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 30 八月 2025 10:49:09 +0800
Subject: [PATCH] 加盟商新增时撤回密码默认修改
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/WithdrawDetailVO.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/WithdrawDetailVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/WithdrawDetailVO.java
index e11ca9e..db26031 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/WithdrawDetailVO.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/WithdrawDetailVO.java
@@ -6,6 +6,7 @@
import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
/**
* @author HJL
@@ -20,6 +21,8 @@
@ApiModelProperty("订单编号")
private String orderNumber;
+ @ApiModelProperty("拉起确认收款参数")
+ private String packageInfo;
@ApiModelProperty("下单用户id")
private Integer userId;
@@ -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,7 @@
@ApiModelProperty("现场照片(多张照片 ','隔开)")
private String photo;
+ @ApiModelProperty("提现进度")
+ private List<WithdrawRecord> withdrawRecords;
}
--
Gitblit v1.7.1