From dc3cfaa745eb7303e312ce7ba61a7019e5f12e4b Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 21 八月 2025 00:22:42 +0800
Subject: [PATCH] 修改bug
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java | 54 ---------
UserQYTTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java | 79 ++++++++++++
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java | 2
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/dao/mapping/OrderTaxiMapper.xml | 2
UserQYTTravel/guns-admin/src/main/resources/application.yml | 2
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 60 ---------
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/controller/rideCommentController.java | 111 +++++++++--------
UserQYTTravel/guns-admin/src/main/resources/logback.xml | 2
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/UserInfoWarpper.java | 13 ++
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java | 12 +
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java | 2
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/dao/mapping/OrderRideMapper.xml | 3
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserInfoMapper.xml | 3
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserInfo.java | 12 +
14 files changed, 170 insertions(+), 187 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java
index 9583a0c..fcc3729 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java
@@ -419,7 +419,7 @@
}
UserInfo userInfo = userInfoService.selectById(uid);
if(ToolUtil.isEmpty(userInfo.getOnconUUID())){
- String onconUUIDByMobile = UserUtil.getOnconUUIDByMobile("15828353127");
+ String onconUUIDByMobile = UserUtil.getOnconUUIDByMobile(userInfo.getPhone());
userInfo.setOnconUUID(onconUUIDByMobile);
userInfoService.updateById(userInfo);
}
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
index f85e29d..f55402a 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
@@ -1263,7 +1263,6 @@
orderCrossCity.setPassengers(userInfo.getNickName());
orderCrossCity.setPassengersPhone(userInfo.getPhone());
orderCrossCity.setPeopleNumber(orderCrossCityWarpper.getPeopleNumber());
- orderCrossCity.setSeatNumber(orderCrossCityWarpper.getSeatNumber());
List<OrderCrossCity> orderCrossCities = this.selectList(new EntityWrapper<OrderCrossCity>().eq("orderNum", orderCrossCity.getOrderNum()).eq("isDelete", 1));
orderCrossCity.setSort(orderCrossCities.size() + 1);
orderCrossCity.setState(7);//待支付
@@ -1275,6 +1274,11 @@
orderCrossCity.setIsDelete(1);
orderCrossCity.setRemark(orderCrossCityWarpper.getRemark());
orderCrossCity.setIsReassign(1);
+ if(1 == orderCrossCity.getTravelMode()){
+ orderCrossCity.setSeatNumber(orderCrossCityWarpper.getSeatNumber());
+ }else{
+ orderCrossCity.setSeatNumber(lineShiftDriver.getLaveSeatNumber());
+ }
// //调用高德创建轨迹
// String s = gdFalconUtil.selectTerminal(driver.getPhone());
// String track = gdFalconUtil.createTrack(s);
@@ -2468,7 +2472,7 @@
for (Map<String, Integer> map : datas) {
Integer orderType = map.get("orderType");
Integer orderId = map.get("orderId");
- if (orderType == 1 && orderId != orderPrivateCar.getId()) {
+ if (orderType == 1 && !orderId.equals(orderPrivateCar.getId())) {
orderPrivateCarMapper.deleteById(orderId);
}
if (orderType == 2) {
@@ -2541,7 +2545,7 @@
if (orderType == 1) {
orderPrivateCarMapper.deleteById(orderId);
}
- if (orderType == 2 && orderId != orderTaxi.getId()) {
+ if (orderType == 2 && !orderId.equals(orderTaxi.getId())) {
orderTaxiMapper.deleteById(orderId);
}
}
@@ -2568,8 +2572,6 @@
if (bo) {
continue;
}
-
-
pushUtil.pushOrderState(2, driver.getId(), orderTaxi.getId(), 2, orderTaxi.getState(), pushOrder.getPushTime());
}
}
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/controller/rideCommentController.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/controller/rideCommentController.java
index 5aa9a5d..d1e9ea2 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/controller/rideCommentController.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/controller/rideCommentController.java
@@ -845,12 +845,15 @@
}
return ResultUtil.error("异常");
}
+
+
+
//用户取消退款
public void userCancelTuik(OrderRide orderRide){
if(orderRide.getState()==2){//用户已经支付了订单但司机没有接单
orderRide.setTuiMoney(orderRide.getMoney());
}
- if(orderRide.getTuiMoney()>0){
+ if(null != orderRide.getTuiMoney() && orderRide.getTuiMoney()>0){
Financial financial= financialService.selectOne(new EntityWrapper<Financial>().eq("orderNum",orderRide.getOrderNum()));
String finNum=OrdersUtil.getOrderNoForPrefix("fin");
//todo 退款金额大于0需要退款
@@ -903,57 +906,58 @@
return ResultUtil.paranErr("orderId不能为空");
}
OrderTravel orderTravel=orderTravelService.selectById(orderId);
- if(orderTravel!=null){
- if(orderTravel.getState()==6){
- return ResultUtil.error("该订单已取消");
+ if(null == orderTravel){
+ return ResultUtil.error("无效的订单ID");
+ }
+ if(orderTravel.getState()==6){
+ return ResultUtil.error("该订单已取消");
+ }
+ DriverRide driverRide=driverRideService.selectById(orderTravel.getDriverId());
+ if(orderTravel.getServiceMoney()!=null && orderTravel.getServiceMoney()>0){
+ /*todo 更新司机余额*/
+ driverRide.setBalance(driverRide.getBalance()-orderTravel.getServiceMoney());
+ driverRideService.updateById(driverRide);
+ /* 更新司机用户余额（用户和司机用户一个账号余额）*/
+ UserInfo userInfo=userInfoService.selectOne(new EntityWrapper<UserInfo>().eq("driverId",orderTravel.getDriverId()));
+ if(userInfo!=null){
+ //用户余额可以为负数
+ userInfo.setBalance(userInfo.getBalance()-orderTravel.getServiceMoney());
+ userInfoService.updateById(userInfo);
}
- DriverRide driverRide=driverRideService.selectById(orderTravel.getDriverId());
- if(orderTravel.getServiceMoney()!=null && orderTravel.getServiceMoney()>0){
- /*todo 更新司机余额*/
- driverRide.setBalance(driverRide.getBalance()-orderTravel.getServiceMoney());
- driverRideService.updateById(driverRide);
- /* 更新司机用户余额（用户和司机用户一个账号余额）*/
- UserInfo userInfo=userInfoService.selectOne(new EntityWrapper<UserInfo>().eq("driverId",orderTravel.getDriverId()));
- if(userInfo!=null){
- //用户余额可以为负数
- userInfo.setBalance(userInfo.getBalance()-orderTravel.getServiceMoney());
- userInfoService.updateById(userInfo);
- }
- /*财务明细*/
- Financial f=new Financial();
- f.setAddTime(new Date());
- f.setType(1);//类型 1=收入 2=支出
- f.setMoney(orderTravel.getServiceMoney());
- f.setPwType(9);//9=顺风车取消服务费
- f.setOrderNum(orderTravel.getOrderNum());
- String finNum=OrdersUtil.getOrderNoForPrefix("fin");
- f.setLsType(finNum);
- f.setUserId(driverRide.getUserId());
- f.setOrderType(4);
- f.setLx(1);
- financialService.insert(f);
- //司机取消给用户推送
- }
- /*添加系统消息*/
- try {
- systemNoticeService.addSystemNotice(1, "您从"+orderTravel.getStartName()+"到"+orderTravel.getEndName()+"的顺风车行程已取消", driverRide.getUserId(), 1);
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- orderTravel.setState(6);//取消状态
- orderTravelService.updateById(orderTravel);
- //todo 推送
- /*司机接单给用户发送消息*/
- OrderRide orderRide=orderRideService.selectOne(new EntityWrapper<OrderRide>().eq("travelId",orderId));
- if(orderRide!=null) {
- pushUtil.pushOrderState(1, orderRide.getUserId(), orderRide.getId(), 8, 6, null);
- }
- //取消乘客订单
- if(orderRide!=null && orderRide.getState()!=6){
- orderRide.setTuiMoney(orderRide.getMoney());
- orderRideService.updateById(orderRide);
- userCancelTuik(orderRide);
- }
+ /*财务明细*/
+ Financial f=new Financial();
+ f.setAddTime(new Date());
+ f.setType(1);//类型 1=收入 2=支出
+ f.setMoney(orderTravel.getServiceMoney());
+ f.setPwType(9);//9=顺风车取消服务费
+ f.setOrderNum(orderTravel.getOrderNum());
+ String finNum=OrdersUtil.getOrderNoForPrefix("fin");
+ f.setLsType(finNum);
+ f.setUserId(driverRide.getUserId());
+ f.setOrderType(4);
+ f.setLx(1);
+ financialService.insert(f);
+ //司机取消给用户推送
+ }
+ /*添加系统消息*/
+ try {
+ systemNoticeService.addSystemNotice(1, "您从"+orderTravel.getStartName()+"到"+orderTravel.getEndName()+"的顺风车行程已取消", driverRide.getUserId(), 1);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ orderTravel.setState(6);//取消状态
+ orderTravelService.updateById(orderTravel);
+ //todo 推送
+ /*司机接单给用户发送消息*/
+ OrderRide orderRide=orderRideService.selectOne(new EntityWrapper<OrderRide>().eq("travelId",orderId));
+ if(orderRide!=null) {
+ pushUtil.pushOrderState(1, orderRide.getUserId(), orderRide.getId(), 8, 6, null);
+ }
+ //取消乘客订单
+ if(orderRide!=null && orderRide.getState()!=6){
+ orderRide.setTuiMoney(orderRide.getMoney());
+ orderRideService.updateById(orderRide);
+ userCancelTuik(orderRide);
}
return ResultUtil.success("");
@@ -1024,6 +1028,7 @@
/*修改用户接单数和司机提成*/
UserInfo userInfo=userInfoService.selectById(driverRide.getUserId());
userInfo.setBalance(userInfo.getBalance()+(orderRide.getMoney()-orderRide.getPlatformMoney()));
+ userInfo.setTotalOrders(userInfo.getTotalOrders() + 1);
userInfoService.updateById(userInfo);
Financial f=new Financial();
f.setAddTime(new Date());
@@ -1139,8 +1144,8 @@
DriverRide driverRide=driverRideService.selectById(driverId);
if(driverRide!=null){
/*计算司机的评分*/
- driverRide.setEvaluateNum(driverRide.getEvaluateNum()+1);
- driverRide.setEvaluateScore(driverRide.getEvaluateScore()+score);
+ driverRide.setEvaluateNum((null != driverRide.getEvaluateNum() ? driverRide.getEvaluateNum() : 0 )+1);
+ driverRide.setEvaluateScore((null == driverRide.getEvaluateScore() ? 0 : driverRide.getEvaluateScore())+score);
driverRideService.updateById(driverRide);
}
/*标记订单已评价*/
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/dao/mapping/OrderRideMapper.xml b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/dao/mapping/OrderRideMapper.xml
index 33c664f..a6f63ed 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/dao/mapping/OrderRideMapper.xml
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/dao/mapping/OrderRideMapper.xml
@@ -58,9 +58,6 @@
order by r.startTime asc
</if>
<if test="type==4">
- order by calculate_distance(#{lat},#{lon},r.startLat, r.startLon) asc
- </if>
- <if test="type==5">
order by r.money desc
</if>
LIMIT #{current},#{size}
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index b0806d6..0e5f52a 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -638,14 +638,13 @@
} else {
OrderPrivateCar orderPrivateCar1 = null;
OpenCity openCity = openCityService.openCity1(orderPrivateCar.getStartLon().toString(), orderPrivateCar.getStartLat().toString());
+ TbSpellOrderRule spellOrderRule = spellOrderRuleService.selectOne(new EntityWrapper<TbSpellOrderRule>().eq("openCityId", openCity.getId()));
//判断是否有相同线路的拼车-有直接拼成功，或者推送拼车订单
List<OrderPrivateCar> orderList = orderPrivateCarMapper.selectList(new EntityWrapper<OrderPrivateCar>().eq("rideType", 3).in("state", "2,3,4").le("totalPeopleNum", 4 - peopleNum));
for (OrderPrivateCar order : orderList) {
- TbSpellOrderRule spellOrderRule = spellOrderRuleService.selectOne(new EntityWrapper<TbSpellOrderRule>().eq("openCityId", openCity.getId()));
if (spellOrderRule != null) {
JSONObject jsonObject = JSONObject.parseObject(spellOrderRule.getContent());
//判断时间
-
if (travelTime.getTime() >= order.getTravelTime().getTime() - jsonObject.getInteger("num5") * 60000L && travelTime.getTime() <= order.getTravelTime().getTime() + jsonObject.getInteger("num6") * 60000L) {
// Double dis1 = Double.valueOf(gdMapElectricFenceUtil.getDistance(orderPrivateCar.getStartLon() + "," + orderPrivateCar.getStartLat(), order.getStartLon() + "," + order.getStartLat(), 1).get("distance").toString());
// Double dis2 = Double.valueOf(gdMapElectricFenceUtil.getDistance(orderPrivateCar.getEndLon() + "," + orderPrivateCar.getEndLat(), order.getEndLon() + "," + order.getEndLat(), 1).get("distance").toString());
@@ -663,7 +662,6 @@
if (orderPrivateCar1 == null) {
orderList = orderPrivateCarMapper.selectList(new EntityWrapper<OrderPrivateCar>().eq("rideType", 3).eq("state", 5).le("totalPeopleNum", 4 - peopleNum));
for (OrderPrivateCar order : orderList) {
- TbSpellOrderRule spellOrderRule = spellOrderRuleService.selectOne(new EntityWrapper<TbSpellOrderRule>().eq("openCityId", openCity.getId()));
if (spellOrderRule != null) {
JSONObject jsonObject = JSONObject.parseObject(spellOrderRule.getContent());
//判断时间
@@ -1000,73 +998,17 @@
orderCancelService.saveData(orderPrivateCar1.getId(), 1, "无司机接单", "无司机接单", null, null, 2, 1, uid);
orderPrivateCar1.setState(10);
this.updateById(orderPrivateCar1);
-
- Driver driver1 = null;
- Company company = null;
- //中台修改订单状态
- ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
- request.setOrderId(orderPrivateCar1.getTravelId());
- request.setStatus(orderPrivateCar1.getState());
- if (null != orderPrivateCar1.getDriverId()) {
- driver1 = driverService.selectById(orderPrivateCar1.getDriverId());
- company = companyService.selectById(driver1.getCompanyId());
- request.setDriverId(driver1.getEmpId().toString());
- request.setSupplierShopId(company.getEnterCode());
- }
- if (2 == orderPrivateCar1.getPromotion()) {
- Driver driver2 = driverService.selectById(orderPrivateCar1.getPromotionDriverId());
- request.setPromoterId(driver2.getEmpId().toString());
- }
- OrderUtil.modifyTravelItinerary(request);
}
List<OrderTaxi> list1 = orderTaxiService.selectList(new EntityWrapper<OrderTaxi>().eq("type", 2).eq("crossCityOrderId", orderPrivateCar.getCrossCityOrderId()).eq("place", orderPrivateCar.getPlace()));
for (OrderTaxi orderTaxi : list1) {
orderCancelService.saveData(orderTaxi.getId(), 2, "无司机接单", "无司机接单", null, null, 2, 1, uid);
orderTaxi.setState(10);
orderTaxiService.updateById(orderTaxi);
-
- Driver driver1 = null;
- Company company = null;
- //中台修改订单状态
- ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
- request.setOrderId(orderTaxi.getTravelId());
- request.setStatus(orderTaxi.getState());
- if (null != orderTaxi.getDriverId()) {
- driver1 = driverService.selectById(orderTaxi.getDriverId());
- company = companyService.selectById(driver1.getCompanyId());
- request.setDriverId(driver1.getEmpId().toString());
- request.setSupplierShopId(company.getEnterCode());
- }
- if (2 == orderTaxi.getPromotion()) {
- Driver driver2 = driverService.selectById(orderTaxi.getPromotionDriverId());
- request.setPromoterId(driver2.getEmpId().toString());
- }
- OrderUtil.modifyTravelItinerary(request);
}
} else {
integer = orderCancelService.saveData(id, 1, "无司机接单", "无司机接单", null, null, 2, 1, uid);
orderPrivateCar.setState(10);
this.updateById(orderPrivateCar);
-
- Driver driver1 = null;
- Company company = null;
- //中台修改订单状态
- ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
- request.setOrderId(orderPrivateCar.getTravelId());
- request.setStatus(orderPrivateCar.getState());
- if (null != orderPrivateCar.getDriverId()) {
- driver1 = driverService.selectById(orderPrivateCar.getDriverId());
- company = companyService.selectById(driver1.getCompanyId());
- request.setDriverId(driver1.getEmpId().toString());
- request.setSupplierShopId(company.getEnterCode());
- }
- if (2 == orderPrivateCar.getPromotion()) {
- Driver driver2 = driverService.selectById(orderPrivateCar.getPromotionDriverId());
- request.setPromoterId(driver2.getEmpId().toString());
- }
- if(orderPrivateCar.getTravelId()!=null){
- OrderUtil.modifyTravelItinerary(request);
- }
}
} else {
OpenCity openCity = openCityService.openCity1(orderPrivateCar.getStartLon().toString(), orderPrivateCar.getStartLat().toString());
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserInfoMapper.xml b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserInfoMapper.xml
index cb70a5a..748a4b6 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserInfoMapper.xml
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserInfoMapper.xml
@@ -164,7 +164,8 @@
if((select count(1) from t_user_taxi_card where userId = #{uid}) = 0, 0, 1) as payTaxiCar,
if((select id from t_merchant where auditStatus = 2 and userType = 1 and userId = a.id and state = 1) is null, 0, 1) as merchant,
a.isDriverRide,
- a.driverId
+ a.driverId,
+ (select `state` from app_driver_ride where userId = a.id and isDelete = 0 order by addTime desc limit 0,1) as driverAuthState
from t_user a where 1 = 1
<if test="null != uid">
and a.id = #{uid}
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserInfo.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserInfo.java
index 025c8ce..e0e13a8 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserInfo.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserInfo.java
@@ -167,6 +167,8 @@
private Date bindDate;
+ private Integer totalOrders;
+
public Date getBindDate() {
return bindDate;
}
@@ -414,7 +416,15 @@
public void setOnconUUID(String onconUUID) {
this.onconUUID = onconUUID;
}
-
+
+ public Integer getTotalOrders() {
+ return totalOrders;
+ }
+
+ public void setTotalOrders(Integer totalOrders) {
+ this.totalOrders = totalOrders;
+ }
+
@Override
public String toString() {
return "UserInfo{" +
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java
index 67be182..77fc715 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java
@@ -587,7 +587,7 @@
* @return
*/
public static GetPaymentInfo paymentInfo(GetPaymentInfoDataRequest getPaymentInfoDataRequest) {
- getPaymentInfoDataRequest.setPartnerId("5400004");
+ getPaymentInfoDataRequest.setPartnerId("prod".equals(qianYunTongConfig.getActiveProfile()) ? "5401007" : "5400004");
GetPaymentInfoRequest request = new GetPaymentInfoRequest();
request.setRequstType("POST");
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/UserInfoWarpper.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/UserInfoWarpper.java
index 28e6a48..619fc56 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/UserInfoWarpper.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/UserInfoWarpper.java
@@ -53,6 +53,8 @@
private Integer isDriverRide;
@ApiModelProperty("顺风车司机id")
private Integer driverId;
+ @ApiModelProperty("顺风车司机认证状态（1=待审核，2=审核通过，3=审核拒绝）")
+ private Integer driverAuthState;
public Integer getIsCould() {
return isCould;
@@ -197,7 +199,15 @@
public void setDriverId(Integer driverId) {
this.driverId = driverId;
}
-
+
+ public Integer getDriverAuthState() {
+ return driverAuthState;
+ }
+
+ public void setDriverAuthState(Integer driverAuthState) {
+ this.driverAuthState = driverAuthState;
+ }
+
@Override
public String toString() {
return "UserInfoWarpper{" +
@@ -240,6 +250,7 @@
userInfoWarpper.setIsCould(Integer.valueOf(String.valueOf(map.get("isCloud"))));
userInfoWarpper.setIsDriverRide(null != map.get("isDriverRide") ? Integer.valueOf(String.valueOf(map.get("isDriverRide"))) : 0);
userInfoWarpper.setDriverId(null != map.get("driverId") ? Integer.valueOf(String.valueOf(map.get("driverId"))) : 0);
+ userInfoWarpper.setDriverAuthState(null != map.get("driverAuthState") ? Integer.valueOf(String.valueOf(map.get("driverAuthState"))) : 1);
}
return userInfoWarpper;
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/dao/mapping/OrderTaxiMapper.xml b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/dao/mapping/OrderTaxiMapper.xml
index 20e94ae..2501f7f 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/dao/mapping/OrderTaxiMapper.xml
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/dao/mapping/OrderTaxiMapper.xml
@@ -265,7 +265,7 @@
a.abnormalIntro,
a.abnormalImg,
a.companyId,
- IF(a.abnormalIntro is null and a.recoveryOrder = 1, 0, 1)) as appealButton
+ IF(a.abnormalIntro is null and a.recoveryOrder = 1, 0, 1) as appealButton
from t_order_taxi a
left join t_driver b on (a.driverId = b.id)
left join t_car c on (a.carId = c.id)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
index 0140549..ede235d 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
@@ -497,71 +497,17 @@
orderCancelService.saveData(orderPrivateCar1.getId(), 1, "无司机接单", "无司机接单", null, null, 2, 1, uid);
orderPrivateCar1.setState(10);
orderPrivateCarService.updateById(orderPrivateCar1);
-
- Driver driver1 = null;
- Company company = null;
- //中台修改订单状态
- ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
- request.setOrderId(orderPrivateCar1.getTravelId());
- request.setStatus(orderPrivateCar1.getState());
- if (null != orderPrivateCar1.getDriverId()) {
- driver1 = driverService.selectById(orderPrivateCar1.getDriverId());
- company = companyService.selectById(driver1.getCompanyId());
- request.setDriverId(driver1.getEmpId().toString());
- request.setSupplierShopId(company.getEnterCode());
- }
- if (2 == orderPrivateCar1.getPromotion()) {
- Driver driver2 = driverService.selectById(orderPrivateCar1.getPromotionDriverId());
- request.setPromoterId(driver2.getEmpId().toString());
- }
- OrderUtil.modifyTravelItinerary(request);
}
List<OrderTaxi> list1 = this.selectList(new EntityWrapper<OrderTaxi>().eq("type", 2).eq("crossCityOrderId", orderTaxi.getCrossCityOrderId()).eq("place", orderTaxi.getPlace()));
for (OrderTaxi orderTaxi1 : list1) {
orderCancelService.saveData(orderTaxi1.getId(), 2, "无司机接单", "无司机接单", null, null, 2, 1, uid);
orderTaxi1.setState(10);
this.updateById(orderTaxi1);
-
- Driver driver1 = null;
- Company company = null;
- //中台修改订单状态
- ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
- request.setOrderId(orderTaxi1.getTravelId());
- request.setStatus(orderTaxi1.getState());
- if (null != orderTaxi1.getDriverId()) {
- driver1 = driverService.selectById(orderTaxi1.getDriverId());
- company = companyService.selectById(driver1.getCompanyId());
- request.setDriverId(driver1.getEmpId().toString());
- request.setSupplierShopId(company.getEnterCode());
- }
- if (2 == orderTaxi1.getPromotion()) {
- Driver driver2 = driverService.selectById(orderTaxi1.getPromotionDriverId());
- request.setPromoterId(driver2.getEmpId().toString());
- }
- OrderUtil.modifyTravelItinerary(request);
}
} else {
integer = orderCancelService.saveData(id, 2, "无司机接单", "无司机接单", null, null, 2, 1, uid);
orderTaxi.setState(10);
this.updateById(orderTaxi);
-
- Driver driver1 = null;
- Company company = null;
- //中台修改订单状态
- ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
- request.setOrderId(orderTaxi.getTravelId());
- request.setStatus(orderTaxi.getState());
- if (null != orderTaxi.getDriverId()) {
- driver1 = driverService.selectById(orderTaxi.getDriverId());
- company = companyService.selectById(driver1.getCompanyId());
- request.setDriverId(driver1.getEmpId().toString());
- request.setSupplierShopId(company.getEnterCode());
- }
- if (2 == orderTaxi.getPromotion()) {
- Driver driver2 = driverService.selectById(orderTaxi.getPromotionDriverId());
- request.setPromoterId(driver2.getEmpId().toString());
- }
- OrderUtil.modifyTravelItinerary(request);
}
} else {
OpenCity openCity = openCityService.openCity1(orderTaxi.getStartLon().toString(), orderTaxi.getStartLat().toString());
diff --git a/UserQYTTravel/guns-admin/src/main/resources/application.yml b/UserQYTTravel/guns-admin/src/main/resources/application.yml
index 883c13d..65a512b 100644
--- a/UserQYTTravel/guns-admin/src/main/resources/application.yml
+++ b/UserQYTTravel/guns-admin/src/main/resources/application.yml
@@ -1,3 +1,3 @@
spring:
profiles:
- active: '@spring.active@'
\ No newline at end of file
+ active: "@spring.active@"
\ No newline at end of file
diff --git a/UserQYTTravel/guns-admin/src/main/resources/logback.xml b/UserQYTTravel/guns-admin/src/main/resources/logback.xml
index 64952fc..703fd00 100644
--- a/UserQYTTravel/guns-admin/src/main/resources/logback.xml
+++ b/UserQYTTravel/guns-admin/src/main/resources/logback.xml
@@ -7,7 +7,7 @@
<contextName>logback</contextName>
<!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义后，可以使“${}”来使用变量。 -->
- <property name="log.path" value="/etraffic/server/logs/user"/>
+ <property name="log.path" value="/etraffic/server/chuxing/logs/user"/>
<!--0. 日志格式和颜色渲染 -->
<!-- 彩色日志依赖的渲染类 -->
diff --git a/UserQYTTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java b/UserQYTTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java
index e683cad..1978e22 100644
--- a/UserQYTTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java
+++ b/UserQYTTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java
@@ -1,15 +1,26 @@
//package com.stylefeng.guns;
//
//import com.alibaba.fastjson.JSON;
+//import com.stylefeng.guns.core.util.ToolUtil;
+//import com.stylefeng.guns.modular.shunfeng.model.DriverRide;
+//import com.stylefeng.guns.modular.shunfeng.model.Evaluate;
+//import com.stylefeng.guns.modular.shunfeng.model.OrderRide;
+//import com.stylefeng.guns.modular.shunfeng.service.IDriverRideService;
+//import com.stylefeng.guns.modular.shunfeng.service.IEvaluateService;
+//import com.stylefeng.guns.modular.shunfeng.service.IOrderRideService;
+//import com.stylefeng.guns.modular.shunfeng.util.SensitiveWordUtil;
//import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar;
//import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService;
+//import com.stylefeng.guns.modular.system.dao.SensitiveWordsMapper;
//import com.stylefeng.guns.modular.system.model.Company;
//import com.stylefeng.guns.modular.system.model.Driver;
+//import com.stylefeng.guns.modular.system.model.SensitiveWords;
//import com.stylefeng.guns.modular.system.model.UserInfo;
//import com.stylefeng.guns.modular.system.service.ICompanyService;
//import com.stylefeng.guns.modular.system.service.IDriverService;
//import com.stylefeng.guns.modular.system.service.IUserInfoService;
//import com.stylefeng.guns.modular.system.util.EmailUtil;
+//import com.stylefeng.guns.modular.system.util.ResultUtil;
//import com.stylefeng.guns.modular.system.util.qianyuntong.OrderUtil;
//import com.stylefeng.guns.modular.system.util.qianyuntong.UserUtil;
//import com.stylefeng.guns.modular.system.util.qianyuntong.model.*;
@@ -22,10 +33,14 @@
//import org.springframework.boot.test.context.SpringBootTest;
//import org.springframework.test.context.junit4.SpringRunner;
//
+//import javax.annotation.Resource;
//import javax.mail.MessagingException;
//import java.io.UnsupportedEncodingException;
//import java.math.BigDecimal;
+//import java.util.Date;
+//import java.util.HashSet;
//import java.util.List;
+//import java.util.Set;
//
///**
// * SpringBoot方式启动类
@@ -52,18 +67,72 @@
// private IPaymentRecordService paymentRecordService;
// @Autowired
// private EmailUtil emailUtil;
+// /*顺风车司机*/
+// @Autowired
+// private IDriverRideService driverRideService;
+//
+// @Resource
+// private SensitiveWordsMapper sensitiveWordsMapper;
+// /*评价*/
+// @Autowired
+// private IEvaluateService evaluateService;
+// /*顺风车订单*/
+// @Autowired
+// private IOrderRideService orderRideService;
//
//
//
//
// @Test
// public void test(){
+// Integer orderId = 163;
+// Integer score = 5;
+// Integer userId = 17;
+// String content = "";
+// Integer driverId = 37;
// try {
-// emailUtil.sendEmailWithAttachment("393733352@qq.com", "贵人家园出行-行程单", "请查收您的行程单", null, "贵人家园出行-行程单");
-// } catch (MessagingException e) {
-// throw new RuntimeException(e);
-// } catch (UnsupportedEncodingException e) {
-// throw new RuntimeException(e);
+// Evaluate evaluate=new Evaluate();
+// evaluate.setAddTime(new Date());
+// evaluate.setType(8);
+// evaluate.setOrderId(orderId);
+// evaluate.setScore(score);
+// evaluate.setUserId(userId);
+// if(ToolUtil.isNotEmpty(content)){
+// /*判断评价内容是否包含敏感词*/
+// List<SensitiveWords> list = sensitiveWordsMapper.selectList(null);
+// Set<String> sensitiveWordSet = new HashSet<>();
+// for(SensitiveWords gs:list){
+// sensitiveWordSet.add(gs.getContent());
+// }
+// SensitiveWordUtil.init(sensitiveWordSet);
+// boolean result = SensitiveWordUtil.contains(content);
+//
+// }
+// evaluate.setContent(content);
+// evaluate.setDriverId(driverId);
+// /*查询用户手机号*/
+// UserInfo userInfo=userInfoService.selectById(userId);
+// if(userInfo!=null){
+// evaluate.setUserPhone(userInfo.getPhone());
+// }
+// /*查询司机电话*/
+// DriverRide driverRide=driverRideService.selectById(driverId);
+// if(driverRide!=null){
+// /*计算司机的评分*/
+// driverRide.setEvaluateNum((null != driverRide.getEvaluateNum() ? driverRide.getEvaluateNum() : 0 )+1);
+// driverRide.setEvaluateScore((null == driverRide.getEvaluateScore() ? 0 : driverRide.getEvaluateScore())+score);
+// driverRideService.updateById(driverRide);
+// }
+// /*标记订单已评价*/
+// OrderRide orderTaxi=new OrderRide();
+// orderTaxi.setId(orderId);
+// orderTaxi.setIsEvaluate(2);
+// orderTaxi.setEvaluateScoreUser(score);
+// orderTaxi.setContent(content);
+// orderRideService.updateById(orderTaxi);
+// evaluateService.insert(evaluate);
+// } catch (Exception e) {
+// e.printStackTrace();
// }
// }
//}
--
Gitblit v1.7.1