Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong

Pu Zhibing

2025-08-06 7bcae80ff6b040cc91d04c28481af5e2993fc45a

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/CallbackController.java

@@ -2,6 +2,7 @@

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.account.service.ITEnterpriseWithdrawalService;
import com.stylefeng.guns.modular.account.service.UserWithdrawalService;
@@ -31,6 +32,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

/**
@@ -158,6 +160,12 @@
                orderPrivateCar.setVoice(fileUrl);
                orderPrivateCar.setVoiceTime(new Date());
                orderPrivateCarService.updateById(orderPrivateCar);
                List<OrderPrivateCar> orderPrivateCars = orderPrivateCarService.selectList(new EntityWrapper<OrderPrivateCar>().eq("pid", orderId));
                for(OrderPrivateCar orderPrivateCar1 : orderPrivateCars){
                    orderPrivateCar1.setVoice(fileUrl);
                    orderPrivateCar1.setVoiceTime(new Date());
                    orderPrivateCarService.updateById(orderPrivateCar1);
                }
            }
            if("2".equals(orderType)){
                OrderTaxi orderTaxi = orderTaxiService.selectById(orderId);

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

@@ -15,6 +15,7 @@
import com.stylefeng.guns.modular.system.dao.UserInfoMapper;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.service.impl.OpenCityServiceImpl;
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.CreateTravelItineraryRequest;
@@ -39,6 +40,9 @@

    @Resource
    private SystemPriceMapper systemPriceMapper;

    @Autowired
    private ISystemPriceCityService systemPriceCityService;

    @Autowired
    private IDriverService driverService;
@@ -103,11 +107,13 @@
    
    @Resource
    private RedisTemplate<String, Object> redisTemplate;
    



    @Resource
    private IOpenCityService openCityService;
    
    


    /**
     * 获取司机端首页订单列表
     *
@@ -1048,7 +1054,9 @@
     * @throws Exception
     */
    public OrderPrivateCar setMoney(OrderPrivateCar orderPrivateCar, Double parkingFee, Double crossingFee) throws Exception {
        Map<String, Object> query1 = systemPriceMapper.query(orderPrivateCar.getCompanyId(), 1, orderPrivateCar.getServerCarModelId());
        Map<String, String> geocode = gdMapGeocodingUtil.geocode(orderPrivateCar.getStartLon().toString(), orderPrivateCar.getStartLat().toString());
        SystemPriceCity systemPriceCity = systemPriceCityService.queryOne(geocode.get("provinceCode"), geocode.get("cityCode"), geocode.get("districtCode"));
        Map<String, Object> query1 = systemPriceMapper.query(systemPriceCity.getId(), 1, orderPrivateCar.getServerCarModelId());
        //开始根据不同的方式计算金额
        double amount = 0;
        JSONObject jsonObject = JSON.parseObject(String.valueOf(query1.get("content")));

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SystemPriceCityMapper.java

New file
@@ -0,0 +1,11 @@
package com.stylefeng.guns.modular.system.dao;

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.stylefeng.guns.modular.system.model.SystemPriceCity;

/**
 * @author zhibing.pu
 * @Date 2025/7/26 9:24
 */
public interface SystemPriceCityMapper extends BaseMapper<SystemPriceCity> {
}

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SystemPriceMapper.java

@@ -11,10 +11,10 @@

    /**
     * 获取价格
     * @param companyId
     * @param systemPriceCityId
     * @param type
     * @return
     */
    Map<String, Object> query(@Param("companyId") Integer companyId, @Param("type") Integer type,
    Map<String, Object> query(@Param("systemPriceCityId") Integer systemPriceCityId, @Param("type") Integer type,
                              @Param("serverCarModelId") Integer serverCarModelId);
}

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SystemPriceCityMapper.xml

New file
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.stylefeng.guns.modular.system.dao.SystemPriceCityMapper">

</mapper>

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SystemPriceMapper.xml

@@ -24,7 +24,7 @@
        contentExclusive as contentExclusive,
        contentPrice as contentPrice,
        isOpen as isOpen
        from t_system_price where state = 1 and companyId = #{companyId}
        from t_system_price where state = 1 and systemPriceCityId = #{systemPriceCityId}
        <if test="null != type">
            and `type` = #{type}
        </if>

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SystemPriceCity.java

New file
@@ -0,0 +1,44 @@
package com.stylefeng.guns.modular.system.model;

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
import lombok.Data;

/**
 * @author zhibing.pu
 * @Date 2025/7/26 9:16
 */
@Data
@TableName("t_system_price_city")
public class SystemPriceCity extends BaseBean {
    /**
     * 省编号
     */
    @TableField("areaCode")
    private String areaCode;
    /**
     * 省名称
     */
    @TableField("areaName")
    private String areaName;
    /**
     * 市编号
     */
    @TableField("cityCode")
    private String cityCode;
    /**
     * 市名称
     */
    @TableField("cityName")
    private String cityName;
    /**
     * 区县编号
     */
    @TableField("provinceCode")
    private String provinceCode;
    /**
     * 区县名称
     */
    @TableField("provinceName")
    private String provinceName;
}

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ISystemPriceCityService.java

New file
@@ -0,0 +1,22 @@
package com.stylefeng.guns.modular.system.service;

import com.baomidou.mybatisplus.service.IService;
import com.stylefeng.guns.modular.system.model.SystemPriceCity;

/**
 * @author zhibing.pu
 * @Date 2025/7/26 9:24
 */
public interface ISystemPriceCityService extends IService<SystemPriceCity> {
	
	
    /**
     * 查询匹配的数据
     * @param provinceCode
     * @param cityCode
     * @param districtCode
     * @return
     */
    SystemPriceCity queryOne(String provinceCode, String cityCode, String districtCode);
	
}

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java

@@ -132,32 +132,33 @@
            reassignMapper.deleteById(query.getId());
        }
        query = reassignMapper.query(uid, null, reassign.getOrderId(), reassign.getOrderType(), 2);
        int types=1;
        if (null != query) {
            return ResultUtil.error("您提交的申请正在处理中");
            types=2;
//            return ResultUtil.error("您提交的申请正在处理中");
        }

        //获取支付金额
        Double aDouble = orderService.queryReassignMoney(reassign.getOrderId(), reassign.getOrderType());
        reassign.setMoney(aDouble);
        reassign.setOriginalDriverId(uid);
        reassign.setOriginalCarId(driver.getCarId());
        reassign.setInsertTime(new Date());
        this.insert(reassign);

        systemNoticeService.addSystemNotice(2, "您的改派申请已成功提交，我们会尽快为你处理！", uid, 1);
