新增加管理后台顺风车相关配置

Pu Zhibing

2025-08-01 38a87f638d7d0bf0a734053afc060b91bc742567

新增加管理后台顺风车相关配置

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

@@ -199,6 +199,10 @@
                businessType = 4;
            }else if ("包车".equals(type)){
                businessType = 6;
            }else if ("顺风车".equals(type)){
                businessType = 8;
            }else if ("代驾".equals(type)){
                businessType = 9;
            }else{
                businessType = 7;
            }

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCompanyMapper.xml

@@ -79,7 +79,9 @@
        case when cc.isCross = 1 then '跨城出行,' else '' end,
        case when cc.isCrossLogistics = 1 then '跨城小件物流,' else '' end,
        case when cc.isSameLogistics = 1 then '同城小件物流,' else '' end,
        case when cc.isCharter = 1 then '包车,' else '' end) as serverStr,
        case when cc.isCharter = 1 then '包车,' else '' end,
        case when cc.isHitchRide = 1 then '顺风车,' else '' end,
        case when cc.isSubstituteDriving = 1 then '代驾,' else '' end) as serverStr,
        cc.* FROM t_company as cc
        LEFT JOIN (SELECT * FROM sys_user where roleType = 2) as ui on ui.objectId = cc.id
        LEFT JOIN (SELECT COUNT(id) as num,superiorId FROM t_company where type = 3 and flag != 3 GROUP BY superiorId) as ci on ci.superiorId = cc.id
@@ -138,7 +140,9 @@
        case when cc.isCross = 1 then '跨城出行,' else '' end,
        case when cc.isCrossLogistics = 1 then '跨城小件物流,' else '' end,
        case when cc.isSameLogistics = 1 then '同城小件物流,' else '' end,
        case when cc.isCharter = 1 then '包车,' else '' end) as serverStr,
        case when cc.isCharter = 1 then '包车,' else '' end,
        case when cc.isHitchRide = 1 then '顺风车,' else '' end,
        case when cc.isSubstituteDriving = 1 then '代驾,' else '' end) as serverStr,
        cc.* FROM t_company as cc
        LEFT JOIN (SELECT * FROM sys_user where roleType = 3) as ui on ui.objectId = cc.id
        LEFT JOIN (select * from t_company where type = 2 and flag != 3) as ci on ci.id = cc.superiorId

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOpenCityMapper.xml

@@ -21,7 +21,8 @@

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, code, lon, lat, isQualifications, areaName, cityName, provinceName, flag, insertTime, insertUser, updateTime, updateUser
        id
        , code, lon, lat, isQualifications, areaName, cityName, provinceName, flag, insertTime, insertUser, updateTime, updateUser
    </sql>

    <!--根据条件查询开通城市列表-->
@@ -36,6 +37,8 @@
        when businessType = 5 then '跨城小件物流'
        when businessType = 6 then '包车'
        when businessType = 7 then '95128电召'
        when businessType = 8 then '顺风车'
        when businessType = 9 then '代驾'
        else '' end),' ：',sort)) as str,openCityId from t_open_city_business where flag != 3 GROUP BY openCityId
        ) as ocb on ocb.openCityId = oc.id) as o
        <where>
