longz
2026-04-17 18a13f1f40c6edb9034a6c6a3a1827f91769ac25
添加代客下单 能否修改金额 能否线下付款
8个文件已修改
98 ■■■■■ 已修改文件
ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCompanyMapper.xml 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCompany.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_add.html 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_addFranchisee.html 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_edit.html 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_updateFranchisee.html 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementYKDTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/franchisee_info.js 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementYKDTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/tCompany_info.js 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCompanyMapper.xml
@@ -21,6 +21,8 @@
        <result column="sameLogisticsMoney" property="sameLogisticsMoney" />
        <result column="isNeedFerry" property="isNeedFerry" />
        <result column="isCanSelectSeat" property="isCanSelectSeat" />
        <result column="isCanModifyAmount" property="isCanModifyAmount" />
        <result column="isOfflinePay" property="isOfflinePay" />
        <result column="isOpenDriverSelfTrip" property="isOpenDriverSelfTrip" />
        <result column="name" property="name" />
        <result column="type" property="type" />
@@ -64,7 +66,7 @@
    <sql id="Base_Column_List">
        id, isSpe, isTaxi, isCross, isCrossLogistics, isSameLogistics, isCharter, isSpeFixedOrProportional, isTaxiFixedOrProportional,
        isCrossLogisticsFixedOrProportional, isSameLogisticsFixedOrProportional, speMoney, taxiMoney, crossLogisticsMoney, sameLogisticsMoney,
        isNeedFerry, isCanSelectSeat, isOpenDriverSelfTrip, name, type, superiorId, principalName, principalPhone, adminName, adminPhone, urgentPhoen, setupTime, identifier, addressCode,
        isNeedFerry, isCanSelectSeat, isCanModifyAmount, isOfflinePay, isOpenDriverSelfTrip, name, type, superiorId, principalName, principalPhone, adminName, adminPhone, urgentPhoen, setupTime, identifier, addressCode,
        businessScope, contactAddress, documentAddress, economicType, regCapital, legalName, legalId, legalPhone, legalPhotoUrl, licensingAgency, licenseTime,
        licenseStartTime, licenseEndTime, licenseNumber, carNum, driverNum, mac, state, flag, upload, insertTime, detailAddress, companyInfo, scale
    </sql>
ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCompany.java
@@ -103,6 +103,14 @@
     */
    private Integer isCanSelectSeat;
    /**
     * 代客下单是否可修改金额(1=是,2=否)
     */
    private Integer isCanModifyAmount;
    /**
     * 是否允许线下付款(1=是,2=否)
     */
    private Integer isOfflinePay;
    /**
     * 是否开启司机自助行程(1=是,2=否)
     */
    private Integer isOpenDriverSelfTrip;
