修改bug

Pu Zhibing

2025-08-05 d8f0615909cedc1446da7c06b2ab7599abe07c9d

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java

@@ -3,7 +3,6 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.aliyun.oss.ServiceException;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.core.util.ToolUtil;
@@ -12,7 +11,6 @@
import com.stylefeng.guns.modular.crossCity.model.OrderCrossCity;
import com.stylefeng.guns.modular.crossCity.server.IOrderCrossCityService;
import com.stylefeng.guns.modular.crossCity.server.impl.OrderCrossCityServiceImpl;
import com.stylefeng.guns.modular.smallLogistics.server.IOrderLogisticsService;
import com.stylefeng.guns.modular.specialTrain.dao.OrderPrivateCarMapper;
import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar;
import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService;
@@ -21,6 +19,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.*;
import com.stylefeng.guns.modular.system.warpper.*;
import com.stylefeng.guns.modular.taxi.dao.OrderTaxiMapper;
import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
@@ -44,10 +44,13 @@

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.math.MathContext;
import java.math.RoundingMode;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
@@ -131,7 +134,7 @@
   @Autowired
   private PayMoneyUtil payMoneyUtil;
   @Autowired
   private IOrderLogisticsService orderLogisticsService;
   private TAbnormalPayOrderMapper abnormalPayOrderMapper;
   @Autowired
   private ITaxiCardPaymentService taxiCardPaymentService;
   @Autowired