//        Double aDouble = orderService.queryReassignMoney(reassign.getOrderId(), reassign.getOrderType());
//        reassign.setMoney(aDouble);
//        reassign.setOriginalDriverId(uid);
//        reassign.setOriginalCarId(driver.getCarId());
//        reassign.setInsertTime(new Date());
//        this.insert(reassign);
//        systemNoticeService.addSystemNotice(2, "您的改派申请已成功提交，我们会尽快为你处理！", uid, 1);

        //开始支付
        if (null != reassign.getPayType()) {
            if (reassign.getPayType() == 1) {//微信支付
                reassign.setState(1);

                resultUtil = payMoneyUtil.weixinpay("改派订单", "", reassign.getId() + "_" + reassign.getOrderType() + "_" + UUIDUtil.getRandomCode(5), aDouble.toString(), "/base/wxReassign", "APP", "");
                paymentRecordService.saveData(1, uid, 2, reassign.getOrderId(), reassign.getOrderType(), 1, aDouble, "", 1);//添加预支付数据
                resultUtil = payMoneyUtil.weixinpay("改派订单", "", reassign.getId() + "_" + reassign.getOrderType() + "_" + UUIDUtil.getRandomCode(5), "0", "/base/wxReassign", "APP", "");
                paymentRecordService.saveData(1, uid, 2, reassign.getOrderId(), reassign.getOrderType(), 1, 0.0, "", 1);//添加预支付数据
            }
            if (reassign.getPayType() == 2) {//支付宝
                reassign.setState(1);
                resultUtil = payMoneyUtil.alipay("改派订单", "改派订单", "", reassign.getId() + "_" + reassign.getOrderType() + "_" + UUIDUtil.getRandomCode(5), aDouble.toString(), "/base/aliReassign");
                paymentRecordService.saveData(1, uid, 2, reassign.getOrderId(), reassign.getOrderType(), 2, aDouble, "", 1);//添加预支付数据
                resultUtil = payMoneyUtil.alipay("改派订单", "改派订单", "", reassign.getId() + "_" + reassign.getOrderType() + "_" + UUIDUtil.getRandomCode(5), "0", "/base/aliReassign");
                paymentRecordService.saveData(1, uid, 2, reassign.getOrderId(), reassign.getOrderType(), 2, 0.0, "", 1);//添加预支付数据
            }
            if (reassign.getPayType() == 3) {//余额
                reassign.setState(2);
@@ -207,7 +208,7 @@
                        //添加已收入明细
//                        incomeService.saveData(1, orderPrivateCar.getCompanyId(), 4, orderPrivateCar.getId(), 1, reassign.getMoney());
                        // qyt 改派直接推送
                        pushOrderPrivate(orderPrivateCar, uid);
                        pushOrderPrivate(orderPrivateCar, uid,types);
                        break;
                    case 2:
                        OrderTaxi orderTaxi = orderTaxiService.selectById(reassign.getOrderId());
@@ -233,7 +234,7 @@
//                        incomeService.saveData(1, orderTaxi.getCompanyId(), 4, orderTaxi.getId(), 2, reassign.getMoney());

                        // qyt 改派直接推送
                        pushOrderTaxi(orderTaxi, uid);
                        pushOrderTaxi(orderTaxi, uid,types);
                        break;
                    case 4:
                        OrderLogistics orderLogistics = orderLogisticsService.selectById(reassign.getOrderId());
@@ -267,14 +268,13 @@
//                    jgPushUtil.push(2,"有新的改派订单需要处理，请及时处理！", "订单改派", map, "DISPATCH" + dispatch.getId());
//                }


            }
            if (reassign.getPayType() == 4) {
                // TODO 司机云闪付 改派调起云闪付
                Double payMoney = reassign.getMoney();
                paymentRecordService.saveData(1, uid, 2, reassign.getOrderId(), reassign.getOrderType(), 4, aDouble, "", 1);//添加预支付数据
                resultUtil = placeAnOrder(new BigDecimal(payMoney), 4, 1, reassign.getId());
            }
//            if (reassign.getPayType() == 4) {
//                // TODO 司机云闪付 改派调起云闪付
//                Double payMoney = reassign.getMoney();
//                paymentRecordService.saveData(1, uid, 2, reassign.getOrderId(), reassign.getOrderType(), 4, aDouble, "", 1);//添加预支付数据
//                resultUtil = placeAnOrder(new BigDecimal(payMoney), 4, 1, reassign.getId());
//            }
        }
        return resultUtil;
    }
