From c399be7463c16b3787b3e591d3006628a11ab858 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 28 四月 2025 17:46:45 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/XianNingChuXing
---
UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/warpper/OrderTaxiWarpper.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/warpper/OrderTaxiWarpper.java b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/warpper/OrderTaxiWarpper.java
index f98bacf..f74e819 100644
--- a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/warpper/OrderTaxiWarpper.java
+++ b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/warpper/OrderTaxiWarpper.java
@@ -46,6 +46,26 @@
@ApiModelProperty(dataType = "int", required = true, value = "是否是老年人(0=否，1=是)")
private Integer oldPeople;
+ @ApiModelProperty(dataType = "int", required = true, value = "支付方式 1=线上计费 2=打表计费")
+ private Integer payManner;
+ @ApiModelProperty(dataType = "int", required = true, value = "区域code")
+ private String areaCode;
+
+ public String getAreaCode() {
+ return areaCode;
+ }
+
+ public void setAreaCode(String areaCode) {
+ this.areaCode = areaCode;
+ }
+
+ public Integer getPayManner() {
+ return payManner;
+ }
+
+ public void setPayManner(Integer payManner) {
+ this.payManner = payManner;
+ }
public Integer getOldPeople() {
return oldPeople;
@@ -233,6 +253,7 @@
orderTaxi.setStartAddress(orderTaxiWarpper.getStartAddress());
orderTaxi.setEndAddress(orderTaxiWarpper.getEndAddress());
orderTaxi.setOldPeople(orderTaxiWarpper.getOldPeople());
+ orderTaxi.setPayManner(orderTaxiWarpper.getPayManner());
return orderTaxi;
}
}
--
Gitblit v1.7.1