From 26079aa3c34f47e952a9538a93d6f8a3bab9a0fc Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 23 八月 2024 09:12:44 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/MoneyInfoWarpper.java | 3 +++
1 files changed, 3 insertions(+), 0 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 f3abe79..4997c2c 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
@@ -48,6 +48,8 @@
private Double discount;
@ApiModelProperty("补差价")
private Double priceDifference;
+ @ApiModelProperty("争议订单（0=否，1=是）")
+ private Integer isDispute;
public static MoneyInfoWarpper getMoneyInfoWarpper(Map<String, Object> map){
MoneyInfoWarpper moneyInfoWarpper = new MoneyInfoWarpper();
@@ -70,6 +72,7 @@
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);
+ moneyInfoWarpper.setIsDispute(null != map.get("isDispute") ? Integer.valueOf(map.get("isDispute").toString()) : 0);
}
return moneyInfoWarpper;
}
--
Gitblit v1.7.1