From d6c57356e79d18d966389e5d76db2916abf44e54 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 19 八月 2025 19:41:27 +0800
Subject: [PATCH] refactor(shunfeng):重构用户信息获取和投诉处理逻辑
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/dao/mapping/AppOrderRideMapper.xml | 8 ++++----
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/controller/AppComplaintsController.java | 2 +-
ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/shunfeng/appDriverRide/appDriverRide_update.html | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/controller/AppComplaintsController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/controller/AppComplaintsController.java
index 29b8853..32d5fad 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/controller/AppComplaintsController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/controller/AppComplaintsController.java
@@ -98,7 +98,7 @@
if(SinataUtil.isNotEmpty(endTime)){
appComplaintsEntityWrapper.le("addTime",endTime +" 23:59:59");
}
- appComplaintsEntityWrapper.eq("type",1);
+// appComplaintsEntityWrapper.eq("type",1);
Page<AppComplaints> page = new PageFactory<AppComplaints>().defaultPage();
appComplaintsEntityWrapper.orderBy("addTime",false);//
page.setRecords(appComplaintsService.selectMapsPage(page, appComplaintsEntityWrapper).getRecords());
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/dao/mapping/AppOrderRideMapper.xml b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/dao/mapping/AppOrderRideMapper.xml
index 50b5e26..48133d3 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/dao/mapping/AppOrderRideMapper.xml
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/dao/mapping/AppOrderRideMapper.xml
@@ -41,14 +41,14 @@
</sql>
<!--获取顺风车订单列表-->
<select id="getAppOrderRide" resultType="map">
- select r.id,u.realName as nameU,u.identity as identityU,u.phone as phoneU,r.startName as startNameU,r.endName as endNameU,r.num as numU,r.addTime as addTimeU,r.startTime as startTimeU,
- u1.id as driverUserId,u1.phone as phoneD,u1.realName as nameD,u1.identity as identityD,t.startName as startNameD,t.endName as endNameD,t.startTime as startTimeD,
+ select r.id,u.name as nameU,u.idCard as identityU,u.phone as phoneU,r.startName as startNameU,r.endName as endNameU,r.num as numU,r.addTime as addTimeU,r.startTime as startTimeU,
+ u1.id as driverUserId,u1.phone as phoneD,u1.name as nameD,u1.idCard as identityD,t.startName as startNameD,t.endName as endNameD,t.startTime as startTimeD,
t.num as numD,r.state as stateU,t.state as stateD,r.isEvaluate,r.payTime,r.payType,r.money
from app_order_ride r
left join app_order_travel t on r.travelId=t.id
- left join app_user_info u on r.userId=u.id
+ left join t_user u on r.userId=u.id
left join app_driver_ride i on i.id=t.driverId
- left join app_user_info u1 on u1.driverId=t.driverId
+ left join t_user u1 on u1.driverId=t.driverId
<where>
<if test="id!=null">
and r.id = #{id}
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/shunfeng/appDriverRide/appDriverRide_update.html b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/shunfeng/appDriverRide/appDriverRide_update.html
index a051762..2e4a1b9 100644
--- a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/shunfeng/appDriverRide/appDriverRide_update.html
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/shunfeng/appDriverRide/appDriverRide_update.html
@@ -7,8 +7,8 @@
<input type="hidden" id="id" name="id" value="${item.id}">
<#label id="userId" name="用户id" value="${item.userId}"/>
<#label id="phone" name="用户手机号" value="${user.phone}"/>
- <#label id="realName" name="真实姓名" value="${user.realName}"/>
- <#label id="identity" name="身份证号" value="${user.identity}"/>
+ <#label id="realName" name="真实姓名" value="${user.name}"/>
+ <#label id="identity" name="身份证号" value="${user.idCard}"/>
<div class="form-group">
<label class="col-sm-3 control-label">认证照片</label>
<div class="col-sm-9">
--
Gitblit v1.7.1