From 131e80f1f170ff43f1530fb22b7cc07ae81c22c4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 20 七月 2023 16:27:29 +0800
Subject: [PATCH] 新增字段
---
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderInfoWarpper.java | 2 ++
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/mapping/OrderMapper.xml | 1 +
2 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/mapping/OrderMapper.xml b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/mapping/OrderMapper.xml
index be52de2..cf0adf3 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/mapping/OrderMapper.xml
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/mapping/OrderMapper.xml
@@ -83,6 +83,7 @@
ifnull(DATE_FORMAT(now(), '%Y') - DATE_FORMAT(b.firstCertificateTime, '%Y'), 0) as driverAge,
(select count(1) from t_order where driverId = b.id and `status` = 1 and state in (107, 108, 109)) as driverNumber,
b.score as driverScore,
+ a.payType,
a.state,
UNIX_TIMESTAMP(a.createTime) * 1000 as createTime,
c.score as evaluationScore,
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderInfoWarpper.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderInfoWarpper.java
index df3d0c7..5615c33 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderInfoWarpper.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderInfoWarpper.java
@@ -45,6 +45,8 @@
private String driverLon;
@ApiModelProperty("司机位置纬度")
private String driverLat;
+ @ApiModelProperty("支付类型（1=微信支付，2=余额支付,3=线下支付,4=微信+余额）")
+ private Integer payType;
@ApiModelProperty("订单状态（101=待接单，102=已接单，103=前往预约点，104=到达预约点，105=开始服务，106=到达目的地，107=待支付，108=待评价，109=已完成，201=转单中，301=已取消，401=等待中）")
private Integer state;
@ApiModelProperty("客服电话")
--
Gitblit v1.7.1