update

liujie

2025-08-04 56fc347f856b9cbd61c0191c94694f8326470e8a

update

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

@@ -583,8 +583,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("请先绑定手机号码");
                    }
@@ -610,11 +611,11 @@
                    orderPrivateCar.setPromotionDriverId(promotion);
                }


                this.insert(orderPrivateCar);
				
                //判断独享，一口价，拼车
                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");
@@ -699,6 +700,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();
@@ -1036,7 +1053,9 @@
                    Driver driver2 = driverService.selectById(orderPrivateCar.getPromotionDriverId());
                    request.setPromoterId(driver2.getEmpId().toString());
                }
                OrderUtil.modifyTravelItinerary(request);
                if(orderPrivateCar.getTravelId()!=null){
                    OrderUtil.modifyTravelItinerary(request);
                }
            }
        } else {
            OpenCity openCity = openCityService.openCity1(orderPrivateCar.getStartLon().toString(), orderPrivateCar.getStartLat().toString());

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java

@@ -97,7 +97,9 @@
        first = baseWarppers.stream().filter(s->s.getId() == 2).findFirst();
        if(first.isPresent()){
            serverCarModelWarpper = this.getTextPrice(query.getId(), distance1_, duration_, 0, 2, geocode);
            price.add(serverCarModelWarpper);
            if(serverCarModelWarpper!=null){
                price.add(serverCarModelWarpper);
            }
        }
        return ResultUtil.success(price);
    }

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java

@@ -242,6 +242,8 @@
     * @return 行程单ID
     */
    public static String createTravelItinerary(CreateTravelItineraryRequest request) {
        request.setScene("TRAFFIC");
        request.setPartnerId("522700");
        //请求路径
        String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/createTravelItinerary";
        //私钥文件