@@ -539,6 +547,22 @@
    public void setIsCanSelectSeat(Integer isCanSelectSeat) {
        this.isCanSelectSeat = isCanSelectSeat;
    }
    public Integer getIsCanModifyAmount() {
        return isCanModifyAmount;
    }
    public void setIsCanModifyAmount(Integer isCanModifyAmount) {
        this.isCanModifyAmount = isCanModifyAmount;
    }
    public Integer getIsOfflinePay() {
        return isOfflinePay;
    }
    public void setIsOfflinePay(Integer isOfflinePay) {
        this.isOfflinePay = isOfflinePay;
    }
    
    public Integer getIsOpenDriverSelfTrip() {
        return isOpenDriverSelfTrip;
@@ -925,6 +949,8 @@
        ", sameLogisticsMoney=" + sameLogisticsMoney +
        ", isNeedFerry=" + isNeedFerry +
        ", isCanSelectSeat=" + isCanSelectSeat +
        ", isCanModifyAmount=" + isCanModifyAmount +
        ", isOfflinePay=" + isOfflinePay +
        ", isOpenDriverSelfTrip=" + isOpenDriverSelfTrip +
        ", name=" + name +
        ", type=" + type +
ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_add.html
@@ -196,6 +196,15 @@
                    </div>
                    
                    <div class="form-group">
                        <label class="col-sm-2 control-label">代客下单</label>
                        <div class="col-sm-9" style="display:flex;align-items:center;">
                            <span style="margin-right:10px;">修改金额:</span>
                            <input type="checkbox" class="js-switch-can-modify-amount" id="isCanModifyAmount"/>
                            <span style="margin-left:60px;margin-right:10px;">线下付款:</span>
                            <input type="checkbox" class="js-switch-offline-pay" id="isOfflinePay"/>
                        </div>
                    </div>
                    <div class="form-group">
                        <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">
ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_addFranchisee.html
@@ -129,6 +129,15 @@
                        </div>
                    </div>
                    <div class="form-group">
                        <label class="col-sm-3 control-label">代客下单</label>
                        <div class="col-sm-9" style="display:flex;align-items:center;">
                            <span style="margin-right:10px;">修改金额:</span>
                            <input type="checkbox" class="js-switch-can-modify-amount" id="isCanModifyAmount"/>
                            <span style="margin-left:60px;margin-right:10px;">线下付款:</span>
                            <input type="checkbox" class="js-switch-offline-pay" id="isOfflinePay"/>
                        </div>
                    </div>
                    <div class="form-group">
                        <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">
ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_edit.html
@@ -207,6 +207,15 @@
                </div>
                
                <div class="form-group">
                    <label class="col-sm-2 control-label">代客下单</label>
                    <div class="col-sm-9" style="display:flex;align-items:center;">
                        <span style="margin-right:10px;">修改金额:</span>
                        <input type="checkbox" class="js-switch-can-modify-amount" id="isCanModifyAmount" ${1== item.isCanModifyAmount ? 'checked=checked' : ''}/>
                        <span style="margin-left:60px;margin-right:10px;">线下付款:</span>
                        <input type="checkbox" class="js-switch-offline-pay" id="isOfflinePay" ${1== item.isOfflinePay ? 'checked=checked' : ''}/>
                    </div>
                </div>
                <div class="form-group">
                    <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">
ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_updateFranchisee.html
@@ -130,6 +130,15 @@
                        </div>
                    </div>
                    <div class="form-group">
                        <label class="col-sm-3 control-label">代客下单</label>
                        <div class="col-sm-9" style="display:flex;align-items:center;">
                            <span style="margin-right:10px;">修改金额:</span>
                            <input type="checkbox" class="js-switch-can-modify-amount" id="isCanModifyAmount" ${1== item.isCanModifyAmount ? 'checked=checked' : ''}/>
                            <span style="margin-left:60px;margin-right:10px;">线下付款:</span>
                            <input type="checkbox" class="js-switch-offline-pay" id="isOfflinePay" ${1== item.isOfflinePay ? 'checked=checked' : ''}/>
                        </div>
                    </div>
                    <div class="form-group">
                        <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">
ManagementYKDTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/franchisee_info.js
@@ -329,6 +329,8 @@
    var isNeedFerry = $("input[name='isNeedFerry']:checked").val();
    var isCanSelectSeat = $("input[name='isCanSelectSeat']:checked").val();
    var isCanModifyAmount = $("#isCanModifyAmount").is(":checked") ? 1 : 2;
    var isOfflinePay = $("#isOfflinePay").is(":checked") ? 1 : 2;
    var isOpenDriverSelfTrip = $("input[name='isOpenDriverSelfTrip']:checked").val();
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tCompany/addFranchisee", function(data){
@@ -429,6 +431,8 @@
    }
    ajax.set("isNeedFerry",isNeedFerry);
    ajax.set("isCanSelectSeat",isCanSelectSeat);
    ajax.set("isCanModifyAmount",isCanModifyAmount);
    ajax.set("isOfflinePay",isOfflinePay);
    ajax.set("isOpenDriverSelfTrip",isOpenDriverSelfTrip);
    ajax.set("account",$("#account").val());
    ajax.set("password",$("#password").val());
