From 2a498d9f65f873cedb74ab5bcb48ad4b845d0622 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 30 八月 2023 10:01:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderPriceInfoWarpper.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderPriceInfoWarpper.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderPriceInfoWarpper.java
index 065520b..96722db 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderPriceInfoWarpper.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderPriceInfoWarpper.java
@@ -31,10 +31,16 @@
private Double waitTimePrice;
@ApiModelProperty("折扣金额")
private Double discountAmount;
+ @ApiModelProperty("优惠券id")
+ private Integer couponId;
@ApiModelProperty("优惠券金额")
private Double discountedPrice;
@ApiModelProperty("恶劣天气费")
private Double badWeatherPrice;
+ @ApiModelProperty("节假日费")
+ private Double holidayPrice;
+ @ApiModelProperty("订单金额")
+ private Double orderMoney;
@ApiModelProperty("支付金额")
private Double payMoney;
}
--
Gitblit v1.7.1