From 78d7911139088c285abbddcb4746f3ea10a94f23 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 04 九月 2024 10:45:05 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 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 cd8aa59..c43fb06 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")
@@ -109,7 +122,7 @@
@ApiModelProperty(value = "充值支付第三方流水号")
@TableField("recharge_serial_number")
private String rechargeSerialNumber;
-
+
@ApiModelProperty(value = "剩余金额（用于前端展示）")
@TableField("residual_amount")
private BigDecimal residualAmount;
@@ -146,6 +159,14 @@
@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")
private Integer refundStatus;
@@ -164,12 +185,5 @@
@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