From 0dcaf9f049b67b35481d8e83f3c7e672f2cda513 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 21 八月 2025 01:33:56 +0800
Subject: [PATCH] update
---
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/vo/DriverOrderDataNextVo.java | 6 +++---
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverServiceMapper.xml | 1 +
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverServiceMapper.xml b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverServiceMapper.xml
index f701b96..464e1b3 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverServiceMapper.xml
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverServiceMapper.xml
@@ -79,6 +79,7 @@
</select>
<select id="queryOrderMoneyDataFromDriver" resultType="com.stylefeng.guns.modular.system.model.vo.DriverOrderDataNextVo">
select
+ incomeId as orderId,
orderType as type,
insertTime as orderTime,
money as orderMoney
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/vo/DriverOrderDataNextVo.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/vo/DriverOrderDataNextVo.java
index 72c8ed2..bbda368 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/vo/DriverOrderDataNextVo.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/vo/DriverOrderDataNextVo.java
@@ -25,13 +25,13 @@
private String orderId;
@ApiModelProperty("订单开始地址")
- private String startAddress;
+ private String startAddress="";
@ApiModelProperty("订单结束地址")
- private String endAddress;
+ private String endAddress="";
@ApiModelProperty("订单状态 1=待接单，2=待出发，3=待到达预约地点，4=待乘客上车，5=服务中，6=完成服务，7=待支付，8=待评价，9=已完成，10=已取消，11=改派中，12=取消待支付")
- private Integer state;
+ private Integer state=9;
@ApiModelProperty("订单金额/收入金额")
private Double orderMoney;
--
Gitblit v1.7.1