Pu Zhibing
2025-08-01 c8b503726415980e5fa9a5ffc0e4e751eb7466e9
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -18,6 +18,8 @@
import com.stylefeng.guns.modular.system.model.vo.UnPayOrderVO;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.*;
import com.stylefeng.guns.modular.system.util.qianyuntong.OrderUtil;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.ModifyTravelItineraryRequest;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.QYTPaymentCallback;
import com.stylefeng.guns.modular.system.warpper.*;
import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
@@ -1370,9 +1372,11 @@
         @ApiImplicitParam(value = "优惠数据id", name = "objectId", required = false, dataType = "int"),
         @ApiImplicitParam(value = "数据类型(1=优惠券,2=打车卡)", name = "objectType", required = false, dataType = "int"),
         @ApiImplicitParam(value = "支付端(1=用户APP端,2=司机APP端,3=用户小程序端)", name = "type", required = true, dataType = "int"),
         @ApiImplicitParam(value = "小程序支付成功跳转路径", name = "path", required = true, dataType = "String"),
         @ApiImplicitParam(value = "设备当前IP地址", name = "ip", required = true, dataType = "String"),
         @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
   })
   public ResultUtil payTaxiOrder1(Integer payType, Integer orderId, Integer orderType, Integer objectId, Integer objectType, Integer type, HttpServletRequest request) {
   public ResultUtil payTaxiOrder1(Integer payType, Integer orderId, Integer orderType, Integer objectId, Integer objectType, Integer type, String path, String ip, HttpServletRequest request) {
      System.out.println(objectType);
      System.out.println(objectId);
      try {
@@ -1382,9 +1386,9 @@
         }
         switch (orderType) {
            case 1:
               return orderPrivateCarService.payPrivateCarOrder1(payType, orderId, objectId, objectType, type);
               return orderPrivateCarService.payPrivateCarOrder1(payType, orderId, objectId, objectType, type, path, ip);
            case 2:
               return orderTaxiService.payTaxiOrder1(payType, orderId, objectId, objectType, type);
               return orderTaxiService.payTaxiOrder1(payType, orderId, objectId, objectType, type, path, ip);
            case 3:
               return orderCrossCityService.payCrossCityOrder1(payType, orderId, objectId, objectType, type);
            case 4:
@@ -1427,6 +1431,23 @@
                  OrderPrivateCar orderPrivateCar = orderPrivateCarService.selectById(orderId);
                  orderPrivateCar.setState(9);
                  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 (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() {
@@ -1441,6 +1462,23 @@
                  OrderTaxi orderTaxi = orderTaxiService.selectById(orderId);
                  orderTaxi.setState(9);
                  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 (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);