From d0c88e9f82a73e225ec04f3f8b533cf1d97028bc Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 17 八月 2023 11:49:21 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/SuperSaveDriving
---
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderPriceWarpper.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderPriceWarpper.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderPriceWarpper.java
index 554d3e8..7242969 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderPriceWarpper.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderPriceWarpper.java
@@ -34,11 +34,11 @@
@ApiModelProperty("超过长途里程费")
private Double overLongDistancePrice;
@ApiModelProperty("等待时长")
- private Integer waitTime;
+ private Double waitTime;
@ApiModelProperty("等待费")
private Double waitTimePrice;
@ApiModelProperty("超出等待时长")
- private Integer outWaitTime;
+ private Double outWaitTime;
@ApiModelProperty("超出等待费")
private Double outWaitTimePrice;
@ApiModelProperty("恶劣天气里程")
@@ -53,6 +53,8 @@
private Double discount;
@ApiModelProperty("折扣金额")
private Double discountAmount;
+ @ApiModelProperty("优惠券id")
+ private Integer couponId;
@ApiModelProperty("优惠券金额")
private Double discountedPrice;
@ApiModelProperty("当前余额")
--
Gitblit v1.7.1