From c4664502dfdaffff555b532e65b51a57ac8b29c2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 16 十月 2024 17:51:32 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ChargingOrderListInfoVO.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ChargingOrderListInfoVO.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ChargingOrderListInfoVO.java
index 1611e8c..e7663b5 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ChargingOrderListInfoVO.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ChargingOrderListInfoVO.java
@@ -2,6 +2,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.integration.api.model.UploadRealTimeMonitoringData;
+import com.ruoyi.order.api.model.TChargingOrderAccountingStrategy;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -25,6 +26,8 @@
private String terminalName;
@ApiModelProperty(value = "结束原因 （0=异常终止，1=主动终止，2=满电终止，3=费用不足终止）")
private Integer endMode;
+ @ApiModelProperty(value = "状态（-1=启动失败，取消订单，0=未知，1=等待中，2=启动中，3=充电中，4=停止中，5=已结束）")
+ private Integer status;
@ApiModelProperty(value = "开始soc")
private String startSoc;
@ApiModelProperty(value = "结束soc")
@@ -44,7 +47,7 @@
@ApiModelProperty(value = "订单类型（1=充电订单（小程序），2=充电订单（刷卡））")
private String orderType;
@ApiModelProperty(value = "充电时间 秒")
- private Long chargingSecond;
+ private String chargingSecond;
@ApiModelProperty(value = "车牌号")
private String licensePlate;
@ApiModelProperty(value = "客户手机号")
@@ -55,6 +58,11 @@
private BigDecimal electrovalence;
@ApiModelProperty(value = "累计服务费")
private BigDecimal serviceCharge;
+ @ApiModelProperty(value = "充电费用（电费加服务费）")
+ private BigDecimal total;
+ @ApiModelProperty(value = "实收（电费加服务费）-优惠券抵扣 -会员抵扣 - 第三方平台分佣 -平台手续费")
+ private BigDecimal realTotal;
+
@ApiModelProperty(value = "开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime startTime;
@@ -65,6 +73,16 @@
private Long id;
@ApiModelProperty(value = "订单uid")
private String uid;
+ @ApiModelProperty(value = "费用明细-优惠券优惠金额")
+ private BigDecimal couponDiscountAmount;
+ @ApiModelProperty(value = "费用明细-会员优惠金额")
+ private BigDecimal vipDiscountAmount;
+ @ApiModelProperty(value = "费用明细-平台分佣")
+ private BigDecimal sharingAmount;
+ @ApiModelProperty(value = "费用明细-手续费")
+ private BigDecimal commissionAmount;
@ApiModelProperty(value = "充电信息")
List<UploadRealTimeMonitoringData> list;
+ @ApiModelProperty(value = "费用明细-费用列表")
+ List<TChargingOrderAccountingStrategy> list1;
}
--
Gitblit v1.7.1