From 2e43d137c7832e149f3df4145aa7fcca2153ef9c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期六, 31 八月 2024 16:52:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java | 42 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
index 286e4e4..2dacfee 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
@@ -39,6 +39,19 @@
@ApiModelProperty(value = "订单类型（1=充电订单（小程序），2=充电订单（刷卡））")
@TableField("order_type")
private Integer orderType;
+ @ApiModelProperty(value = "0平台1其他")
+ @TableField("order_source")
+ private Integer orderSource;
+
+ @ApiModelProperty(value = "平台或其他第三分名字")
+ @TableField("source_name")
+ private String sourceName;
+ @ApiModelProperty(value = "手续费")
+ @TableField("commission_amount")
+ private BigDecimal commissionAmount;
+ @ApiModelProperty(value = "分佣")
+ @TableField("sharing_amount")
+ private BigDecimal sharingAmount;
@ApiModelProperty(value = "订单分类（1=线上，2=线下）")
@TableField("order_classification")
@@ -86,7 +99,7 @@
@TableField("end_time")
private LocalDateTime endTime;
- @ApiModelProperty(value = "状态（0=未知，1=等待中，2=启动中，3=充电中，4=停止中，5=已结束）")
+ @ApiModelProperty(value = "状态（0=未知，1=等待中/已插枪，2=启动中，3=充电中，4=停止中，5=已结束）")
@TableField("status")
private Integer status;
@@ -110,7 +123,7 @@
@TableField("recharge_serial_number")
private String rechargeSerialNumber;
- @ApiModelProperty(value = "订单金额")
+ @ApiModelProperty(value = "订单金额(总金额)")
@TableField("order_amount")
private BigDecimal orderAmount;
@@ -118,7 +131,7 @@
@TableField("app_coupon_id")
private Long appCouponId;
- @ApiModelProperty(value = "优惠金额")
+ @ApiModelProperty(value = "优惠券抵扣金额")
@TableField("coupon_discount_amount")
private BigDecimal couponDiscountAmount;
@@ -130,7 +143,7 @@
@TableField("vip_discount_amount")
private BigDecimal vipDiscountAmount;
- @ApiModelProperty(value = "支付金额")
+ @ApiModelProperty(value = "支付金额（实付）")
@TableField("payment_amount")
private BigDecimal paymentAmount;
@@ -141,6 +154,14 @@
@ApiModelProperty(value = "退款金额")
@TableField("refund_amount")
private BigDecimal refundAmount;
+
+ @ApiModelProperty(value = "累计服务费")
+ @TableField("service_charge")
+ private BigDecimal serviceCharge;
+
+ @ApiModelProperty(value = "累计电费")
+ @TableField("electrovalence")
+ private BigDecimal electrovalence;
@ApiModelProperty(value = "退款状态（1=退款中，2=退款成功）")
@TableField("refund_status")
@@ -155,4 +176,17 @@
@TableField("refund_time")
private LocalDateTime refundTime;
+
+ @ApiModelProperty(value = "支付时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("pay_time")
+ private LocalDateTime payTime;
+
+ @ApiModelProperty(value = "累计服务费")
+ @TableField("service_charge")
+ private BigDecimal serviceCharge;
+
+ @ApiModelProperty(value = "累计电费")
+ @TableField("electrovalence")
+ private BigDecimal electrovalence;
}
--
Gitblit v1.7.1