@@ -575,6 +579,8 @@
    var isNeedFerry = $("input[name='isNeedFerry']:checked").val();
    var isCanSelectSeat = $("input[name='isCanSelectSeat']:checked").val();
    var isCanModifyAmount = $("#isCanModifyAmount").is(":checked") ? 1 : 2;
    var isOfflinePay = $("#isOfflinePay").is(":checked") ? 1 : 2;
    var isOpenDriverSelfTrip = $("input[name='isOpenDriverSelfTrip']:checked").val();
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tCompany/updateFranchisee", function(data){
@@ -671,6 +677,8 @@
    }
    ajax.set("isNeedFerry",isNeedFerry);
    ajax.set("isCanSelectSeat",isCanSelectSeat);
    ajax.set("isCanModifyAmount",isCanModifyAmount);
    ajax.set("isOfflinePay",isOfflinePay);
    ajax.set("isOpenDriverSelfTrip",isOpenDriverSelfTrip);
    ajax.set("account",$("#account").val());
    ajax.set("password",$("#password").val());
@@ -680,6 +688,14 @@
$(function() {
    Feng.initValidator("franchiseeInfoForm", FranchiseeInfoDlg.validateFields);
    var canModifyAmountSwitch = document.querySelector(".js-switch-can-modify-amount");
    if (canModifyAmountSwitch && !canModifyAmountSwitch.getAttribute("data-switchery")) {
        new Switchery(canModifyAmountSwitch);
    }
    var offlinePaySwitch = document.querySelector(".js-switch-offline-pay");
    if (offlinePaySwitch && !offlinePaySwitch.getAttribute("data-switchery")) {
        new Switchery(offlinePaySwitch);
    }
});
//快车
ManagementYKDTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/tCompany_info.js
@@ -336,6 +336,8 @@
    }
    var isNeedFerry = $("input[name='isNeedFerry']:checked").val();
    var isCanSelectSeat = $("input[name='isCanSelectSeat']:checked").val();
    var isCanModifyAmount = $("#isCanModifyAmount").is(":checked") ? 1 : 2;
    var isOfflinePay = $("#isOfflinePay").is(":checked") ? 1 : 2;
    var isOpenDriverSelfTrip = $("input[name='isOpenDriverSelfTrip']:checked").val();
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tCompany/add", function(data){
@@ -436,6 +438,8 @@
    }
    ajax.set("isNeedFerry",isNeedFerry);
    ajax.set("isCanSelectSeat",isCanSelectSeat);
    ajax.set("isCanModifyAmount",isCanModifyAmount);
    ajax.set("isOfflinePay",isOfflinePay);
    ajax.set("isOpenDriverSelfTrip",isOpenDriverSelfTrip);
    ajax.set("subArr",JSON.stringify(subArr));
@@ -596,6 +600,8 @@
    }
    var isNeedFerry = $("input[name='isNeedFerry']:checked").val();
    var isCanSelectSeat = $("input[name='isCanSelectSeat']:checked").val();
    var isCanModifyAmount = $("#isCanModifyAmount").is(":checked") ? 1 : 2;
    var isOfflinePay = $("#isOfflinePay").is(":checked") ? 1 : 2;
    var isOpenDriverSelfTrip = $("input[name='isOpenDriverSelfTrip']:checked").val();
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tCompany/update", function(data){
@@ -692,6 +698,8 @@
    }
    ajax.set("isNeedFerry",isNeedFerry);
    ajax.set("isCanSelectSeat",isCanSelectSeat);
    ajax.set("isCanModifyAmount",isCanModifyAmount);
    ajax.set("isOfflinePay",isOfflinePay);
    ajax.set("isOpenDriverSelfTrip",isOpenDriverSelfTrip);
    ajax.set("subArr",JSON.stringify(subArr));
@@ -703,6 +711,14 @@
$(function() {
    Feng.initValidator("companyInfoForm", TCompanyInfoDlg.validateFields);
    var canModifyAmountSwitch = document.querySelector(".js-switch-can-modify-amount");
    if (canModifyAmountSwitch && !canModifyAmountSwitch.getAttribute("data-switchery")) {
        new Switchery(canModifyAmountSwitch);
    }
    var offlinePaySwitch = document.querySelector(".js-switch-offline-pay");
    if (offlinePaySwitch && !offlinePaySwitch.getAttribute("data-switchery")) {
        new Switchery(offlinePaySwitch);
    }
    // 初始化图片上传
    var idCardPositive = new $WebUpload("idCardPositive");
    idCardPositive.setUploadBarId("progressBar");