From f6fd3607f046744e86f391956d91d0f009bb3adb Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 18 八月 2025 22:50:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
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