From 709a4a10be56952ead6340e4822fce41a66e47cd Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 26 七月 2023 18:39:28 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/SuperSaveDriving into dev
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/OrderPriceWarpper.java | 46 +++++++++++++++-------------------------------
1 files changed, 15 insertions(+), 31 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/OrderPriceWarpper.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/OrderPriceWarpper.java
index fd05f84..00c9f6f 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/OrderPriceWarpper.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/OrderPriceWarpper.java
@@ -12,48 +12,32 @@
@Data
@ApiModel
public class OrderPriceWarpper {
- @ApiModelProperty("订单金额")
- private Double orderMoney;
+ @ApiModelProperty("订单开始时间")
+ private Long startTime;
+ @ApiModelProperty("订单结束时间")
+ private Long endTime;
@ApiModelProperty("总行驶里程")
private Double actualMileage;
- @ApiModelProperty("总行驶时间")
- private Integer travelTime;
- @ApiModelProperty("起步里程")
- private Double startDistance;
@ApiModelProperty("起步价")
private Double startPrice;
- @ApiModelProperty("超过起步里程")
+ @ApiModelProperty("起步里程")
+ private Double startDistance;
+ @ApiModelProperty("超出起步里程")
private Double overDriveDistance;
- @ApiModelProperty("超过起步里程费")
- private Double overDrivePrice;
- @ApiModelProperty("长途里程")
- private Double longDistance;
- @ApiModelProperty("长途费")
- private Double longDistancePrice;
- @ApiModelProperty("超过长途里程")
- private Double overLongDistance;
- @ApiModelProperty("超过长途里程费")
- private Double overLongDistancePrice;
+ @ApiModelProperty("里程费")
+ private Double mileageFee;
@ApiModelProperty("等待时长")
- private Integer waitTime;
+ private String waitTime;
@ApiModelProperty("等待费")
private Double waitTimePrice;
- @ApiModelProperty("超出等待时长")
- private Integer outWaitTime;
- @ApiModelProperty("超出等待费")
- private Double outWaitTimePrice;
- @ApiModelProperty("恶劣天气里程")
- private Double badWeatherDistance;
- @ApiModelProperty("恶劣天气费")
- private Double badWeatherPrice;
- @ApiModelProperty("恶劣天气超出里程")
- private Double overBadWeatherDistance;
- @ApiModelProperty("恶劣天气超出里程费")
- private Double overBadWeatherPrice;
@ApiModelProperty("折扣金额")
private Double discountAmount;
- @ApiModelProperty("优惠金额")
+ @ApiModelProperty("优惠券金额")
private Double discountedPrice;
+ @ApiModelProperty("恶劣天气费")
+ private Double badWeatherPrice;
+ @ApiModelProperty("支付金额")
+ private Double payMoney;
@ApiModelProperty("微信收款码")
private String wxCollectionCode;
@ApiModelProperty("支付宝收款码")
--
Gitblit v1.7.1