From f9b9131367d9ba6fe852130b12083c0f5ea68bbb Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期一, 27 五月 2024 17:26:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/MoneyInfoWarpper.java | 163 +----------------------------------------------------
1 files changed, 5 insertions(+), 158 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/MoneyInfoWarpper.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/MoneyInfoWarpper.java
index 0d2618f..f3abe79 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/MoneyInfoWarpper.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/MoneyInfoWarpper.java
@@ -2,12 +2,14 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
import java.util.Map;
/**
* 费用明细
*/
+@Data
@ApiModel("费用明细")
public class MoneyInfoWarpper {
@ApiModelProperty("订单总金额")
@@ -44,164 +46,8 @@
private Double discountMoney;
@ApiModelProperty("折扣")
private Double discount;
-
- public Double getOrderMoney() {
- return orderMoney;
- }
-
- public void setOrderMoney(Double orderMoney) {
- this.orderMoney = orderMoney;
- }
-
- public Double getStartMoney() {
- return startMoney;
- }
-
- public void setStartMoney(Double startMoney) {
- this.startMoney = startMoney;
- }
-
- public Double getMileageMoney() {
- return mileageMoney;
- }
-
- public void setMileageMoney(Double mileageMoney) {
- this.mileageMoney = mileageMoney;
- }
-
- public Double getDurationMoney() {
- return durationMoney;
- }
-
- public void setDurationMoney(Double durationMoney) {
- this.durationMoney = durationMoney;
- }
-
- public Double getWaitMoney() {
- return waitMoney;
- }
-
- public void setWaitMoney(Double waitMoney) {
- this.waitMoney = waitMoney;
- }
-
- public Double getLongDistanceMoney() {
- return longDistanceMoney;
- }
-
- public void setLongDistanceMoney(Double longDistanceMoney) {
- this.longDistanceMoney = longDistanceMoney;
- }
-
- public Double getParkMoney() {
- return parkMoney;
- }
-
- public void setParkMoney(Double parkMoney) {
- this.parkMoney = parkMoney;
- }
-
- public Double getRoadTollMoney() {
- return roadTollMoney;
- }
-
- public void setRoadTollMoney(Double roadTollMoney) {
- this.roadTollMoney = roadTollMoney;
- }
-
- public Double getRedPacketMoney() {
- return redPacketMoney;
- }
-
- public void setRedPacketMoney(Double redPacketMoney) {
- this.redPacketMoney = redPacketMoney;
- }
-
- public Double getCouponMoney() {
- return couponMoney;
- }
-
- public void setCouponMoney(Double couponMoney) {
- this.couponMoney = couponMoney;
- }
-
- public Double getDiscountMoney() {
- return discountMoney;
- }
-
- public void setDiscountMoney(Double discountMoney) {
- this.discountMoney = discountMoney;
- }
-
- public Double getDiscount() {
- return discount;
- }
-
- public void setDiscount(Double discount) {
- this.discount = discount;
- }
-
- public Double getMileage() {
- return mileage;
- }
-
- public void setMileage(Double mileage) {
- this.mileage = mileage;
- }
-
- public Double getDuration() {
- return duration;
- }
-
- public void setDuration(Double duration) {
- this.duration = duration;
- }
-
- public Double getWait() {
- return wait;
- }
-
- public void setWait(Double wait) {
- this.wait = wait;
- }
-
- public Double getLongDistance() {
- return longDistance;
- }
-
- public void setLongDistance(Double longDistance) {
- this.longDistance = longDistance;
- }
-
- public Double getStartMileage() {
- return startMileage;
- }
-
- public void setStartMileage(Double startMileage) {
- this.startMileage = startMileage;
- }
-
- @Override
- public String toString() {
- return "MoneyInfoWarpper{" +
- "orderMoney=" + orderMoney +
- ", startMoney=" + startMoney +
- ", mileageMoney=" + mileageMoney +
- ", mileage=" + mileage +
- ", durationMoney=" + durationMoney +
- ", duration=" + duration +
- ", waitMoney=" + waitMoney +
- ", wait=" + wait +
- ", longDistanceMoney=" + longDistanceMoney +
- ", longDistance=" + longDistance +
- ", parkMoney=" + parkMoney +
- ", roadTollMoney=" + roadTollMoney +
- ", redPacketMoney=" + redPacketMoney +
- ", couponMoney=" + couponMoney +
- ", discountMoney=" + discountMoney +
- ", discount=" + discount +
- '}';
- }
+ @ApiModelProperty("补差价")
+ private Double priceDifference;
public static MoneyInfoWarpper getMoneyInfoWarpper(Map<String, Object> map){
MoneyInfoWarpper moneyInfoWarpper = new MoneyInfoWarpper();
@@ -223,6 +69,7 @@
moneyInfoWarpper.setCouponMoney(null != map.get("couponMoney") ? Double.valueOf(map.get("couponMoney").toString()) : 0D);
moneyInfoWarpper.setDiscountMoney(null != map.get("discountMoney") ? Double.valueOf(map.get("discountMoney").toString()) : 0D);
moneyInfoWarpper.setDiscount(null != map.get("discount") ? Double.valueOf(map.get("discount").toString()) : 0D);
+ moneyInfoWarpper.setPriceDifference(null != map.get("priceDifference") ? Double.valueOf(map.get("priceDifference").toString()) : 0D);
}
return moneyInfoWarpper;
}
--
Gitblit v1.7.1