@@ -44,7 +47,8 @@
                AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
            </if>
            <if test="condition != null and condition != ''">
                and (o.areaName LIKE CONCAT('%',#{condition},'%') or o.cityName LIKE CONCAT('%',#{condition},'%') or o.provinceName LIKE CONCAT('%',#{condition},'%'))
                and (o.areaName LIKE CONCAT('%',#{condition},'%') or o.cityName LIKE CONCAT('%',#{condition},'%') or
                o.provinceName LIKE CONCAT('%',#{condition},'%'))
            </if>
        </where>
        order by o.id desc
@@ -53,15 +57,21 @@
    <!--根据城市ID获取经营业务-->
    <select id="getBusinessByCityId" resultType="map">
        SELECT DATE_FORMAT(bb.insertTime,'%Y-%m-%d') as insertTimeStr,
        case when bb.businessType = 1 then '快车'
               case
                   when bb.businessType = 1 then '快车'
        when bb.businessType = 2 then '出租车'
        when bb.businessType = 3 then '跨城出行'
        when bb.businessType = 4 then '同城小件物流'
        when bb.businessType = 5 then '跨城小件物流'
        when bb.businessType = 6 then '包车'
        when bb.businessType = 7 then '95128电召'
        else '' end as businessTypeStr,bb.*
        FROM t_open_city_business as bb where bb.openCityId = #{openCityId} and bb.flag != 3
                   when businessType = 8 then '顺风车'
                   when businessType = 9 then '代驾'
                   else '' end                        as businessTypeStr,
               bb.*
        FROM t_open_city_business as bb
        where bb.openCityId = #{openCityId}
          and bb.flag != 3
    </select>

</mapper>

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCompany.java

@@ -55,6 +55,14 @@
     */
    private Integer isCharter;
    /**
     * 是否经营顺风车（1=是，2=否）
     */
    private Integer isHitchRide;
    /**
     * 是否经营代驾（1=是，2=否）
     */
    private Integer isSubstituteDriving;
    /**
     * 快车提成方式(1=比例，2=固定)
     */
    private Integer isSpeFixedOrProportional;
@@ -852,6 +860,22 @@
        this.enterNew = enterNew;
    }
    
    public Integer getIsHitchRide() {
        return isHitchRide;
    }
    
    public void setIsHitchRide(Integer isHitchRide) {
        this.isHitchRide = isHitchRide;
    }
    
    public Integer getIsSubstituteDriving() {
        return isSubstituteDriving;
    }
    
    public void setIsSubstituteDriving(Integer isSubstituteDriving) {
        this.isSubstituteDriving = isSubstituteDriving;
    }
    
    @Override
    protected Serializable pkVal() {
        return this.id;

 ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/platformEdit.html

@@ -37,7 +37,8 @@
                    <#input id="regCapital" name="注册资本" value="${item.regCapital}" />
                    <#input id="driverNum" name="注册网络预约车驾驶员数量" value="${item.driverNum}" />
                    <#input id="legalId" name="法人代表身份证号" value="${item.legalId}" />
                    <#avatar id="idCardPositive" name="法定代表人身份<br>证照片(正面)：" avatarImg="${item.idCardPositive}"/>
                    <#avatar id="idCardPositive" name="法定代表人身份<br>证照片(正面)："
                    avatarImg="${item.idCardPositive}"/>
                    <#input id="contactAddress" name="通信地址" value="${item.contactAddress}"/>
                </div>

@@ -51,7 +52,8 @@
                    <#input id="carNum" name="注册网络预约出租车<br>车辆数" value="${item.carNum}"/>
                    <#input id="legalName" name="法人代表姓名" value="${item.legalName}"/>
                    <#input id="legalPhone" name="法人代表电话" value="${item.legalPhone}"/>
                    <#avatar id="idCardReverse" name="法定代表人身份<br>证照片(反面)：" avatarImg="${item.idCardReverse}"/>
                    <#avatar id="idCardReverse" name="法定代表人身份<br>证照片(反面)："
                    avatarImg="${item.idCardReverse}"/>
                    <#input id="businessScope" name="经营范围" value="${item.businessScope}"/>
                </div>
            </div>
@@ -62,30 +64,35 @@
                        <div class="col-sm-10">
                            <fieldset>
                                <div class="checkbox checkbox-success">
                                    <input name="checkbox" id="checkbox1" type="checkbox" value="1" ${1 == item.isSpe ? 'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox1()">
                                    <input name="checkbox" id="checkbox1" type="checkbox" value="1" ${1== item.isSpe ?
                                    'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox1()">
                                    <label for="checkbox1">
                                        快车
                                    </label>
                                    <fieldset>
                                        <#button  btnCss="info" name="设置司机抽成" id="Spe1" icon="fa-check" clickFun="TLineInfoDlg.set1('Spe')"/>
                                        <#button btnCss="info" name="设置司机抽成" id="Spe1" icon="fa-check"
                                        clickFun="TLineInfoDlg.set1('Spe')"/>
                                        <textarea id="Spe" rows="5" cols="50" hidden="hidden" value="${item.Spe}">${item.Spe}</textarea>

                                    </fieldset>
                                </div>
                                <div class="checkbox checkbox-primary">
                                    <input name="checkbox" id="checkbox2" type="checkbox" value="2" ${1 == item.isTaxi ? 'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox2()">
                                    <input name="checkbox" id="checkbox2" type="checkbox" value="2" ${1== item.isTaxi ?
                                    'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox2()">
                                    <label for="checkbox2">
                                        出租车
                                    </label>
                                    <fieldset>
                                        <div class="row" style="display: none;" id="czDiv">
                                            <#button btnCss="info" name="设置司机抽成" id="rakeRate" icon="fa-check" clickFun="TLineInfoDlg.set1('Taxi')"/>
                                            <#button btnCss="info" name="设置司机抽成" id="rakeRate" icon="fa-check"
                                            clickFun="TLineInfoDlg.set1('Taxi')"/>
                                            <textarea id="Taxi" rows="5" cols="50" hidden="hidden" value="${item.Taxi}" >${item.Taxi}</textarea>
                                        </div>
                                    </fieldset>
                                </div>
                                <div class="checkbox checkbox-success">
                                    <input name="checkbox" id="checkbox3" type="checkbox" value="3" ${1 == item.isCross ? 'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox3()">
                                    <input name="checkbox" id="checkbox3" type="checkbox" value="3" ${1== item.isCross ?
                                    'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox3()">
                                    <label for="checkbox3">
                                        跨城出行
                                    </label>
@@ -132,6 +139,20 @@
<!--                                        </div>-->
<!--                                    </fieldset>-->
<!--                                </div>-->
                                <div class="checkbox checkbox-success">
                                    <input id="checkbox8" name="checkbox" onclick="TCompanyInfoDlg.checkbox8()"
                                           type="checkbox" value="8"  ${1 == item.isHitchRide ? 'checked=checked' : ''} >
                                    <label for="checkbox8">
                                        顺风车
                                    </label>
                                </div>
                                <div class="checkbox checkbox-success">
                                    <input id="checkbox9" name="checkbox" onclick="TCompanyInfoDlg.checkbox9()"
                                           type="checkbox" value="9" ${1 == item.isSubstituteDriving ? 'checked=checked' : ''} >
                                    <label for="checkbox9">
                                        代驾
                                    </label>
                                </div>
                            </fieldset>
                        </div>
                    </div>
@@ -161,7 +182,8 @@
                            </select>
                        </div>
                        <div class="col-sm-1">
                            <#button btnCss="info" name="添加" id="ensure" icon="fa-check" clickFun="TCompanyInfoDlg.addScope()"/>
                            <#button btnCss="info" name="添加" id="ensure" icon="fa-check"
                            clickFun="TCompanyInfoDlg.addScope()"/>
                        </div>
                    </div>
                    <div class="form-group">
@@ -179,10 +201,14 @@
                                    @for(obj in scopeList){
                                    <tr class="timeClass">
                                        <td><input type="hidden" id="recordId" name="recordId" value="${obj.id}">
                                            <input type="hidden" id="provinceCode" name="provinceCode" value="${obj.provinceCode}">
                                            <input type="hidden" id="provinceCode" name="provinceCode"
                                                   value="${obj.provinceCode}">
                                            <input type="hidden" id="cityCode" name="cityCode" value="${obj.cityCode}">
                                            <input type="hidden" id="areaCode" name="areaCode" value="${obj.areaCode}">${obj.value}</td>
                                        <td><button onclick="deleteSub(this)">移除</button></td>
                                            <input type="hidden" id="areaCode" name="areaCode" value="${obj.areaCode}">${obj.value}
                                        </td>
                                        <td>
                                            <button onclick="deleteSub(this)">移除</button>
                                        </td>
                                    </tr>
                                    @}
                                    </tbody>
@@ -195,11 +221,13 @@
                        <label class="col-sm-2 control-label">是否需要摆渡车：</label>
                        <div class="col-sm-9"  style="display: flex;align-items: center;">
                            <div class="radio radio-info radio-inline">
                                <input type="radio" id="isNeedFerry1" value="1" name="isNeedFerry" ${1 == item.isNeedFerry ? 'checked=checked' : ''} >
                                <input type="radio" id="isNeedFerry1" value="1" name="isNeedFerry" ${1==
                                       item.isNeedFerry ? 'checked=checked' : ''} >
                                <label for="isNeedFerry1"> 是 </label>
                            </div>
                            <div class="radio radio-success radio-inline">
                                <input type="radio" id="isNeedFerry2" value="2" name="isNeedFerry" ${2 == item.isNeedFerry ? 'checked=checked' : ''}>
                                <input type="radio" id="isNeedFerry2" value="2" name="isNeedFerry" ${2==
                                       item.isNeedFerry ? 'checked=checked' : ''}>
                                <label for="isNeedFerry2"> 否 </label>
                            </div>
                        </div>
@@ -233,7 +261,8 @@

            <div class="row btn-group-m-t">
                <div class="col-sm-10 col-sm-offset-5">
                    <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TCompanyInfoDlg.editSubmit()"/>
                    <#button btnCss="info" name="提交" id="ensure" icon="fa-check"
                    clickFun="TCompanyInfoDlg.editSubmit()"/>
                </div>
            </div>
        </div>

 ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_add.html

@@ -49,34 +49,39 @@
                        <div class="col-sm-10">
                            <fieldset>
                                                                <div class="checkbox checkbox-success">
                                                                    <input id="checkbox1" name="checkbox" onclick="TCompanyInfoDlg.checkbox1()" type="checkbox" value="1">
                                    <input id="checkbox1" name="checkbox" onclick="TCompanyInfoDlg.checkbox1()"
                                           type="checkbox" value="1">
                                                                    <label for="checkbox1">
                                                                        快车
                                                                    </label>
    
                                                                    <fieldset>
                                                                        <div class="row" id="zcDiv" style="display: none;">
                                                                            <#button btnCss="info" name="设置司机抽成" id="Spe1" icon="fa-check" clickFun="TLineInfoDlg.set1('Spe')"/>
                                            <#button btnCss="info" name="设置司机抽成" id="Spe1" icon="fa-check"
                                            clickFun="TLineInfoDlg.set1('Spe')"/>
                                                                            <textarea cols="50" hidden="hidden" id="Spe"  rows="5" ></textarea>
    
                                                                        </div>
                                                                    </fieldset>
                                                                </div>
                                <div class="checkbox checkbox-primary">
                                    <input name="checkbox" id="checkbox2" type="checkbox" value="2" onclick="TCompanyInfoDlg.checkbox2()">
                                    <input id="checkbox2" name="checkbox" onclick="TCompanyInfoDlg.checkbox2()" type="checkbox"
                                           value="2">
                                    <label for="checkbox2">
                                        出租车
                                    </label>
                                    <fieldset>
                                        <div class="row" style="display: none;" id="czDiv">
                                            <#button btnCss="info" name="设置司机抽成" id="rakeRate" icon="fa-check" clickFun="TLineInfoDlg.set1('Taxi')"/>
                                            <textarea id="Taxi" rows="5" cols="50" hidden="hidden"  ></textarea>
                                        <div class="row" id="czDiv" style="display: none;">
                                            <#button btnCss="info" name="设置司机抽成" id="rakeRate" icon="fa-check"
                                            clickFun="TLineInfoDlg.set1('Taxi')"/>
                                            <textarea cols="50" hidden="hidden" id="Taxi" rows="5"></textarea>

                                        </div>
                                    </fieldset>
                                </div>
                                                                <div class="checkbox checkbox-success">
                                                                    <input id="checkbox3" name="checkbox" onclick="TCompanyInfoDlg.checkbox3()" type="checkbox" value="3">
                                    <input id="checkbox3" name="checkbox" onclick="TCompanyInfoDlg.checkbox3()"
                                           type="checkbox" value="3">
                                                                    <label for="checkbox3">
                                                                        跨城出行
                                                                    </label>
@@ -123,6 +128,21 @@
                                <!--                                        </div>-->
                                <!--                                    </fieldset>-->
                                <!--                                </div>-->
								
                                <div class="checkbox checkbox-success">
                                    <input id="checkbox8" name="checkbox" onclick="TCompanyInfoDlg.checkbox8()"
                                           type="checkbox" value="8">
                                    <label for="checkbox8">
                                        顺风车
                                    </label>
                                </div>
                                <div class="checkbox checkbox-success">
                                    <input id="checkbox9" name="checkbox" onclick="TCompanyInfoDlg.checkbox9()"
                                           type="checkbox" value="9">
                                    <label for="checkbox9">
                                        代驾
                                    </label>
                                </div>
                            </fieldset>
                        </div>
                    </div>
@@ -152,7 +172,8 @@
                            </select>
                        </div>
                        <div class="col-sm-1">
                            <#button btnCss="info" name="添加" id="ensure" icon="fa-check" clickFun="TCompanyInfoDlg.addScope()"/>
                            <#button btnCss="info" name="添加" id="ensure" icon="fa-check"
                            clickFun="TCompanyInfoDlg.addScope()"/>
                        </div>
                    </div>
                    <div class="form-group">
@@ -178,11 +199,11 @@
                        <label class="col-sm-2 control-label">是否需要摆渡车：</label>
                        <div class="col-sm-9"  style="display: flex;align-items: center;">
                            <div class="radio radio-info radio-inline">
                                <input type="radio" id="isNeedFerry1" value="1" name="isNeedFerry" checked="" >
                                <input checked="" id="isNeedFerry1" name="isNeedFerry" type="radio" value="1">
                                <label for="isNeedFerry1"> 是 </label>
                            </div>
                            <div class="radio radio-success radio-inline">
                                <input type="radio" id="isNeedFerry2" value="2" name="isNeedFerry" >
                                <input id="isNeedFerry2" name="isNeedFerry" type="radio" value="2">
                                <label for="isNeedFerry2"> 否 </label>
                            </div>
                        </div>
@@ -190,25 +211,25 @@
                    <div class="form-group">
                        <label class="col-sm-2 control-label">限登录MAC地址：</label>
                        <div class="col-sm-9">
                            <input type="text" class="form-control" id="mac" name="mac" >
                            <input class="form-control" id="mac" name="mac" type="text">
                        </div>
                    </div>
                    <div class="form-group">
                        <label class="col-sm-2 control-label">登录账号：</label>
                        <div class="col-sm-9">
                            <input type="text" class="form-control" id="account" name="account" >
                            <input class="form-control" id="account" name="account" type="text">
                        </div>
                    </div>
                    <div class="form-group">
                        <label class="col-sm-2 control-label">登录密码：</label>
                        <div class="col-sm-9">
                            <input type="password" class="form-control" id="password" name="password" >
                            <input class="form-control" id="password" name="password" type="password">
                        </div>
                    </div>
                    <div class="form-group">
                        <label class="col-sm-2 control-label">确认密码：</label>
                        <div class="col-sm-9">
                            <input type="password" class="form-control" id="rePassword" name="rePassword" >
                            <input class="form-control" id="rePassword" name="rePassword" type="password">
                        </div>
                    </div>
                </div>
@@ -217,8 +238,10 @@

            <div class="row btn-group-m-t">
                <div class="col-sm-10 col-sm-offset-5">
                    <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TCompanyInfoDlg.addSubmit()"/>
                    <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TCompanyInfoDlg.close()"/>
                    <#button btnCss="info" name="提交" id="ensure" icon="fa-check"
                    clickFun="TCompanyInfoDlg.addSubmit()"/>
                    <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser"
                    clickFun="TCompanyInfoDlg.close()"/>
                </div>
            </div>
        </div>

 ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_addFranchisee.html

@@ -100,6 +100,20 @@
<!--                                        </div>-->
<!--                                    </fieldset>-->
<!--                                </div>-->
                                <div class="checkbox checkbox-success">
                                    <input id="checkbox8" name="checkbox" onclick="TCompanyInfoDlg.checkbox8()"
                                           type="checkbox" value="8">
                                    <label for="checkbox8">
                                        顺风车
                                    </label>
                                </div>
                                <div class="checkbox checkbox-success">
                                    <input id="checkbox9" name="checkbox" onclick="TCompanyInfoDlg.checkbox9()"
                                           type="checkbox" value="9">
                                    <label for="checkbox9">
                                        代驾
                                    </label>
                                </div>
                            </fieldset>
                        </div>
                    </div>

 ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detail.html

@@ -162,6 +162,20 @@
<!--                                        </div>-->
<!--                                    </fieldset>-->
<!--                                </div>-->
                                <div class="checkbox checkbox-success">
                                    <input id="checkbox8" name="checkbox" onclick="TCompanyInfoDlg.checkbox8()"
                                           type="checkbox" value="8" ${1 == item.isHitchRide ? 'checked=checked' : ''} >
                                    <label for="checkbox8">
                                        顺风车
                                    </label>
                                </div>
                                <div class="checkbox checkbox-success">
                                    <input id="checkbox9" name="checkbox" onclick="TCompanyInfoDlg.checkbox9()"
                                           type="checkbox" value="9" ${1 == item.isSubstituteDriving ? 'checked=checked' : ''} >
                                    <label for="checkbox9">
                                        代驾
                                    </label>
                                </div>
                            </fieldset>
                        </div>
                    </div>

 ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detailFranchisee.html

@@ -21,32 +21,37 @@
                    <div class="col-sm-9">
                        <fieldset>
                            <div class="checkbox checkbox-success">
                                <input name="checkbox" id="checkbox1" disabled type="checkbox" value="1" ${1 == item.isSpe ? 'checked=checked' : ''} >
                                    <input name="checkbox" id="checkbox1" disabled type="checkbox" value="1" ${1==
                                           item.isSpe ? 'checked=checked' : ''} >
                                <label for="checkbox1">
                                    快车
                                </label>
                                <fieldset>
                                    <div class="row" style="display: none;" id="zcDiv">
                                        <#button  btnCss="info" name="设置司机抽成" id="Spe1" icon="fa-check" clickFun="TLineInfoDlg.set2('Spe')"/>
                                            <#button btnCss="info" name="设置司机抽成" id="Spe1" icon="fa-check"
                                            clickFun="TLineInfoDlg.set2('Spe')"/>
                                        <textarea id="Spe" rows="5" cols="50" hidden="hidden" value="${item.Spe}">${item.Spe}</textarea>

                                    </div>
                                </fieldset>
                            </div>
                            <div class="checkbox checkbox-primary">
                                <input name="checkbox" id="checkbox2" type="checkbox" disabled value="2" ${1 == item.isTaxi ? 'checked=checked' : ''}>
                                    <input name="checkbox" id="checkbox2" type="checkbox" disabled value="2" ${1==
                                           item.isTaxi ? 'checked=checked' : ''}>
                                <label for="checkbox2">
                                    出租车
                                </label>
                                <fieldset>
                                    <div class="row" style="display: none;" id="czDiv">
                                        <#button btnCss="info" name="设置司机抽成" id="rakeRate" icon="fa-check" clickFun="TLineInfoDlg.set2('Taxi')"/>
                                            <#button btnCss="info" name="设置司机抽成" id="rakeRate" icon="fa-check"
                                            clickFun="TLineInfoDlg.set2('Taxi')"/>
                                        <textarea id="Taxi" rows="5" cols="50" hidden="hidden" value="${item.Taxi}" >${item.Taxi}</textarea>
                                    </div>
                                </fieldset>
                            </div>
                            <div class="checkbox checkbox-success">
                                <input name="checkbox" id="checkbox3" type="checkbox" disabled value="3" ${1 == item.isCross ? 'checked=checked' : ''} >
                                    <input name="checkbox" id="checkbox3" type="checkbox" disabled value="3" ${1==
                                           item.isCross ? 'checked=checked' : ''} >
                                <label for="checkbox3">
                                    跨城出行
                                </label>
@@ -91,6 +96,20 @@
<!--                                        <#button btnCss="info" name="设置司机抽成" id="rakeRate" icon="fa-check" clickFun="TLineInfoDlg.set2('OnCall')"/>-->
<!--                                        <textarea id="OnCall" rows="5" cols="50" hidden="hidden" value="${item.OnCall}"  >${item.OnCall}</textarea>-->
<!--                                    </div>-->
                                <div class="checkbox checkbox-success">
                                    <input id="checkbox8" name="checkbox" onclick="TCompanyInfoDlg.checkbox8()"
                                           type="checkbox" value="8"  ${1 == item.isHitchRide ? 'checked=checked' : ''} >
                                    <label for="checkbox8">
                                        顺风车
                                    </label>
                                </div>
                                <div class="checkbox checkbox-success">
                                    <input id="checkbox9" name="checkbox" onclick="TCompanyInfoDlg.checkbox9()"
                                           type="checkbox" value="9" ${1 == item.isSubstituteDriving ? 'checked=checked' : ''} >
                                    <label for="checkbox9">
                                        代驾
                                    </label>
                                </div>
                                </fieldset>
                            </div>
                        </fieldset>
@@ -100,11 +119,13 @@
                    <label class="col-sm-3 control-label">是否需要摆渡车：</label>
                    <div class="col-sm-9"  style="display: flex;align-items: center;">
                        <div class="radio radio-info radio-inline">
                            <input type="radio" disabled id="isNeedFerry1" value="1" name="isNeedFerry" ${1 == item.isNeedFerry ? 'checked=checked' : ''} >
                            <input type="radio" disabled id="isNeedFerry1" value="1" name="isNeedFerry" ${1==
                                   item.isNeedFerry ? 'checked=checked' : ''} >
                            <label for="isNeedFerry1"> 是 </label>
                        </div>
                        <div class="radio radio-success radio-inline">
                            <input type="radio" disabled id="isNeedFerry2" value="2" name="isNeedFerry" ${2 == item.isNeedFerry ? 'checked=checked' : ''}>
                            <input type="radio" disabled id="isNeedFerry2" value="2" name="isNeedFerry" ${2==
                                   item.isNeedFerry ? 'checked=checked' : ''}>
                            <label for="isNeedFerry2"> 否 </label>
                        </div>
                    </div>

 ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_edit.html

@@ -19,7 +19,8 @@
                    <#input id="regCapital" name="注册资本" value="${item.regCapital}" />
                    <#input id="driverNum" name="注册网络预约车驾驶员数量" value="${item.driverNum}" />
                    <#input id="legalId" name="法人代表身份证号" value="${item.legalId}" />
                    <#avatar id="idCardPositive" name="法定代表人身份<br>证照片(正面)：" avatarImg="${item.idCardPositive}"/>
                    <#avatar id="idCardPositive" name="法定代表人身份<br>证照片(正面)："
                    avatarImg="${item.idCardPositive}"/>
                    <#input id="contactAddress" name="通信地址" value="${item.contactAddress}"/>
                </div>

@@ -37,7 +38,8 @@
                    <#input id="carNum" name="注册网络预约出租车<br>车辆数" value="${item.carNum}"/>
                    <#input id="legalName" name="法人代表姓名" value="${item.legalName}"/>
                    <#input id="legalPhone" name="法人代表电话" value="${item.legalPhone}"/>
                    <#avatar id="idCardReverse" name="法定代表人身份<br>证照片(反面)：" avatarImg="${item.idCardReverse}"/>
                    <#avatar id="idCardReverse" name="法定代表人身份<br>证照片(反面)："
                    avatarImg="${item.idCardReverse}"/>
                    <#input id="businessScope" name="经营范围" value="${item.businessScope}"/>
                    <#input id="paymentDays" name="分期账期" value="${item.paymentDays}"/>
                </div>
@@ -49,32 +51,37 @@
                        <div class="col-sm-10">
                            <fieldset>
                                <div class="checkbox checkbox-success">
                                    <input name="checkbox" id="checkbox1" type="checkbox" value="1" ${1 == item.isSpe ? 'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox1()">
                                    <input name="checkbox" id="checkbox1" type="checkbox" value="1" ${1== item.isSpe ?
                                    'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox1()">
                                    <label for="checkbox1">
                                        快车
                                    </label>
                                    <fieldset>
                                        <div class="row" style="display: none;" id="zcDiv">
                                            <#button  btnCss="info" name="设置司机抽成" id="Spe1" icon="fa-check" clickFun="TLineInfoDlg.set1('Spe')"/>
                                            <#button btnCss="info" name="设置司机抽成" id="Spe1" icon="fa-check"
                                            clickFun="TLineInfoDlg.set1('Spe')"/>
                                            <textarea id="Spe" rows="5" cols="50" hidden="hidden" value="${item.Spe}">${item.Spe}</textarea>

                                        </div>
                                    </fieldset>
                                </div>
                                <div class="checkbox checkbox-primary">
                                    <input name="checkbox" id="checkbox2" type="checkbox" value="2" ${1 == item.isTaxi ? 'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox2()">
                                    <input name="checkbox" id="checkbox2" type="checkbox" value="2" ${1== item.isTaxi ?
                                    'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox2()">
                                    <label for="checkbox2">
                                        出租车
                                    </label>
                                    <fieldset>
                                        <div class="row" style="display: none;" id="czDiv">
                                            <#button btnCss="info" name="设置司机抽成" id="rakeRate" icon="fa-check" clickFun="TLineInfoDlg.set1('Taxi')"/>
                                            <#button btnCss="info" name="设置司机抽成" id="rakeRate" icon="fa-check"
                                            clickFun="TLineInfoDlg.set1('Taxi')"/>
                                            <textarea id="Taxi" rows="5" cols="50" hidden="hidden" value="${item.Taxi}" >${item.Taxi}</textarea>
                                        </div>
                                    </fieldset>
                                </div>
                                <div class="checkbox checkbox-success">
                                    <input name="checkbox" id="checkbox3" type="checkbox" value="3" ${1 == item.isCross ? 'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox3()">
                                    <input name="checkbox" id="checkbox3" type="checkbox" value="3" ${1== item.isCross ?
                                    'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox3()">
                                    <label for="checkbox3">
                                        跨城出行
                                    </label>
@@ -119,6 +126,20 @@
<!--                                            <#button btnCss="info" name="设置司机抽成" id="rakeRate" icon="fa-check" clickFun="TLineInfoDlg.set1('OnCall')"/>-->
<!--                                            <textarea id="OnCall" rows="5" cols="50" hidden="hidden" value="${item.OnCall}"  >${item.OnCall}</textarea>-->
<!--                                        </div>-->
                                <div class="checkbox checkbox-success">
                                    <input id="checkbox8" name="checkbox" onclick="TCompanyInfoDlg.checkbox8()"
                                           type="checkbox" value="8"  ${1 == item.isHitchRide ? 'checked=checked' : ''} >
                                    <label for="checkbox8">
                                        顺风车
                                    </label>
                                </div>
                                <div class="checkbox checkbox-success">
                                    <input id="checkbox9" name="checkbox" onclick="TCompanyInfoDlg.checkbox9()"
                                           type="checkbox" value="9" ${1 == item.isSubstituteDriving ? 'checked=checked' : ''} >
                                    <label for="checkbox9">
                                        代驾
                                    </label>
                                </div>
                                    </fieldset>
                                </div>
                            </fieldset>
@@ -150,7 +171,8 @@
                            </select>
                        </div>
                        <div class="col-sm-1">
                            <#button btnCss="info" name="添加" id="ensure" icon="fa-check" clickFun="TCompanyInfoDlg.addScope()"/>
                        <#button btnCss="info" name="添加" id="ensure" icon="fa-check"
                        clickFun="TCompanyInfoDlg.addScope()"/>
                        </div>
                    </div>
                    <div class="form-group">
@@ -168,10 +190,14 @@
                                    @for(obj in scopeList){
                                    <tr class="timeClass">
                                        <td><input type="hidden" id="recordId" name="recordId" value="${obj.id}">
                                            <input type="hidden" id="provinceCode" name="provinceCode" value="${obj.provinceCode}">
                                        <input type="hidden" id="provinceCode" name="provinceCode"
                                               value="${obj.provinceCode}">
                                            <input type="hidden" id="cityCode" name="cityCode" value="${obj.cityCode}">
                                            <input type="hidden" id="areaCode" name="areaCode" value="${obj.areaCode}">${obj.value}</td>
                                        <td><button onclick="deleteSub(this)">移除</button></td>
                                        <input type="hidden" id="areaCode" name="areaCode" value="${obj.areaCode}">${obj.value}
                                    </td>
                                    <td>
                                        <button onclick="deleteSub(this)">移除</button>
                                    </td>
                                    </tr>
                                    @}
                                    </tbody>
@@ -184,11 +210,13 @@
                        <label class="col-sm-2 control-label">是否需要摆渡车：</label>
                        <div class="col-sm-9"  style="display: flex;align-items: center;">
                            <div class="radio radio-info radio-inline">
                                <input type="radio" id="isNeedFerry1" value="1" name="isNeedFerry" ${1 == item.isNeedFerry ? 'checked=checked' : ''} >
                            <input type="radio" id="isNeedFerry1" value="1" name="isNeedFerry" ${1== item.isNeedFerry ?
                            'checked=checked' : ''} >
                                <label for="isNeedFerry1"> 是 </label>
                            </div>
                            <div class="radio radio-success radio-inline">
                                <input type="radio" id="isNeedFerry2" value="2" name="isNeedFerry" ${2 == item.isNeedFerry ? 'checked=checked' : ''}>
                            <input type="radio" id="isNeedFerry2" value="2" name="isNeedFerry" ${2== item.isNeedFerry ?
                            'checked=checked' : ''}>
                                <label for="isNeedFerry2"> 否 </label>
                            </div>
                        </div>
@@ -202,7 +230,8 @@
                    <div class="form-group">
                        <label class="col-sm-2 control-label">登录账号：</label>
                        <div class="col-sm-9">
                            <input type="text" class="form-control" id="account" name="account" value="${user.account}" readonly>
                        <input type="text" class="form-control" id="account" name="account" value="${user.account}"
                               readonly>
                        </div>
                    </div>
                    <div class="form-group">

 ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_updateFranchisee.html

@@ -10,9 +10,11 @@
                    <#select id="superiorId" name="所属分公司：" onchange="TOpenCityInfoDlg.provinceChange()">
                        <option value="">选择所属分公司</option>
                        @for(obj in companyList){
                        <option value="${obj.id}" ${obj.id == item.superiorId ? 'selected=selected' : ''}>${obj.name}</option>
                    <option value="${obj.id}" ${obj.id== item.superiorId ?
                    'selected=selected' : ''}>${obj.name}</option>
                        @}
                    </#select>
                </
                #select>
                    @}else if(roleType == 2){
                    <#label id="companyName" name="所属分公司" value="${company.name}"/>
                    @}
@@ -29,31 +31,36 @@
                        <div class="col-sm-9">
                            <fieldset>
                                <div class="checkbox checkbox-success">
                                    <input name="checkbox" id="checkbox1" type="checkbox" value="1" ${1 == item.isSpe ? 'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox1()">
                                <input name="checkbox" id="checkbox1" type="checkbox" value="1" ${1== item.isSpe ?
                                'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox1()">
                                    <label for="checkbox1">
                                        快车
                                    </label>
                                    <fieldset>
                                        <div class="row" style="display: none;" id="zcDiv">
                                            <#button  btnCss="info" name="设置司机抽成" id="Spe1" icon="fa-check" clickFun="TLineInfoDlg.set1('Spe')"/>
                                        <#button btnCss="info" name="设置司机抽成" id="Spe1" icon="fa-check"
                                        clickFun="TLineInfoDlg.set1('Spe')"/>
                                            <textarea id="Spe" rows="5" cols="50" hidden="hidden" value="${item.Spe}">${item.Spe}</textarea>
                                        </div>
                                    </fieldset>
                                </div>
                                <div class="checkbox checkbox-primary">
                                    <input name="checkbox" id="checkbox2" type="checkbox" value="2" ${1 == item.isTaxi ? 'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox2()">
                                <input name="checkbox" id="checkbox2" type="checkbox" value="2" ${1== item.isTaxi ?
                                'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox2()">
                                    <label for="checkbox2">
                                        出租车
                                    </label>
                                    <fieldset>
                                        <div class="row" style="display: none;" id="czDiv">
                                            <#button btnCss="info" name="设置司机抽成" id="rakeRate" icon="fa-check" clickFun="TLineInfoDlg.set1('Taxi')"/>
                                        <#button btnCss="info" name="设置司机抽成" id="rakeRate" icon="fa-check"
                                        clickFun="TLineInfoDlg.set1('Taxi')"/>
                                            <textarea id="Taxi" rows="5" cols="50" hidden="hidden" value="${item.Taxi}" >${item.Taxi}</textarea>
                                        </div>
                                    </fieldset>
                                </div>
                                <div class="checkbox checkbox-success">
                                    <input name="checkbox" id="checkbox3" type="checkbox" value="3" ${1 == item.isCross ? 'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox3()">
                                <input name="checkbox" id="checkbox3" type="checkbox" value="3" ${1== item.isCross ?
                                'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox3()">
                                    <label for="checkbox3">
                                        跨城出行
                                    </label>
@@ -100,6 +107,20 @@
<!--                                        </div>-->
<!--                                    </fieldset>-->
<!--                                </div>-->
                            <div class="checkbox checkbox-success">
                                <input id="checkbox8" name="checkbox" onclick="TCompanyInfoDlg.checkbox8()"
                                       type="checkbox" value="8"  ${1 == item.isHitchRide ? 'checked=checked' : ''} >
                                <label for="checkbox8">
                                    顺风车
                                </label>
                            </div>
                            <div class="checkbox checkbox-success">
                                <input id="checkbox9" name="checkbox" onclick="TCompanyInfoDlg.checkbox9()"
                                       type="checkbox" value="9" ${1 == item.isSubstituteDriving ? 'checked=checked' : ''} >
                                <label for="checkbox9">
                                    代驾
                                </label>
                            </div>
                            </fieldset>
                        </div>
                    </div>
@@ -107,11 +128,13 @@
                        <label class="col-sm-3 control-label">是否需要摆渡车：</label>
                        <div class="col-sm-9"  style="display: flex;align-items: center;">
                            <div class="radio radio-info radio-inline">
                                <input type="radio" id="isNeedFerry1" value="1" name="isNeedFerry" ${1 == item.isNeedFerry ? 'checked=checked' : ''} >
                            <input type="radio" id="isNeedFerry1" value="1" name="isNeedFerry" ${1== item.isNeedFerry ?
                            'checked=checked' : ''} >
                                <label for="isNeedFerry1"> 是 </label>
                            </div>
                            <div class="radio radio-success radio-inline">
                                <input type="radio" id="isNeedFerry2" value="2" name="isNeedFerry" ${2 == item.isNeedFerry ? 'checked=checked' : ''}>
                            <input type="radio" id="isNeedFerry2" value="2" name="isNeedFerry" ${2== item.isNeedFerry ?
                            'checked=checked' : ''}>
                                <label for="isNeedFerry2"> 否 </label>
                            </div>
                        </div>
@@ -119,7 +142,8 @@
                    <div class="form-group">
                        <label class="col-sm-3 control-label">登录账号：</label>
                        <div class="col-sm-9">
                            <input type="text" class="form-control" id="account" name="account" value="${user.account}" readonly>
                        <input type="text" class="form-control" id="account" name="account" value="${user.account}"
                               readonly>
                        </div>
                    </div>
                    <div class="form-group">
@@ -139,7 +163,8 @@

            <div class="row btn-group-m-t">
                <div class="col-sm-10 col-sm-offset-5">
                    <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="FranchiseeInfoDlg.updateFranchisee()"/>
                <#button btnCss="info" name="提交" id="ensure" icon="fa-check"
                clickFun="FranchiseeInfoDlg.updateFranchisee()"/>
                    <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="FranchiseeInfoDlg.close()"/>
                </div>
            </div>

 ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html

@@ -12,20 +12,24 @@
                        <div class="col-sm-9"  style="display: flex;align-items: center;">
                            @if(roleType == 1){
                            <div class="radio radio-info radio-inline">
                                <input type="radio" id="companyType1" value="1" name="companyType" checked="" onclick="YesDriverInfoDlg.companyTypeClick(1)">
                                <input type="radio" id="companyType1" value="1" name="companyType" checked=""
                                       onclick="YesDriverInfoDlg.companyTypeClick(1)">
                                <label for="companyType1"> 平台司机 </label>
                            </div>
                            <div class="radio radio-success radio-inline">
                                <input type="radio" id="companyTyp2" value="2" name="companyType" onclick="YesDriverInfoDlg.companyTypeClick(2)">
                                <input type="radio" id="companyTyp2" value="2" name="companyType"
                                       onclick="YesDriverInfoDlg.companyTypeClick(2)">
                                <label for="companyTyp2"> 加盟司机 </label>
                            </div>
                            <select class="form-control companyDiv" id="oneId" onchange="YesDriverInfoDlg.oneChange(this)" style="width: 200px;display: none;" >
                            <select class="form-control companyDiv" id="oneId"
                                    onchange="YesDriverInfoDlg.oneChange(this)" style="width: 200px;display: none;">
                                <option value="">选择所属分公司</option>
                                @for(obj in companyList!){
                                <option value="${obj.id}">${obj.name}</option>
                                @}
                            </select>
                            <select class="form-control companyDiv" id="twoId"  style="width: 200px;margin-left: 30px;display: none;">
                            <select class="form-control companyDiv" id="twoId"
                                    style="width: 200px;margin-left: 30px;display: none;">
                                <option value="">选择所属加盟商</option>
                            </select>
                            @}else if(roleType == 2){
@@ -81,7 +85,8 @@
                                    <label for="serverBox2"> 出租车 </label>
                                </div>
                                                                <div class="checkbox checkbox-success  checkbox-inline">
                                                                    <input id="serverBox3" name="serverBox" onclick="YesDriverInfoDlg.checkBox()" type="checkbox" value="3" >
                                    <input id="serverBox3" name="serverBox" onclick="YesDriverInfoDlg.checkBox()"
                                           type="checkbox" value="3">
                                                                    <label for="serverBox3"> 跨城出行 </label>
                                                                </div>
                                <!--                                <div class="checkbox checkbox-success  checkbox-inline">-->
@@ -111,7 +116,8 @@
                            </select>
                        </div>
                        <div class="col-sm-2">
                            <#button btnCss="info" name="添加" id="ensure" icon="fa-check" clickFun="YesDriverInfoDlg.addLine()"/>
                                <#button btnCss="info" name="添加" id="ensure" icon="fa-check"
                                clickFun="YesDriverInfoDlg.addLine()"/>
                        </div>
                    </div>
                    <div class="form-group">
@@ -214,8 +220,10 @@

            <div class="row btn-group-m-t">
                <div class="col-sm-10 col-sm-offset-5">
                    <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="YesDriverInfoDlg.addSubmit()"/>
                    <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="YesDriverInfoDlg.close()"/>
                    <#button btnCss="info" name="提交" id="ensure" icon="fa-check"
                    clickFun="YesDriverInfoDlg.addSubmit()"/>
                    <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser"
                    clickFun="YesDriverInfoDlg.close()"/>
                </div>
            </div>
        </div>

 ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_add.html

@@ -33,6 +33,8 @@
<!--                                <option value="5">同城小件物流</option>-->
<!--                                <option value="6">包车</option>-->
<!--                                <option value="7">95128</option>-->
                                <option value="8">顺风车</option>
                                <option value="9">代驾</option>
                            </select>
                        </div>
                        <div class="col-sm-3" >

 ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_edit.html

@@ -40,6 +40,8 @@
<!--                                <option value="5">同城小件物流</option>-->
<!--                                <option value="6">包车</option>-->
<!--                                <option value="7">95128</option>-->
                                <option value="8">顺风车</option>
                                <option value="9">代驾</option>
                            </select>
                        </div>
                        <div class="col-sm-3" >

 ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/franchisee_info.js

@@ -298,6 +298,8 @@
        //     }
        // }
    }
    var checkbox8 = $('#checkbox8').prop('checked');
    var checkbox9 = $('#checkbox9').prop('checked');

    var isNeedFerry = $("input[name='isNeedFerry']:checked").val();
    //提交信息
@@ -386,6 +388,16 @@
        ajax.set("isOnCall",1);
    }else{
        ajax.set("isOnCall",2);
    }
    if (checkbox8){
        ajax.set("isHitchRide",1);
    }else{
        ajax.set("isHitchRide",2);
    }
    if (checkbox9){
        ajax.set("isSubstituteDriving",1);
    }else{
        ajax.set("isSubstituteDriving",2);
    }
    ajax.set("isNeedFerry",isNeedFerry);
    ajax.set("account",$("#account").val());
@@ -528,6 +540,8 @@
        //     }
        // }
    }
    var checkbox8 = $('#checkbox8').prop('checked');
    var checkbox9 = $('#checkbox9').prop('checked');

    var isNeedFerry = $("input[name='isNeedFerry']:checked").val();
    //提交信息
@@ -613,6 +627,16 @@
    }else{
        ajax.set("isOnCall",2);
    }
    if (checkbox8){
        ajax.set("isHitchRide",1);
    }else{
        ajax.set("isHitchRide",2);
    }
    if (checkbox9){
        ajax.set("isSubstituteDriving",1);
    }else{
        ajax.set("isSubstituteDriving",2);
    }
    ajax.set("isNeedFerry",isNeedFerry);
    ajax.set("account",$("#account").val());
    ajax.set("password",$("#password").val());
@@ -687,3 +711,21 @@
        $("#dcxDiv").hide();
    }
}
//顺风车
FranchiseeInfoDlg.checkbox8 = function () {
    var checkbox8 = $('#checkbox8').prop('checked');
    if (checkbox8){
        $("#sfDiv").show();
    } else {
        $("#sfDiv").hide();
    }
}
//代驾
FranchiseeInfoDlg.checkbox9 = function () {
    var checkbox9 = $('#checkbox9').prop('checked');
    if (checkbox9){
        $("#djDiv").show();
    } else {
        $("#djDiv").hide();
    }
}

 ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/tCompany_info.js

@@ -304,7 +304,8 @@
        //     }
        // }
    }

    var checkbox8 = $('#checkbox8').prop('checked');
    var checkbox9 = $('#checkbox9').prop('checked');
    var subArr=[];
    $(".timeClass").each(function () {
        subArr.push({
@@ -405,6 +406,16 @@
        ajax.set("isOnCall",1);
    }else{
        ajax.set("isOnCall",2);
    }
    if (checkbox8){
        ajax.set("isHitchRide",1);
    }else{
        ajax.set("isHitchRide",2);
    }
    if (checkbox9){
        ajax.set("isSubstituteDriving",1);
    }else{
        ajax.set("isSubstituteDriving",2);
    }
    ajax.set("isNeedFerry",isNeedFerry);

@@ -549,7 +560,8 @@
        //     }
        // }
    }

    var checkbox8 = $('#checkbox8').prop('checked');
    var checkbox9 = $('#checkbox9').prop('checked');
    var subArr=[];
    $(".timeClass").each(function () {
        subArr.push({
@@ -647,6 +659,16 @@
    }else{
        ajax.set("isOnCall",2);
    }
    if (checkbox8){
        ajax.set("isHitchRide",1);
    }else{
        ajax.set("isHitchRide",2);
    }
    if (checkbox9){
        ajax.set("isSubstituteDriving",1);
    }else{
        ajax.set("isSubstituteDriving",2);
    }
    ajax.set("isNeedFerry",isNeedFerry);

    ajax.set("subArr",JSON.stringify(subArr));
@@ -730,6 +752,24 @@
        $("#dcxDiv").hide();
    }
}
//顺风车
TCompanyInfoDlg.checkbox8 = function () {
    var checkbox8 = $('#checkbox8').prop('checked');
    if (checkbox8){
        $("#sfDiv").show();
    } else {
        $("#sfDiv").hide();
    }
}
//代驾
TCompanyInfoDlg.checkbox9 = function () {
    var checkbox9 = $('#checkbox9').prop('checked');
    if (checkbox9){
        $("#djDiv").show();
    } else {
        $("#djDiv").hide();
    }
}
//省改变
TCompanyInfoDlg.provinceChange = function (e) {
    var provinceCode=$(e).val();

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java

@@ -2152,17 +2152,17 @@
            if("1".equals(data.getStatus())){
                return "error";
            }
            String partnerPayId = data.getPartnerPayId();
            String orderNo = data.getOrderNo();
            String payId = data.getPayId();
            //网约车
            if(partnerPayId.contains("PR")){
                partnerPayId = partnerPayId.substring(2);
                orderPrivateCarService.payOrderPrivateCarCallback(Integer.valueOf(partnerPayId), payId, 1);
            if(orderNo.contains("PR")){
                orderNo = orderNo.substring(2);
                orderPrivateCarService.payOrderPrivateCarCallback(Integer.valueOf(orderNo), payId, 1);
            }
            //出租车
            if(partnerPayId.contains("TA")){
                partnerPayId = partnerPayId.substring(2);
                orderTaxiService.payOrderTaxiCallback(Integer.valueOf(partnerPayId), payId, 1, 0);
            if(orderNo.contains("TA")){
                orderNo = orderNo.substring(2);
                orderTaxiService.payOrderTaxiCallback(Integer.valueOf(orderNo), payId, 1, 0);
            }
        }catch (Exception e){
            e.printStackTrace();

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

@@ -68,6 +68,14 @@
                    baseWarpper.setName("助老模式");
                    baseWarpper.setId(7);
                    break;
                case 8:
                    baseWarpper.setName("顺风车");
                    baseWarpper.setId(8);
                    break;
                case 9:
                    baseWarpper.setName("代驾");
                    baseWarpper.setId(9);
                    break;
            }
            list.add(baseWarpper);
        }
@@ -116,6 +124,14 @@
                    baseWarpper.setName("助老模式");
                    baseWarpper.setId(7);
                    break;
                case 8:
                    baseWarpper.setName("顺风车");
                    baseWarpper.setId(8);
                    break;
                case 9:
                    baseWarpper.setName("代驾");
                    baseWarpper.setId(9);
                    break;
            }
            list.add(baseWarpper);
        }

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

@@ -6,12 +6,14 @@
import com.stylefeng.guns.modular.system.dao.ServerCarModelMapper;
import com.stylefeng.guns.modular.system.dao.SystemPriceMapper;
import com.stylefeng.guns.modular.system.model.Company;
import com.stylefeng.guns.modular.system.model.OpenCity;
import com.stylefeng.guns.modular.system.model.ServerCarModel;
import com.stylefeng.guns.modular.system.model.SystemPriceCity;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.GDMapElectricFenceUtil;
import com.stylefeng.guns.modular.system.util.GDMapGeocodingUtil;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.warpper.BaseWarpper;
import com.stylefeng.guns.modular.system.warpper.ServerCarModelWarpper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -69,7 +71,6 @@
            return ResultUtil.success(new ArrayList<>());
        }
    
        // TODO: 2023/11/4 无法修改
        Map<String, String> distance = gdMapElectricFenceUtil.getDistance(startLonLat, endLonLat, 1);
        if (null == distance) {
            return ResultUtil.error("获取预估距离出错", new ArrayList<>());
@@ -78,10 +79,26 @@
        double distance1_ = Double.valueOf(distance1).doubleValue();
        String duration = distance.get("duration");//时间（秒）
        long duration_ = Long.valueOf(duration).longValue();
        List<ServerCarModelWarpper> price = this.getPrice(query.getId(), distance1_, duration_, 0, 1, geocode);
        //添加出租车车型和价格
        ServerCarModelWarpper serverCarModelWarpper = this.getTextPrice(query.getId(), distance1_, duration_, 0, 2, geocode);
        OpenCity openCity = openCityService.openCity1(geocode.get("districtCode"));
        if(null == openCity){
            return ResultUtil.error("起点暂未开通");
        }
    
        //专车车型
        List<ServerCarModelWarpper> price = new ArrayList<>();
        List<BaseWarpper> baseWarppers = openCityBusinessService.queryBusinessById(openCity.getId());
        Optional<BaseWarpper> first = baseWarppers.stream().filter(s->s.getId() == 1).findFirst();
        if(first.isPresent()){
            price = this.getPrice(query.getId(), distance1_, duration_, 0, 1, geocode);
        }
        
        //出租车车型
        ServerCarModelWarpper serverCarModelWarpper = null;
        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);
        }
        return ResultUtil.success(price);
    }
    

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

@@ -11,6 +11,10 @@
@Data
public class QYTPaymentCallbackData {
    /**
     * 业务侧行程编号
     */
    private String orderNo;
    /**
     * 商户单标识。行程单ID
     */
    private String partnerPayId;