From a661e711cebd9f0b684dc73ab732b239812f076f Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期日, 28 四月 2024 09:23:08 +0800
Subject: [PATCH] 新增加功能
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderWarpper.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderWarpper.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderWarpper.java
index 5f5c55b..959eaa9 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderWarpper.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderWarpper.java
@@ -50,6 +50,12 @@
@ApiModelProperty("订单类型（1=专车，2=出租车，3=跨城出行，4=同城小件物流，5=跨城小件物流）")
private Integer orderType;
private Long insertTime;
+ @ApiModelProperty("收据链接")
+ private String receipt;
+ @ApiModelProperty("是否冻结（1=否，2=是）")
+ private Integer isFrozen;
+ @ApiModelProperty("中途取消（0=否，1=是）")
+ private Integer cancelMidway;
public Integer getOrderId() {
return orderId;
@@ -195,6 +201,14 @@
this.differenceMoney = differenceMoney;
}
+ public String getReceipt() {
+ return receipt;
+ }
+
+ public void setReceipt(String receipt) {
+ this.receipt = receipt;
+ }
+
@Override
public String toString() {
return "OrderWarpper{" +
@@ -240,13 +254,31 @@
orderWarpper.setCarTime(null != map.get("carTime") ? Integer.valueOf(String.valueOf(map.get("carTime"))) : 0);
orderWarpper.setServerCarModel(null != map.get("serverCarModel") ? String.valueOf(map.get("serverCarModel")) : "");
orderWarpper.setDifferenceMoney(null != map.get("differenceMoney") ? Double.valueOf(map.get("differenceMoney").toString()) : 0D);
+ orderWarpper.setReceipt(null != map.get("receipt") ? String.valueOf(map.get("receipt")) : "");
+ orderWarpper.setIsFrozen(null != map.get("isFrozen") ? Integer.valueOf(String.valueOf(map.get("isFrozen"))) : 1);
list.add(orderWarpper);
}
}
Collections.sort(list);
return list;
}
-
+
+ public Integer getIsFrozen() {
+ return isFrozen;
+ }
+
+ public void setIsFrozen(Integer isFrozen) {
+ this.isFrozen = isFrozen;
+ }
+
+ public Integer getCancelMidway() {
+ return cancelMidway;
+ }
+
+ public void setCancelMidway(Integer cancelMidway) {
+ this.cancelMidway = cancelMidway;
+ }
+
@Override
public int compareTo(Object o) {
if (o instanceof OrderWarpper) {
--
Gitblit v1.7.1