From ca3975b732ee0a5fc4d0ce41c1111d1b730b2e78 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 27 四月 2026 17:34:29 +0800
Subject: [PATCH] update
---
UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java b/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java
index 859ffe6..b925c9c 100644
--- a/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java
+++ b/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.annotations.TableField;
+import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -206,6 +207,17 @@
@TableField("estimateAmount")
private Double estimateAmount;
+ @ApiModelProperty("取消类型1可以取消 2不可取消")
+ private Integer cancelType;
+
+
+ public Integer getCancelType() {
+ return cancelType;
+ }
+
+ public void setCancelType(Integer cancelType) {
+ this.cancelType = cancelType;
+ }
public Double getEstimateAmount() {
return estimateAmount;
@@ -417,6 +429,7 @@
@ApiModelProperty("计费规则")
private String chargeRules;
+
public String getChargeRules() {
return chargeRules;
@@ -1127,6 +1140,7 @@
orderInfoWarpper.setPaymentMode(null != map.get("paymentMode") ? Integer.valueOf(map.get("paymentMode").toString()) : null);
orderInfoWarpper.setPaymentMode(null != map.get("paymentMode") ? Integer.valueOf(map.get("paymentMode").toString()) : null);
orderInfoWarpper.setOrderAdditionalFeeWarpper(list);
+ orderInfoWarpper.setCancelType(null != map.get("cancelType") ? Integer.valueOf(map.get("cancelType").toString()) : 1);
}
return orderInfoWarpper;
}
--
Gitblit v1.7.1