This commit is contained in:
andy 2025-07-24 15:43:20 +08:00
parent d08bb52783
commit c87d090a71

View File

@ -22,78 +22,90 @@ public class OrderDetailVo {
@Schema(description = "订单编号")
private String orderNo;
@Schema(name = "订单类型", description = "1=换电;2=充电")
@Schema(title = "订单类型", description = "1=换电;2=充电")
private Integer orderType;
@Schema(name = "车牌号")
@Schema(title = "车牌号")
private String plateNum;
@Schema(name = "订单状态", description = "订单状态1-已创建2-换电中3-换电完成4-充电中5-充电完成6-待结算7-已完成9-已取消, -1-退款")
@Schema(title = "订单状态", description = "订单状态1-已创建2-换电中3-换电完成4-充电中5-充电完成6-待结算7-已完成9-已取消, -1-退款")
private Integer status;
@Schema(name = "订单时间")
@Schema(title = "订单时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date orderTime;
@Schema(name = "换电站")
@Schema(title = "换电站")
private String stationName;
@Schema(name = "预约人")
@Schema(title = "预约人")
private String perName;
@Schema(name = "交易编码", description = "第三方收款返回的唯一标识")
@Schema(title = "交易编码", description = "第三方收款返回的唯一标识")
private String notifyOrderNo;
@Schema(name = "订单总金额")
@Schema(title = "订单总金额")
private Integer amount;
@Schema(name = "计费类型", description="1-ODO, 2-SOC, 3-电量")
@Schema(title = "计费类型", description="1-ODO, 2-SOC, 3-电量")
private Integer feeType;
@Schema(name = "订单金额")
@Schema(title = "订单金额")
private Integer orderFee;
@Schema(name = "服务金额")
@Schema(title = "服务金额")
private Integer serviceFee;
@Schema(name = "服务开始时间")
@Schema(title = "服务开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date serviceTimeBegin;
@Schema(name = "服务结束时间")
@Schema(title = "服务结束时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date serviceTimeEnd;
@Schema(name = "订单开始时间")
@Schema(title = "订单开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date orderTimeBegin;
@Schema(name = "订单结束时间")
@Schema(title = "订单结束时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date orderTimeEnd;
@Schema(name = "耗电量", description = "耗电量; 如果是soc结算 则是soc的差值, ODO则是里程")
@Schema(title = "耗电量", description = "耗电量; 如果是soc结算 则是soc的差值, ODO则是里程")
private Double electricityQuantity;
@Schema(name = "开始充电的电量", description = "feeType=3时, 不为空")
@Schema(title = "开始充电的电量", description = "feeType=3时, 不为空")
private Double electStart;
@Schema(name = "结束充电的电量", description = "feeType=3时, 不为空")
@Schema(title = "结束充电的电量", description = "feeType=3时, 不为空")
private Double electEnd;
@Schema(name = "租借电池包SOC", description = "feeType=2时, 不为空")
@Schema(title = "租借电池包仓位", description = "feeType=2时, 不为空")
private String rentBatNo;
@Schema(title = "租借电池包编码", description = "feeType=2时, 不为空")
private String rentBatCode;
@Schema(title = "租借电池包SOC", description = "feeType=2时, 不为空")
private Double rentBatSoc;
@Schema(name = "归还电池包SOC", description = "feeType=2时, 不为空")
@Schema(title = "归还电池包仓位", description = "feeType=2时, 不为空")
private String returnBatNo;
@Schema(title = "归还电池包编码", description = "feeType=2时, 不为空")
private String returnBatCode;
@Schema(title = "归还电池包SOC", description = "feeType=2时, 不为空")
private Double returnBatSoc;
@Schema(name = "换电模式", description="1-全自动; 2-半自动; 3-人工干预")
@Schema(title = "换电模式", description="1-全自动; 2-半自动; 3-人工干预")
private Integer changeMode;
@Schema(name = "换电车道", description="1-换电车道A; 2-换电车道B")
@Schema(title = "换电车道", description="1-换电车道A; 2-换电车道B")
private Integer changeLane;
}