From 2792ef8f8472732999d4eafeab25d2eb6e2c5bad Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 08 九月 2025 16:40:34 +0800
Subject: [PATCH] 新增加跨城支付
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 84 ++++++++++++++++++++++++------------------
1 files changed, 48 insertions(+), 36 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index ade3c3c..b56344e 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -1255,6 +1255,9 @@
case 7:
// map = orde.queryBalance1(orderId, uid);
break;
+ case 8:
+ map = orderRideService.queryBalance1(orderId, uid);
+ break;
}
return ResultUtil.success(map);
} catch (Exception e) {
@@ -1424,7 +1427,7 @@
case 2:
return orderTaxiService.payTaxiOrder1(payType, orderId, objectId, objectType, type, path, ip);
case 3:
- ResultUtil resultUtil = orderCrossCityService.payCrossCityOrder1(payType, orderId, objectId, objectType, type);
+ ResultUtil resultUtil = orderCrossCityService.payCrossCityOrder1(payType, orderId, objectId, objectType, type, path, ip);
orderCrossCityService.promotion(orderId);
@@ -1468,24 +1471,27 @@
case 1:
OrderPrivateCar orderPrivateCar = orderPrivateCarService.selectById(orderId);
orderPrivateCar.setState(9);
+ orderPrivateCar.setPayTime(new Date());
orderPrivateCarService.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(ToolUtil.isNotEmpty(orderPrivateCar.getTravelId())){
+ 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());
+ }
+ OrderUtil.modifyTravelItinerary(request);
}
- if (2 == orderPrivateCar.getPromotion()) {
- Driver driver2 = driverService.selectById(orderPrivateCar.getPromotionDriverId());
- request.setPromoterId(driver2.getEmpId().toString());
- }
- OrderUtil.modifyTravelItinerary(request);
new Thread(new Runnable() {
@Override
public void run() {
@@ -1499,24 +1505,27 @@
case 2:
OrderTaxi orderTaxi = orderTaxiService.selectById(orderId);
orderTaxi.setState(9);
+ orderTaxi.setPayTime(new Date());
orderTaxiService.updateById(orderTaxi);
- Driver driver = null;
- Company company1 = null;
- //中台修改订单状态
- ModifyTravelItineraryRequest request2 = new ModifyTravelItineraryRequest();
- request2.setOrderId(orderTaxi.getTravelId());
- request2.setStatus(orderTaxi.getState());
- if (null != orderTaxi.getDriverId()) {
- driver = driverService.selectById(orderTaxi.getDriverId());
- company1 = companyService.selectById(driver.getCompanyId());
- request2.setDriverId(driver.getEmpId().toString());
- request2.setSupplierShopId(company1.getEnterCode());
+ if(ToolUtil.isNotEmpty(orderTaxi.getTravelId())){
+ Driver driver = null;
+ Company company1 = null;
+ //中台修改订单状态
+ ModifyTravelItineraryRequest request2 = new ModifyTravelItineraryRequest();
+ request2.setOrderId(orderTaxi.getTravelId());
+ request2.setStatus(orderTaxi.getState());
+ if (null != orderTaxi.getDriverId()) {
+ driver = driverService.selectById(orderTaxi.getDriverId());
+ company1 = companyService.selectById(driver.getCompanyId());
+ request2.setDriverId(driver.getEmpId().toString());
+ request2.setSupplierShopId(company1.getEnterCode());
+ }
+ if (2 == orderTaxi.getPromotion()) {
+ Driver driver2 = driverService.selectById(orderTaxi.getPromotionDriverId());
+ request2.setPromoterId(driver2.getEmpId().toString());
+ }
+ OrderUtil.modifyTravelItinerary(request2);
}
- if (2 == orderTaxi.getPromotion()) {
- Driver driver2 = driverService.selectById(orderTaxi.getPromotionDriverId());
- request2.setPromoterId(driver2.getEmpId().toString());
- }
- OrderUtil.modifyTravelItinerary(request2);
break;
case 3:
OrderCrossCity orderCrossCity = orderCrossCityService.selectById(orderId);
@@ -2170,13 +2179,17 @@
if (orderNo.contains("PR")) {
orderNo = orderNo.substring(2);
orderPrivateCarService.payOrderPrivateCarCallback(Integer.valueOf(orderNo), payId, 1);
- orderPrivateCarService.promotion(Integer.valueOf(orderNo));
}
//出租车
if (orderNo.contains("TA")) {
orderNo = orderNo.substring(2);
orderTaxiService.payOrderTaxiCallback(Integer.valueOf(orderNo), payId, 1, 0);
orderTaxiService.promotion(Integer.valueOf(orderNo));
+ }
+ //跨城出行
+ if (orderNo.contains("CC")) {
+ orderNo = orderNo.substring(2);
+ orderCrossCityService.payOrderCrossCityCallback(Integer.valueOf(orderNo), payId, 1, null);
}
} catch (Exception e) {
e.printStackTrace();
@@ -2372,8 +2385,7 @@
@ApiImplicitParam(value = "行程单信息", name = "tripSheet", required = false, dataType = "com.stylefeng.guns.modular.system.model.vo.TripSheetVo"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil sendTripSheetEmail(@RequestBody TripSheetVo tripSheet,
- HttpServletRequest request) {
+ public ResultUtil sendTripSheetEmail(@RequestBody TripSheetVo tripSheet, HttpServletRequest request) {
try {
// 从Redis中获取当前用户ID
Integer uid = userInfoService.getUserIdFormRedis(request);
--
Gitblit v1.7.1