@@ -746,7 +746,7 @@
     * @param orderTaxi
     * @throws Exception
     */
    public void pushOrderTaxi(OrderTaxi orderTaxi, Integer uid) throws Exception {
    public void pushOrderTaxi(OrderTaxi orderTaxi, Integer uid,int type) throws Exception {
        new Thread(new Runnable() {
            @Override
            public void run() {
@@ -759,7 +759,12 @@
                    }
                    OpenCity openCity = openCityService.openCity1(orderTaxi.getStartLon().toString(), orderTaxi.getStartLat().toString());
                    List<PushOrder> querys = pushOrderService.querys(null, 2, openCity.getId());//获取需要推送的次数
                    for (int i = 1; i <= 6; i++) {
                    int size=1;
                    if(type==2){
                        size = 6;
                    }

                    for (int i = 1; i <= size; i++) {
                        int finalI = i;
                        PushOrder pushOrder = querys.stream().filter(s -> s.getType() == (finalI <= 3 ? finalI : 3)).findFirst().orElse(null);
                        System.out.println("pushOrder:" + pushOrder);
@@ -812,7 +817,7 @@
     * @param orderPrivateCar
     * @throws Exception
     */
    public void pushOrderPrivate(OrderPrivateCar orderPrivateCar, Integer uid) throws Exception {
    public void pushOrderPrivate(OrderPrivateCar orderPrivateCar, Integer uid,int type) throws Exception {
        new Thread(new Runnable() {
            @Override
            public void run() {
@@ -827,7 +832,11 @@
                    }
                    OpenCity openCity = openCityService.openCity1(orderPrivateCar.getStartLon().toString(), orderPrivateCar.getStartLat().toString());
                    List<PushOrder> querys = pushOrderService.querys(null, 1, openCity.getId());//获取需要推送的次数
                    for (int i = 1; i <= 6; i++) {
                    int size=1;
                    if(type==2){
                        size=6;
                    }
                    for (int i = 1; i <= size; i++) {
                        OrderPrivateCar orderPrivateCar = orderPrivateCarService.selectById(id);
                        if (null == orderPrivateCar || (orderPrivateCar.getState() > 1 && orderPrivateCar.getState() != 11)) {
                            break;

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SystemPriceCityServiceImpl.java

New file
@@ -0,0 +1,36 @@
package com.stylefeng.guns.modular.system.service.impl;


import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.modular.system.dao.SystemPriceCityMapper;
import com.stylefeng.guns.modular.system.model.SystemPriceCity;
import com.stylefeng.guns.modular.system.service.ISystemPriceCityService;
import org.springframework.stereotype.Service;

/**
 * @author zhibing.pu
 * @Date 2025/7/26 9:25
 */
@Service
public class SystemPriceCityServiceImpl extends ServiceImpl<SystemPriceCityMapper, SystemPriceCity> implements ISystemPriceCityService {
	
	
    /**
     * 查询匹配数据
     * @param provinceCode
     * @param cityCode
     * @param districtCode
     * @return
     */
    @Override
    public SystemPriceCity queryOne(String provinceCode, String cityCode, String districtCode) {
        SystemPriceCity systemPriceCity = this.selectOne(new EntityWrapper<SystemPriceCity>().eq("areaCode", provinceCode).eq("cityCode", cityCode).eq("provinceCode", districtCode));
        if(null == systemPriceCity){
            systemPriceCity = this.selectOne(new EntityWrapper<SystemPriceCity>().eq("areaCode", provinceCode).eq("cityCode", cityCode));
            if(null == systemPriceCity){
                systemPriceCity = this.selectOne(new EntityWrapper<SystemPriceCity>().eq("areaCode", provinceCode));
            }
        }
        return systemPriceCity;
    }}

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongProperties.java

@@ -16,8 +16,8 @@
    /**
     * 私钥地址
     */
//    String privateKeyPath = "C:\\Users\\Admin\\Desktop\\qyt\\private_key_test.pem";
    String privateKeyPath = "C:\\Users\\39373\\Desktop\\黔云通\\private_key_test.pem";
    String privateKeyPath = "C:\\Users\\Admin\\Desktop\\qyt\\private_key_test.pem";
//    String privateKeyPath = "C:\\Users\\39373\\Desktop\\黔云通\\private_key_test.pem";
    /**
     * 私钥地址
     */

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/config/web/WebConfig.java

@@ -206,7 +206,7 @@
            registrationBean.addInitParameter("edu.yale.its.tp.cas.client.filter.loginUrl", "https://testsso1.teamshub.com/login");
            registrationBean.addInitParameter("edu.yale.its.tp.cas.client.filter.validateUrl", "https://testsso1.teamshub.com/serviceValidate");
            registrationBean.addInitParameter("com.oncon.md.loginUrl", "https://testsso1.teamshub.com/sso-session/login");
            registrationBean.addInitParameter("edu.yale.its.tp.cas.client.filter.serverName", "http://127.0.0.1:8010");
            registrationBean.addInitParameter("edu.yale.its.tp.cas.client.filter.serverName", "http://192.168.110.111:8010");
        }
        if("test".equals(activeProfile)){
            registrationBean.setFilter(onconMDCasFilter);

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java

@@ -115,7 +115,8 @@
        }
        //查询当前用户所属分公司/加盟商
        model.addAttribute("objectName", tCompanyService.selectById(shiroExtUtil.getUser().getObjectId()).getName());
    
        model.addAttribute("objectId", tCompanyService.selectById(shiroExtUtil.getUser().getObjectId()).getId());

        //车辆品牌
        List<TCarBrand> brandList = tCarBrandService.selectList(new EntityWrapper<TCarBrand>().eq("state", 1));
        model.addAttribute("brandList",brandList);
@@ -157,7 +158,8 @@
        Integer roleType = shiroExtUtil.getUser().getRoleType();
        model.addAttribute("roleType", roleType);
        model.addAttribute("objectName", tCompanyService.selectById(shiroExtUtil.getUser().getObjectId()).getName());
    
        model.addAttribute("objectId", tCompanyService.selectById(shiroExtUtil.getUser().getObjectId()).getId());

        if (1 == roleType) {
            List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2).eq("state", 0).ne("flag", 3));
            model.addAttribute("companyList", companyList);
@@ -241,7 +243,7 @@
        Integer roleType = shiroExtUtil.getUser().getRoleType();
        model.addAttribute("roleType", roleType);
        model.addAttribute("objectName", tCompanyService.selectById(shiroExtUtil.getUser().getObjectId()).getName());

        model.addAttribute("objectId", tCompanyService.selectById(shiroExtUtil.getUser().getObjectId()).getId());
        if (1 == roleType) {
            List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2).eq("state", 0).ne("flag", 3));
            model.addAttribute("companyList", companyList);

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TAbnormalOrderCarController.java

@@ -291,6 +291,9 @@
        }
        abnormal = 2;
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        if(type==null){
            type=1;
        }
        // 快车
        if(type==1){
            page.setRecords(tOrderPrivateCarService.getPrivateCarOrderList(page, beginTime, endTime, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(),
@@ -676,7 +679,7 @@
            tOrderPrivateCar.setAbnormalStatus(2);
            if(responsibilityTypeVal>3){
                tOrderPrivateCar.setResponsibilityMoney(tOrderPrivateCar.getPayMoney());
                tOrderPrivateCar.setPayMoney(new BigDecimal(money));
                tOrderPrivateCar.setOrderMoney(new BigDecimal(money));
            }
            if(responsibilityTypeVal>2){
                // 追偿订单记录表
@@ -708,7 +711,7 @@
            tOrderCrossCity.setAbnormalStatus(2);
            if(responsibilityTypeVal>3) {
                tOrderCrossCity.setResponsibilityMoney(tOrderCrossCity.getPayMoney());
                tOrderCrossCity.setPayMoney(new BigDecimal(money));
                tOrderCrossCity.setOrderMoney(new BigDecimal(money));
            }
            if(responsibilityTypeVal>2){
                // 追偿订单记录表
@@ -739,7 +742,7 @@
            tOrderTaxi.setAbnormalStatus(2);
            if(responsibilityTypeVal>3) {
                tOrderTaxi.setResponsibilityMoney(tOrderTaxi.getPayMoney());
                tOrderTaxi.setPayMoney(new BigDecimal(money));
                tOrderTaxi.setOrderMoney(new BigDecimal(money));
            }
            if(responsibilityTypeVal>2){
                // 追偿订单记录表

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongConfig.java

@@ -161,7 +161,7 @@
    public QianYunTongConfig getQianYunTongConfig() {
        if("dev".equals(activeProfile)){
            this.appkey = "10001104";
            this.privateKeyPath = "C:\\Users\\Admin\\Desktop\\private_key_test.pem";
            this.privateKeyPath = "C:\\Users\\Admin\\Desktop\\qyt\\private_key_test.pem";
            this.userName = "xiaofei";
            this.status = "1";
            this.setApiUrl("https://test-zhongtai.stqcloud.com:10070");

 ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAbnormalOrderCar/tAbnormalOrder_orderDetail.html

@@ -165,6 +165,7 @@
     <input type="hidden" id="type" name ="type" value="${type}"/>
     <input type="hidden" id="orderId" name ="orderId" value="${item.id}"/>
     <input type="hidden" id="payMoney" name ="payMoney" value="${item.payMoney}"/>
     <input type="hidden" id="orderMoney" name ="payMoney" value="${item.orderMoney}"/>
     <div class="ibox float-e-margins">
        <div class="title">处理异常订单</div>
        <div class="section-title">订单信息</div>
@@ -397,11 +398,11 @@
         let remark = document.querySelector('textarea[name=handleRemark]').value;
        // 取money
         let money = $("#money").val();
         let payMoney = $("#payMoney").val();
         let orderMoney = $("#orderMoney").val();
         let type = document.querySelector('input[name=type]').value;
         let orderNum = document.querySelector('input[name=orderNum]').value;
         console.log(responsibilityTypeVal,money,payMoney)
         if(responsibilityTypeVal>3 && money>payMoney){
         console.log(responsibilityTypeVal,money,orderMoney)
         if(responsibilityTypeVal>3 && money>orderMoney){
             Feng.error("需小于等于原订单金额!");
             return;
         }

 ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_add.html

@@ -30,6 +30,9 @@
                                </select>
                            <!--</div>-->
                            @}else if(roleType == 2){
                            <select class="form-control companyDiv" id="oneId" onchange="TCarInfoDlg.oneChange(this)" style="width: 200px;display: none;">
                                <option value="${objectId}">${objectName}</option>
                            </select>
                            <span class="control-label">${objectName!}</span>
                            <select class="form-control" id="franchiseeId"  style="width: 200px;margin-left: 30px;">
                                <option value="">选择所属加盟商</option>
@@ -229,6 +232,12 @@
    var allDrivers = [];
var selectedDrivers = []; // 选中司机id数组
var driverMap = {}; // id->name
    $(function() {

        // 2. 触发 change 拉取司机
        $('#oneId').trigger('change');

    });

// 监听分公司选择，拉取司机
$('#oneId').on('change', function() {

 ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_edit.html

@@ -32,6 +32,10 @@
                                @}
                            </select>
                            @}else if(roleType == 2){

                            <select class="form-control companyDiv" id="oneId" onchange="TCarInfoDlg.oneChange(this)" style="width: 200px;display: none;">
                                <option value="${objectId}">${objectName}</option>
                            </select>
                            <span class="control-label">${objectName!}</span>
                            <select class="form-control" id="franchiseeId"  style="width: 200px;margin-left: 30px;">
                                <option value="">选择所属加盟商</option>

 ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_edit1.html

@@ -32,6 +32,9 @@
                                @}
                            </select>
                            @}else if(roleType == 2){
                            <select class="form-control companyDiv" id="oneId" onchange="TCarInfoDlg.oneChange(this)" style="width: 200px;display: none;">
                                <option value="${objectId}">${objectName}</option>
                            </select>
                            <span class="control-label">${objectName!}</span>
                            <select class="form-control" id="franchiseeId"  style="width: 200px;margin-left: 30px;">
                                <option value="">选择所属加盟商</option>