This commit is contained in:
2024-01-06 15:13:50 +08:00
parent caf9eb21bf
commit d685d12723
35 changed files with 2352 additions and 784 deletions

View File

@@ -149,6 +149,12 @@ public class OrderBasicInfo extends BaseEntity {
@Excel(name = "虚拟金额")
private BigDecimal virtualAmount;
/**
* 折扣金额
*/
@Excel(name = "折扣金额")
private BigDecimal discountAmount;
/**
* 结算金额
*/
@@ -178,12 +184,12 @@ public class OrderBasicInfo extends BaseEntity {
/**
* 开始SOC
*/
private String startSOC;
private String startSoc;
/**
* 结束SOC
*/
private String endSOC;
private String endSoc;
/**
* 异常原因
@@ -200,6 +206,11 @@ public class OrderBasicInfo extends BaseEntity {
*/
private BigDecimal refundAmount;
/**
* 退款状态0-不需要退款1-退款中2-退款完成)
*/
private String refundStatus;
/**
* 删除标识0-正常1-删除)
*/
@@ -225,8 +236,8 @@ public class OrderBasicInfo extends BaseEntity {
.append("orderAmount", orderAmount)
.append("chargeStartTime", chargeStartTime)
.append("chargeEndTime", chargeEndTime)
.append("startSOC", startSOC)
.append("endSOC", endSOC)
.append("startSOC", startSoc)
.append("endSOC", endSoc)
.append("reason", reason)
.append("delFlag", delFlag)
.append("orderDetailList", orderDetailList)