@@ -159,6 +162,9 @@
   private Lock lock = new ReentrantLock();
   @Autowired
   private AppOrderController appOrderController;

   @Autowired
   private TDriverPromotionActivityService driverPromotionActivityService;
   
   /**
    * 专车下单操作
@@ -579,8 +585,9 @@
            Map<String, String> distanceMap = gdMapElectricFenceUtil.getDistance(orderPrivateCar.getStartLon() + "," + orderPrivateCar.getStartLat(), orderPrivateCar.getEndLon() + "," + orderPrivateCar.getEndLat(), 1);
            orderPrivateCar.setEstimateMileage(Double.valueOf(distanceMap.get("distance")));
            orderPrivateCar.setEstimateTime(Double.valueOf(distanceMap.get("duration")) / 60);
            UserInfo userInfo = userInfoService.selectById(uid);
            if (instead == 0 || ToolUtil.isEmpty(orderPrivateCar.getPassengers())) {
               UserInfo userInfo = userInfoService.selectById(uid);

               if (ToolUtil.isEmpty(userInfo.getPhone())) {
                  return ResultUtil.error("请先绑定手机号码");
               }
@@ -595,10 +602,22 @@
            orderPrivateCar.setTotalPeopleNum(peopleNum);
            orderPrivateCar.setIsReassign(1);
            orderPrivateCar.setIsDelete(1);
            this.insert(orderPrivateCar);
				

            // 是否推广订单
            Integer promotion = isPromotion(uid);
            if(promotion!=null){
               orderPrivateCar.setPromotion(2);
               Driver driver = driverService.selectById(promotion);
               orderPrivateCar.setPromotionUser(driver.getName());
               orderPrivateCar.setPromotionPhone(driver.getPhone());
               orderPrivateCar.setPromotionDriverId(promotion);
            }

            //判断独享，一口价，拼车
            JSONArray jsonArray = JSON.parseArray(serverCarModel);
            this.insert(orderPrivateCar);


            for (int i = 0; i < jsonArray.size(); i++) {
               JSONObject jsonObject1 = jsonArray.getJSONObject(i);
               Integer serverCarModelId = jsonObject1.getInteger("serverCarModelId");
@@ -683,6 +702,22 @@
                     orderPrivateCar.setIsReassign(1);
                     orderPrivateCar.setIsDelete(1);
                     orderPrivateCar.setPid(orderPrivateCar1.getPid() == null ? orderPrivateCar1.getId() : orderPrivateCar1.getPid());

                     Company company = companyService.selectById(driver.getCompanyId());
                     //调三方订单中心创建行程单
                     CreateTravelItineraryRequest request = new CreateTravelItineraryRequest();
                     request.setOrderNo("PR" + orderPrivateCar.getId());
                     request.setCustomerId(userInfo.getOnconUUID());
                     request.setDriverId(driver.getEmpId().toString());
                     request.setSupplierShopId(company.getEnterCode());
                     if(orderPrivateCar.getPromotion() !=null && 2 == orderPrivateCar.getPromotion()){
                        Driver driver1 = driverService.selectById(orderPrivateCar.getPromotionDriverId());
                        request.setPromoterId(driver1.getEmpId().toString());
                     }
                     request.setServiceType(2);
                     String travelItinerary = OrderUtil.createTravelItinerary(request);
                     orderPrivateCar.setTravelId(travelItinerary);

                     this.insertOrUpdate(orderPrivateCar);
                     //修改总订单人数
                     OrderPrivateCar orderPrivateCar2 = new OrderPrivateCar();
@@ -730,7 +765,22 @@
      }
      return ResultUtil.success(baseWarpper);
   }
	


   private Integer isPromotion(Integer userId){
      UserInfo userInfo = userInfoService.selectById(userId);
      if(userInfo.getBindDriverId()!=null && userInfo.getBindExpireDate().getTime()<=System.currentTimeMillis()){
         String registAreaCode = userInfo.getRegistAreaCode();
         TDriverPromotionActivity tDriverPromotionActivity = driverPromotionActivityService.selectOne(new EntityWrapper<TDriverPromotionActivity>().eq("districtCode", registAreaCode).eq("state",1).ge("startTime", new Date()).lt("endTime", new Date()).last("AND FIND_IN_SET(" + 1 + ", bizType) limit 1"));
         if(tDriverPromotionActivity!=null){
            return userInfo.getBindDriverId();
         }
      }
      return null;

   }


   /**
    * 下单后继续等待
    *
@@ -941,17 +991,73 @@
               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());
@@ -968,6 +1074,24 @@
               this.updateById(orderPrivateCar);
            }
            this.deleteTask(id);//删除定时任务
				
            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
@@ -1085,6 +1209,24 @@
            orderPrivateCar.setTelX("");
            orderPrivateCar.setBindId("");
            this.updateById(orderPrivateCar);
				
            Driver driver = null;
            Company company = null;
            //中台修改订单状态
            ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
            request.setOrderId(orderPrivateCar.getTravelId());
            request.setStatus(orderPrivateCar.getState());
            if (null != orderPrivateCar.getDriverId()) {
               driver = driverService.selectById(orderPrivateCar.getDriverId());
               company = companyService.selectById(driver.getCompanyId());
               request.setDriverId(driver.getEmpId().toString());
               request.setSupplierShopId(company.getEnterCode());
            }
            if (2 == orderPrivateCar.getPromotion()) {
               Driver driver1 = driverService.selectById(orderPrivateCar.getPromotionDriverId());
               request.setPromoterId(driver1.getEmpId().toString());
            }
            OrderUtil.modifyTravelItinerary(request);
            
            orderCancel.setState(2);
            orderCancel.setPayType(3);
@@ -1878,8 +2020,7 @@
   
   @Override
   @Transactional(propagation = Propagation.REQUIRES_NEW)
   public ResultUtil payPrivateCarOrder1(Integer payType, Integer orderId, Integer objectId, Integer objectType, Integer type) throws Exception {
		
   public ResultUtil payPrivateCarOrder1(Integer payType, Integer orderId, Integer objectId, Integer objectType, Integer type, String path, String ip) throws Exception {
      OrderPrivateCar orderPrivateCar = this.selectById(orderId);
      if (orderPrivateCar.getState() == 8 || orderPrivateCar.getState() == 9) {
         return ResultUtil.error("订单已完成支付，不允许重复支付", new ArrayList<>());
@@ -1898,7 +2039,7 @@
      UserCouponRecord userCouponRecord = null;
      if (null != objectId && objectType == 1) {
         userCouponRecord = userCouponRecordService.selectById(objectId);
         if (userCouponRecord.getCompanyId() != orderPrivateCar.getCompanyId()) {
         if (userCouponRecord.getCompanyId().compareTo(orderPrivateCar.getCompanyId()) != 0) {
            return ResultUtil.error("优惠券不能用于此订单", new ArrayList<>());
         }
         if (userCouponRecord.getState() == 2) {
@@ -2055,9 +2196,95 @@
         if (orderMoney == 0) {
            return ResultUtil.error("请使用余额支付");
         }
         String app = type == 1 ? "APP" : "JSAPI";
         resultUtil = payMoneyUtil.weixinpay("完成订单", "", orderId + "_1_" + UUIDUtil.getRandomCode(5), orderMoney.toString(), "/base/wxPayOrderTaxi", app, userInfo.getAppletsOpenId());
//         String app = type == 1 ? "APP" : "JSAPI";
//         resultUtil = payMoneyUtil.weixinpay("完成订单", "", orderId + "_1_" + UUIDUtil.getRandomCode(5), orderMoney.toString(), "/base/wxPayOrderTaxi", app, userInfo.getAppletsOpenId());
			
         Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
         if(null == orderPrivateCar.getIsCreated() || 0 == orderPrivateCar.getIsCreated()){
            //调用中台创建订单及拉起支付接口
            TradeOrderCreateData tradeOrderCreateData = new TradeOrderCreateData();
            tradeOrderCreateData.setTreatShopId(driver.getEmpId().toString());
            tradeOrderCreateData.setField1("{\"profitSharing\":\"1\",\"isPromote\":\"" + (orderPrivateCar.getPromotion() == 2 ? 1 : 0) + "\"}");
            tradeOrderCreateData.setCharge(new BigDecimal(orderMoney));
            tradeOrderCreateData.setOrderId(orderPrivateCar.getTravelId());
            tradeOrderCreateData.setOrderNo("PR" + orderPrivateCar.getId());
            tradeOrderCreateData.setCustomerId(userInfo.getOnconUUID());
            tradeOrderCreateData.setPartnerPayId(orderPrivateCar.getTravelId());
            tradeOrderCreateData.setTotalFee(Double.valueOf(orderMoney * 100).intValue() + "");
            tradeOrderCreateData.setOrderDesc("完成订单");
            tradeOrderCreateData.setRetUrl(path);
            tradeOrderCreateData.setClientIp(ip);
				
            List<GoodsInfoRequest> goodsInfo = new ArrayList<>();
            GoodsInfoRequest goodsInfoRequest = new GoodsInfoRequest();
            goodsInfoRequest.setSubOpenId(userInfo.getAppletsOpenId());
            goodsInfo.add(goodsInfoRequest);
            tradeOrderCreateData.setGoodsInfo(goodsInfo);
            TradeOrderCreate tradeOrderCreate = OrderUtil.tradeOrderCreate1(tradeOrderCreateData);
            PayInfo payInfo = tradeOrderCreate.getPayInfo();
            if(!"000000".equals(payInfo.getRetCode())){
               return ResultUtil.error(payInfo.getRetMsg());
            }
            orderPrivateCar.setIsCreated(1);
            resultUtil = ResultUtil.success(payInfo.getData().getRedirectUrl());
         }else{
            //拉起支付
            TradePayOff1Data tradePayOff1Data = new TradePayOff1Data();
            tradePayOff1Data.setPartnerPayId(orderPrivateCar.getTravelId());
            tradePayOff1Data.setTotalFee(Double.valueOf(orderMoney * 100).intValue() + "");
            tradePayOff1Data.setRetUrl(path);
            tradePayOff1Data.setClientIp(ip);
            tradePayOff1Data.setOrderDesc("完成订单");
            List<GoodsInfoRequest> goodsInfo = new ArrayList<>();
            GoodsInfoRequest goodsInfoRequest = new GoodsInfoRequest();
            goodsInfoRequest.setSubOpenId(userInfo.getAppletsOpenId());
            goodsInfo.add(goodsInfoRequest);
            tradePayOff1Data.setGoodsInfo(goodsInfo);
            PayInfo payInfo = OrderUtil.tradePayOff1(tradePayOff1Data);
            if(!"000000".equals(payInfo.getRetCode())){
               return ResultUtil.error(payInfo.getRetMsg());
            }
            resultUtil = ResultUtil.success(payInfo.getData().getRedirectUrl());
         }
         paymentRecordService.saveData(1, orderPrivateCar.getUserId(), 1, orderId, 1, 1, orderMoney, "", 1);//添加预支付数据
			
         //创建定时任务查询订单支付状态
         ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(1, 1, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<Runnable>());
         threadPoolExecutor.execute(()->{
            try {
               int num = 1;
               int wait = 0;
               while (num <= 13) {
                  int min = 5000;
                  wait += (min * num);
                  OrderPrivateCar orderPrivateCar1 = this.selectById(orderPrivateCar.getId());
                  if (orderPrivateCar1.getState() != 7) {
                     break;
                  }
                  GetTravelItineraryListRequest request = new GetTravelItineraryListRequest();
                  request.setCustomerId(userInfo.getOnconUUID());
                  request.setOrderNo("PR" + orderPrivateCar1.getId());
                  request.setDriverId(driver.getEmpId().toString());
                  ListPage<List<TravelItinerary>> travelItineraryList = OrderUtil.getTravelItineraryList(request);
                  TravelItinerary travelItinerary = travelItineraryList.getList().get(0);
                  if(travelItinerary.getStatus() != 7 || travelItinerary.getOrderStatus() == 11){
                     GetPaymentInfoDataRequest getPaymentInfoDataRequest = new GetPaymentInfoDataRequest();
                     getPaymentInfoDataRequest.setPartnerPayId(orderPrivateCar1.getTravelId());
                     GetPaymentInfo getPaymentInfo = OrderUtil.paymentInfo(getPaymentInfoDataRequest);
                     payOrderPrivateCarCallback(orderPrivateCar1.getId(), getPaymentInfo.getPayId(), 1);
                     break;
                  }
                  Thread.sleep(wait);
                  num++;
               }
            } catch (Exception e) {
               e.printStackTrace();
            }finally {
               threadPoolExecutor.shutdown();
            }
				
         });
			
      }
      if (payType == 2) {//支付宝支付
         if (orderMoney == 0) {
@@ -2070,12 +2297,7 @@
         if (userInfo.getBalance() == null || userInfo.getBalance() < orderMoney) {
            return ResultUtil.error("余额不足，无法完成支付");
         }
//            if(orderMoney > 0){
//                resultUtil= appOrderController.moneyPay(orderId,userInfo.getId(),orderMoney);
//                if(resultUtil.getCode()==500){
//                    return ResultUtil.error("电子余额不足，无法完成支付");
//                }
//            }

         userInfo.setBalance(new BigDecimal(userInfo.getBalance()).subtract(new BigDecimal(orderMoney)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
         
         OpenCity openCity = openCityService.openCity1(orderPrivateCar.getStartLon().toString(), orderPrivateCar.getStartLat().toString());
@@ -2248,6 +2470,24 @@
         orderPrivateCar.setTelX("");
         this.updateById(orderPrivateCar);
         
         Driver driver = null;
         Company company = null;
         //中台修改订单状态
         ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
         request.setOrderId(orderPrivateCar.getTravelId());
         request.setStatus(orderPrivateCar.getState());
         if (null != orderPrivateCar.getDriverId()) {
            driver = driverService.selectById(orderPrivateCar.getDriverId());
            company = companyService.selectById(driver.getCompanyId());
            request.setDriverId(driver.getEmpId().toString());
            request.setSupplierShopId(company.getEnterCode());
         }
         if (2 == orderPrivateCar.getPromotion()) {
            Driver driver1 = driverService.selectById(orderPrivateCar.getPromotionDriverId());
            request.setPromoterId(driver1.getEmpId().toString());
         }
         OrderUtil.modifyTravelItinerary(request);
			
         query.setState(2);
         query.setCode(order_id);
         paymentRecordService.updateById(query);
@@ -2377,114 +2617,13 @@
      return orderPrivateCarMapper.queryInvoiceOrder(type, startTime, endTime, startMoney, endMoney, uid);
   }
   
   @Override
   public Map<String, Object> queryOrderInfo(Integer uid, Integer orderId) throws Exception {
      Map<String, Object> map = orderPrivateCarMapper.queryOrderInfo(orderId);
      if (null == map) {
         OrderTaxi orderTaxi = orderTaxiService.selectOne(new EntityWrapper<OrderTaxi>()
               .eq("userId", uid)
               .eq("isDelete", 1)
               .in("state", Arrays.asList(2, 3, 4, 5, 6, 7))
         );
         return orderTaxiService.queryOrderInfo(orderTaxi.getId());
      }
      if (null != map.get("reassignNotice") && Integer.valueOf(String.valueOf(map.get("reassignNotice"))) == 2) {//改派完成，重新获取了新的司机数据，开始修改数据防止继续调用
         OrderPrivateCar orderPrivateCar = this.selectById(orderId);
         orderPrivateCar.setReassignNotice(0);
         this.updateById(orderPrivateCar);
      }
      if (Integer.valueOf(String.valueOf(map.get("state"))) == 11) {
         map.put("state", map.get("oldState"));
      }
      if (Integer.valueOf(String.valueOf(map.get("state"))) != 8 && Integer.valueOf(String.valueOf(map.get("state"))) != 9) {
         map.put("redPacketMoney", null);
         map.put("couponMoney", null);
      }
		
      String driverId = (String) redisTemplate.opsForValue().get("DEVICE_" + map.get("driverId"));
      map.put("device", ToolUtil.isNotEmpty(driverId) ? 2 : 1);
      map.put("orderType", 1);
      return map;
   }
   
   @Override
   public List<Map<String, Object>> queryMyTravelRecord(Integer uid) throws Exception {
      return orderPrivateCarMapper.queryMyTravelRecord(uid);
   }
   
   /**
    * 获取服务中的订单数据
    *
    * @param uid
    * @return
    * @throws Exception
    */
   @Override
   public OrderServerWarpper queryOrderServer(Integer orderId, Integer uid) throws Exception {
      OrderPrivateCar orderPrivateCar = this.selectById(orderId);
      if (null == orderPrivateCar) {
         return orderTaxiService.queryOrderServer(orderId, uid);
      }
      //计算预计距离和剩余时间
      String value = (String) redisTemplate.opsForValue().get("DRIVER" + String.valueOf(orderPrivateCar.getDriverId()));
      if (null == value || "".equals(value)) {
         System.err.println("司机没有上传位置信息");
			
         //调用获取轨迹中的数据
         List<Map<String, Object>> list = orderPositionService.queryTrack(orderId, 2);
         if (list.size() > 0) {
            Map<String, Object> map = list.get(list.size() - 1);
            value = map.get("lon") + "," + map.get("lat");
         }
			
      }
		
      OrderServerWarpper orderServerWarpper = new OrderServerWarpper();
      orderServerWarpper.setOrderId(orderPrivateCar.getId());
      orderServerWarpper.setOrderType(1);
      orderServerWarpper.setState(orderPrivateCar.getState());
      orderServerWarpper.setLon(null != value ? value.split(",")[0] : "0.0");
      orderServerWarpper.setLat(null != value ? value.split(",")[1] : "0.0");
      orderServerWarpper.setReassignNotice(orderPrivateCar.getReassignNotice());
      if (orderPrivateCar.getState() == 2 || orderPrivateCar.getState() == 3) {//前往预约地
         // TODO: 2023/11/4 无法修改
         Map<String, String> distance = gdMapElectricFenceUtil.getDistance(value, orderPrivateCar.getStartLon() + "," + orderPrivateCar.getStartLat(), 1);
         String d = "0";
         String t = "0";
         if (null == distance) {
            System.err.println("查询距离出错了");
         } else {
            d = new BigDecimal(distance.get("distance")).divide(new BigDecimal(1000), new MathContext(2, RoundingMode.HALF_EVEN)).toString();
            t = new BigDecimal(distance.get("duration")).divide(new BigDecimal(60), new MathContext(2, RoundingMode.HALF_EVEN)).intValue() + "";
         }
         orderServerWarpper.setReservationMileage(d);
         orderServerWarpper.setReservationTime(t);
         orderServerWarpper.setServedMileage("0");
         orderServerWarpper.setServedTime("0");
         orderServerWarpper.setLaveMileage("0");
         orderServerWarpper.setLaveTime("0");
      }
      if (orderPrivateCar.getState() == 5 || orderPrivateCar.getState() == 6) {//服务中
         // TODO: 2023/11/4 无法修改
         Map<String, String> distance = gdMapElectricFenceUtil.getDistance(value, orderPrivateCar.getEndLon() + "," + orderPrivateCar.getEndLat(), 1);
         String d = "0";
         String t = "0";
         if (null == distance) {
            System.err.println("查询距离出错了");
         } else {
            d = new BigDecimal(distance.get("distance")).divide(new BigDecimal(1000), new MathContext(2, RoundingMode.HALF_EVEN)).toString();
            t = new BigDecimal(distance.get("duration")).divide(new BigDecimal(60), new MathContext(2, RoundingMode.HALF_EVEN)).intValue() + "";
         }
         orderServerWarpper.setReservationMileage("0");
         orderServerWarpper.setReservationTime("0");
         orderServerWarpper.setServedMileage(String.valueOf((null == orderPrivateCar.getMileage() ? 0 : orderPrivateCar.getMileage()) / 1000));
         orderServerWarpper.setServedTime(Long.valueOf((new Date().getTime() - orderPrivateCar.getStartServiceTime().getTime()) / 60000).intValue() + "");
         orderServerWarpper.setLaveMileage(d);
         orderServerWarpper.setLaveTime(t);
      }
		
      return orderServerWarpper;
   }

   
   /**
    * 获取下单推送完后没有司机接单的提醒
@@ -2598,7 +2737,7 @@
      paymentRecordService.updateById(query);
      OpenCity openCity = openCityService.openCity1(orderPrivateCar.getStartLon().toString(), orderPrivateCar.getStartLat().toString());
      SysIntegral query1 = sysIntegralMapper.query(openCity.getId());
      System.out.println("query1:" + query1);
//      System.out.println("query1:" + query1);
      userInfo.setIntegral(userInfo.getIntegral() + (query.getAmount().intValue() * query1.getIntegral()));//积分
      
      //添加交易明细
@@ -2813,8 +2952,62 @@
      }
      orderPrivateCar.setAbnormalIntro(abnormalIntro);
      orderPrivateCar.setAbnormalImg(abnormalImg);
      orderPrivateCar.setAbnormal(1);
      orderPrivateCar.setAbnormal(2);
      this.baseMapper.updateById(orderPrivateCar);
      
   }

   @Override
   public void promotion(Integer orderId) {
      OrderPrivateCar orderPrivateCar = this.baseMapper.selectById(orderId);
      UserInfo userInfo = userInfoService.selectById(orderPrivateCar.getUserId());
//      if(userInfo.getBindDriverId()!=null && userInfo.getBindExpireDate().getTime()<=System.currentTimeMillis()){
      // 开始绑定的  后面到期也结算
      if(orderPrivateCar.getPromotionDriverId()!=null ){
         String registAreaCode = userInfo.getRegistAreaCode();
         TDriverPromotionActivity tDriverPromotionActivity = driverPromotionActivityService.selectOne(new EntityWrapper<TDriverPromotionActivity>().eq("districtCode", registAreaCode).ge("startTime", new Date()).lt("endTime", new Date()).last("AND FIND_IN_SET(" + 1 + ", bizType) limit 1"));
         if(tDriverPromotionActivity!=null){
            Double payMoney = orderPrivateCar.getPayMoney();
            BigDecimal bigDecimal = tDriverPromotionActivity.getCommissionRatio().divide(new BigDecimal(100), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(payMoney)).setScale(2, RoundingMode.HALF_UP);
            orderPrivateCar.setPromotionDriverId(userInfo.getBindDriverId());
            orderPrivateCar.setPromotionMoney(bigDecimal);
            orderPrivateCar.setPromotionActivityId(tDriverPromotionActivity.getId());
            this.baseMapper.updateById(orderPrivateCar);
         }
      }

      // 是否异常订单
        if (orderPrivateCar.getResponsibilityType() !=null && orderPrivateCar.getResponsibilityType() >2) {
         TAbnormalPayOrder tAbnormalPayOrder = abnormalPayOrderMapper.selectList(new EntityWrapper<TAbnormalPayOrder>().eq("type", 1).eq("orderNum", orderPrivateCar.getOrderNum())).stream().findFirst().orElse(null);
         if (tAbnormalPayOrder != null) {
            tAbnormalPayOrder.setPayStatus(2);
            tAbnormalPayOrder.setPayTime(new Date());
            abnormalPayOrderMapper.updateById(tAbnormalPayOrder);
         }
      }
   }

   @Override
   public List<Map<String, Object>> queryMyTripList(Integer uid, Integer pageNum, Integer size) throws Exception {
      pageNum = (pageNum - 1) * size;
      List<Map<String, Object>> maps = orderPrivateCarMapper.queryMyTripList(uid, pageNum, size);
      for (Map<String, Object> map : maps) {
         if (Integer.valueOf(String.valueOf(map.get("state"))) == 11) {
            map.put("state", map.get("oldState"));
         }
      }
      return maps;
   }

   @Override
   public List<Map<String, Object>> queryMyTripListAll(Integer uid) throws Exception {

      List<Map<String, Object>> maps = orderPrivateCarMapper.queryMyTripListAll(uid);
      for (Map<String, Object> map : maps) {
         if (Integer.valueOf(String.valueOf(map.get("state"))) == 11) {
            map.put("state", map.get("oldState"));
         }
      }
      return maps;
   }
}