司机统计订单，计费规则，司机提现

xuhy

2025-01-09 475993b4a8221e3dd434460569d1c878cdb61495

司机统计订单，计费规则，司机提现

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

@@ -601,7 +601,7 @@
        shellList.add("服务模式:包车[是/否]");
        shellList.add("车辆品牌");
        shellList.add("车辆类型");
        shellList.add("车辆颜色[蓝白色/绿色]");
        shellList.add("车辆颜色[蓝白色/绿色/黄色]");
        shellList.add("车牌号");
        dataList.add(shellList);

@@ -768,7 +768,7 @@
                        return new ErrorTip(500, "服务模式【包车】内容不正确");
                    }
                    //判断车辆颜色
                    if (!eleven.equals("蓝白色") && !eleven.equals("绿色") ){
                    if (!eleven.equals("蓝白色") && !eleven.equals("绿色") && !eleven.equals("黄色") ){
                        return new ErrorTip(500, "车辆颜色内容不正确");
                    }
                    //判断年检到期时间格式是否正确

 ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java

@@ -11,9 +11,7 @@
import com.stylefeng.guns.core.util.DateUtil;
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.ITCompanyCityService;
import com.stylefeng.guns.modular.system.service.ITRegionService;
import com.stylefeng.guns.modular.system.service.IUserService;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.PushMinistryOfTransportUtil;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
@@ -24,7 +22,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import com.stylefeng.guns.core.log.LogObjectHolder;
import org.springframework.web.bind.annotation.RequestParam;
import com.stylefeng.guns.modular.system.service.ITCompanyService;

import java.util.ArrayList;
import java.util.Date;
@@ -57,6 +54,8 @@

    @Autowired
    private PushMinistryOfTransportUtil pushMinistryOfTransportUtil;
    @Autowired
    private ITSystemPriceService systemPriceService;

    @Value("${pushMinistryOfTransport}")
    private boolean pushMinistryOfTransport;
@@ -193,8 +192,6 @@
        }else {
            model.addAttribute("companyName","平台");
        }


        //系统用户对象
        User user = userService.selectOne(new EntityWrapper<User>().eq("roleType", 3).eq("objectId", tCompanyId));
        model.addAttribute("user",user);
@@ -408,6 +405,10 @@
                .eq("objectId", tCompany.getId()));
        user.setStatus(3);
        userService.updateById(user);

        // 删除分公司的计费规则
        systemPriceService.delete(new EntityWrapper<TSystemPrice>().eq("companyId", tCompany.getId()));

        return SUCCESS_TIP;
    }


 ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java

@@ -26,6 +26,7 @@
import org.apache.poi.ss.usermodel.*;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.ui.Model;
@@ -42,6 +43,7 @@
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;

/**
 * 司机审核列表控制器
@@ -57,6 +59,8 @@

    @Autowired
    private ITDriverService tDriverService;
    @Autowired
    private ITOrderTaxiService orderTaxiService;

    @Autowired
    private ITCompanyService tCompanyService;
@@ -578,6 +582,18 @@
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        List<Map<String, Object>> driverList = tDriverService.getDriverList(page, ShiroKit.getUser().getRoleType(), ShiroKit.getUser().getObjectId(),
                beginTime, endTime, companyName, phone, name, addType, authState);
        List<Integer> driverIds = driverList.stream().map(map -> Integer.valueOf(map.get("id").toString())).collect(Collectors.toList());
        // 查询司机订单
        List<TOrderTaxi> orderTaxiList = orderTaxiService.selectList(new EntityWrapper<TOrderTaxi>()
                .in("driverId", driverIds));
        // 查询司机所有的扣款
        List<TPubTransactionDetails> tPubTransactionDetails = pubTransactionDetailsService.selectList(new EntityWrapper<TPubTransactionDetails>()
                .in("userId", driverIds)
                .eq("userType", 2)
                .eq("type", 1)
                .eq("state", 2)
                .eq("orderType", 6));
        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
        for (Map<String, Object> stringObjectMap : driverList) {
            // 司机id
            Integer id = Integer.valueOf(stringObjectMap.get("id").toString());
@@ -596,6 +612,34 @@
                String formattedV = df.format(v);
                stringObjectMap.put("fraction",formattedV);
            }

            // 司机订单统计
            if(CollectionUtils.isEmpty(orderTaxiList)){
                stringObjectMap.put("dayReceivingOrders", 0);
                stringObjectMap.put("sumReceivingOrders", 0);
                stringObjectMap.put("dayIncome", 0);
                stringObjectMap.put("sumIncome", 0);
            }else {
                long dayReceivingOrders = orderTaxiList.stream().filter(orderTaxi -> orderTaxi.getDriverId().equals(id) && format.format(orderTaxi.getTravelTime()).equals(format.format(new Date()))).count();
                stringObjectMap.put("dayReceivingOrders", dayReceivingOrders);
                long sumReceivingOrders = orderTaxiList.stream().filter(orderTaxi -> orderTaxi.getDriverId().equals(id)).count();
                stringObjectMap.put("sumReceivingOrders", sumReceivingOrders);
                // 今日统计收入
                Optional<BigDecimal> dayReduce = orderTaxiList.stream().filter(orderTaxi -> orderTaxi.getDriverId().equals(id)
                        && format.format(orderTaxi.getTravelTime()).equals(format.format(new Date()))
                        && orderTaxi.getState() == 6).map(TOrderTaxi::getPayMoney).reduce(BigDecimal::add);
                Optional<BigDecimal> dayReduceOut = tPubTransactionDetails.stream().filter(pubTransactionDetails -> pubTransactionDetails.getUserId().equals(id)
                                && format.format(pubTransactionDetails.getInsertTime()).equals(format.format(new Date())))
                        .map(TPubTransactionDetails::getMoney).reduce(BigDecimal::add);
                dayReduce.ifPresent(bigDecimal -> stringObjectMap.put("dayIncome", bigDecimal.subtract(dayReduceOut.get())));
                // 过滤所有统计
                Optional<BigDecimal> sumReduce = orderTaxiList.stream().filter(orderTaxi -> orderTaxi.getDriverId().equals(id)
                        && orderTaxi.getState() == 6).map(TOrderTaxi::getPayMoney).reduce(BigDecimal::add);
                Optional<BigDecimal> sumReduceOut = tPubTransactionDetails.stream().filter(pubTransactionDetails -> pubTransactionDetails.getUserId().equals(id))
                        .map(TPubTransactionDetails::getMoney).reduce(BigDecimal::add);
                sumReduce.ifPresent(bigDecimal -> stringObjectMap.put("sumIncome", bigDecimal.subtract(sumReduceOut.get())));
            }

        }
        page.setRecords(driverList);
        return super.packForBT(page);

 ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TWithdrawalController.java

New file
@@ -0,0 +1,121 @@
package com.stylefeng.guns.modular.system.controller.general;

import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
import com.stylefeng.guns.core.log.LogObjectHolder;
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.modular.system.model.TWithdrawal;
import com.stylefeng.guns.modular.system.service.ITDriverService;
import com.stylefeng.guns.modular.system.service.ITWithdrawalService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.*;

import java.util.Map;

/**
 * 提现相关控制器
 */
@RestController
@RequestMapping("/api/withdrawal")
public class TWithdrawalController extends BaseController {

    @Autowired
    private ITWithdrawalService withdrawalService;

    @Autowired
    private ITDriverService driverService;

    private String PREFIX = "/system/tWithdrawal/";

    /**
     * 跳转到提现首页
     */
    @RequestMapping("")
    public String index() {
        return PREFIX + "tWithdrawal.html";
    }

    /**
     * 跳转到添加提现
     */
    @RequestMapping("/tWithdrawal_add")
    public String tWithdrawalAdd(Model model) {
        return PREFIX + "tWithdrawal_add.html";
    }

    /**
     * 跳转到修改提现
     */
    @RequestMapping("/tWithdrawal_update/{tWithdrawalId}")
    public String tWithdrawalUpdate(@PathVariable Integer tWithdrawalId, Model model) {
        TWithdrawal tWithdrawal = withdrawalService.selectById(tWithdrawalId);
        model.addAttribute("item",tWithdrawal);
        LogObjectHolder.me().set(tWithdrawal);
        return PREFIX + "tWithdrawal_edit.html";
    }

    /**
     * 获取提现列表
     */
    @RequestMapping(value = "/list")
    @ResponseBody
    public Object list(String insertTime,
                       String receivePaymentName,
                       Integer status) {
        String beginTime = null;
        String endTime = null;
        if (SinataUtil.isNotEmpty(insertTime)){
            String[] timeArray = insertTime.split(" - ");
            beginTime = timeArray[0];
            endTime = timeArray[1];
        }
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        page.setRecords(withdrawalService.getWithdrawalList(page,beginTime,endTime,receivePaymentName,status));
        return super.packForBT(page);
    }

    /**
     * 新增提现
     */
    @RequestMapping(value = "/add")
    @ResponseBody
    public Object add(TWithdrawal withdrawal) {
        withdrawalService.insert(withdrawal);
        return SUCCESS_TIP;
    }

    /**
     * 删除提现
     */
    @RequestMapping(value = "/delete")
    @ResponseBody
    public Object delete(@RequestParam Integer tWithdrawalId) {
        withdrawalService.deleteById(tWithdrawalId);
        return SUCCESS_TIP;
    }

    /**
     * 修改提现
     */
    @RequestMapping(value = "/update")
    @ResponseBody
    public Object update(TWithdrawal withdrawal) {

        withdrawal.setStatus(withdrawal.getStatus());

        if(withdrawal.getStatus() == 2){
            withdrawal.setReceiptVoucher(withdrawal.getReceiptVoucher());
        }

        if(withdrawal.getStatus() == 3){
            withdrawal.setRemark(withdrawal.getRemark());
        }

        withdrawalService.updateById(withdrawal);
        return SUCCESS_TIP;
    }


}

 ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java

@@ -41,6 +41,8 @@

    @Autowired
    private ITOrderTaxiService tOrderTaxiService;
    @Autowired
    private ITPubTransactionDetailsService pubTransactionDetailsService;

    @Autowired
    private ITOrderPositionService tOrderPositionService;
@@ -103,6 +105,21 @@
    public String tOrderTaxiUpdate(@PathVariable Integer tOrderTaxiId, Model model) {
        Map<String, Object> tOrderTaxi = tOrderTaxiService.getTaxiOrderDetailById(tOrderTaxiId);
        model.addAttribute("item",tOrderTaxi);
        // 查询司机扣款
        TPubTransactionDetails tPubTransactionDetails = pubTransactionDetailsService.selectOne(new EntityWrapper<TPubTransactionDetails>()
                .eq("userId", tOrderTaxi.get("driverId"))
                .eq("state", 2)
                .eq("type", 1)
                .eq("userType", 6)
                .eq("payState", 2)
                .last("LIMIT 1"));
        model.addAttribute("companyMoney",tPubTransactionDetails.getMoney());
        model.addAttribute("driverMoney",new BigDecimal(tOrderTaxi.get("payMoney").toString()).subtract(tPubTransactionDetails.getMoney()));
        if(tOrderTaxi.get("payManner").equals("1")){
            model.addAttribute("payMannerStr","线上收款");
        }else {
            model.addAttribute("payMannerStr","计费打表");
        }
        LogObjectHolder.me().set(tOrderTaxi);
        return PREFIX + "tOrderTaxi_edit.html";
    }

 ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TWithdrawalMapper.java

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

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.modular.system.model.TWithdrawal;
import org.apache.ibatis.annotations.Param;

import java.util.List;
import java.util.Map;

public interface TWithdrawalMapper extends BaseMapper<TWithdrawal> {

    /**
     * 获取提现列表
     * @param page
     * @param beginTime
     * @param endTime
     * @param receivePaymentName
     * @param status
     * @return
     */
    List<Map<String, Object>> getWithdrawalList(@Param("page") Page<Map<String, Object>> page,
                                                @Param("beginTime")String beginTime,
                                                @Param("endTime")String endTime,
                                                @Param("receivePaymentName")String receivePaymentName,
                                                @Param("status")Integer status);
}

 ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TWithdrawalMapper.xml

New file
@@ -0,0 +1,52 @@
<?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.TWithdrawalMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TWithdrawal">
        <id column="id" property="id"/>
        <result column="driverId" property="driverId"/>
        <result column="receivePaymentName" property="receivePaymentName"/>
        <result column="receivePaymentAccount" property="receivePaymentAccount"/>
        <result column="withdrawalType" property="withdrawalType"/>
        <result column="withdrawalMoney" property="withdrawalMoney"/>
        <result column="withdrawalTime" property="withdrawalTime"/>
        <result column="status" property="status"/>
        <result column="openBank" property="openBank"/>
        <result column="remark" property="remark"/>
        <result column="receiptVoucher" property="receiptVoucher"/>
    </resultMap>
    <select id="getWithdrawalList" resultType="java.util.Map">
        select
        t.id,
        t.driverId,
        t.receivePaymentName,
        t.receivePaymentAccount,
        t.withdrawalType,
        t.withdrawalMoney,
        t.withdrawalTime,
        t.status,
        t.openBank,
        t.remark,
        t.receiptVoucher,
        d.name as driverName,
        d.phone as driverPhone,
        d.balance as driverBalance
        from t_withdrawal t
        left join t_driver d on t.driverId = d.id
        <where>
            <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
                and t.withdrawalTime &gt;= #{beginTime} and t.withdrawalTime &lt;= #{endTime}
            </if>
            <if test="receivePaymentName != null and receivePaymentName != ''">
                and t.receivePaymentName like concat('%',#{receivePaymentName},'%')
            </if>
            <if test="status != null">
                and t.status = #{status}
            </if>
        </where>
        order by t.withdrawalTime desc
    </select>


</mapper>

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

@@ -241,6 +241,42 @@
    private String idCardPositive;
    //身份证反面
    private String idCardReverse;
    /**
     * 固定费用
     */
    private Double fixedDeduction;
    /**
     * 线上下单扣除
     */
    private Double percentageDeduction;
    /**
     * 司机接单限制
     */
    private Double driverRestriction;

    public Double getFixedDeduction() {
        return fixedDeduction;
    }

    public void setFixedDeduction(Double fixedDeduction) {
        this.fixedDeduction = fixedDeduction;
    }

    public Double getPercentageDeduction() {
        return percentageDeduction;
    }

    public void setPercentageDeduction(Double percentageDeduction) {
        this.percentageDeduction = percentageDeduction;
    }

    public Double getDriverRestriction() {
        return driverRestriction;
    }

    public void setDriverRestriction(Double driverRestriction) {
        this.driverRestriction = driverRestriction;
    }

    public String getIdCardPositive() {
        return idCardPositive;

 ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderTaxi.java

@@ -1,5 +1,6 @@
package com.stylefeng.guns.modular.system.model;

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.enums.IdType;
import java.math.BigDecimal;
import java.util.Date;
@@ -131,6 +132,51 @@
     */
    private BigDecimal orderMoney;
    /**
     * 起步价
     */
    @TableField("startMoney")
    private Double startMoney;
    /**
     * 里程公里
     */
    @TableField("mileageKilometers")
    private Double mileageKilometers;
    /**
     * 里程费
     */
    @TableField("mileageMoney")
    private Double mileageMoney;
    /**
     * 时长分钟
     */
    @TableField("duration")
    private Double duration;
    /**
     * 时长费
     */
    @TableField("durationMoney")
    private Double durationMoney;
    /**
     * 等待分钟
     */
    @TableField("wait")
    private Double wait;
    /**
     * 等待费
     */
    @TableField("waitMoney")
    private Double waitMoney;
    /**
     * 远途公里
     */
    @TableField("longDistance")
    private Double longDistance;
    /**
     * 远途费
     */
    @TableField("longDistanceMoney")
    private Double longDistanceMoney;
    /**
     * 行程费
     */
    private BigDecimal travelMoney;
@@ -239,6 +285,78 @@
     */
    private Integer isDelete;

    public Double getStartMoney() {
        return startMoney;
    }

    public void setStartMoney(Double startMoney) {
        this.startMoney = startMoney;
    }

    public Double getMileageKilometers() {
        return mileageKilometers;
    }

    public void setMileageKilometers(Double mileageKilometers) {
        this.mileageKilometers = mileageKilometers;
    }

    public Double getMileageMoney() {
        return mileageMoney;
    }

    public void setMileageMoney(Double mileageMoney) {
        this.mileageMoney = mileageMoney;
    }

    public Double getDuration() {
        return duration;
    }

    public void setDuration(Double duration) {
        this.duration = duration;
    }

    public Double getDurationMoney() {
        return durationMoney;
    }

    public void setDurationMoney(Double durationMoney) {
        this.durationMoney = durationMoney;
    }

    public Double getWait() {
        return wait;
    }

    public void setWait(Double wait) {
        this.wait = wait;
    }

    public Double getWaitMoney() {
        return waitMoney;
    }

    public void setWaitMoney(Double waitMoney) {
        this.waitMoney = waitMoney;
    }

    public Double getLongDistance() {
        return longDistance;
    }

    public void setLongDistance(Double longDistance) {
        this.longDistance = longDistance;
    }

    public Double getLongDistanceMoney() {
        return longDistanceMoney;
    }

    public void setLongDistanceMoney(Double longDistanceMoney) {
        this.longDistanceMoney = longDistanceMoney;
    }

    public Integer getOldState() {
        return oldState;
    }

 ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TWithdrawal.java

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

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;

import java.math.BigDecimal;
import java.util.Date;

/**
 * 提现
 */
@TableName("t_withdrawal")
public class TWithdrawal {
    /**
     * 主键
     */
    @TableId(value = "id", type = IdType.AUTO)
    @TableField("id")
    private Integer id;
    /**
     * 司机id
     */
    @TableField("driverId")
    private Integer driverId;
    /**
     * 收款人姓名
     */
    @TableField("receivePaymentName")
    private String receivePaymentName;
    /**
     * 收款账号
     */
    @TableField("receivePaymentAccount")
    private String receivePaymentAccount;
    /**
     * 提现方式 1=支付宝 2=银行卡
     */
    @TableField("withdrawalType")
    private Integer withdrawalType;


    /**
     * 提现金额
     */
    @TableField("withdrawalMoney")
    private BigDecimal withdrawalMoney;
    /**
     * 提现时间
     */
    @TableField("withdrawalTime")
    private Date withdrawalTime;
    /**
     * 提现状态 1=待处理 2=成功 3=失败
     */
    @TableField("status")
    private Integer status;

    /**
     * 开户行
     */
    @TableField("openBank")
    private String openBank;
    /**
     * 备注
     */
    @TableField("remark")
    private String remark;
    /**
     * 到帐凭证
     */
    @TableField("receiptVoucher")
    private String receiptVoucher;

    public Integer getId() {
        return id;
    }

    public void setId(Integer id) {
        this.id = id;
    }

    public Integer getDriverId() {
        return driverId;
    }

    public void setDriverId(Integer driverId) {
        this.driverId = driverId;
    }

    public String getReceivePaymentName() {
        return receivePaymentName;
    }

    public void setReceivePaymentName(String receivePaymentName) {
        this.receivePaymentName = receivePaymentName;
    }

    public String getReceivePaymentAccount() {
        return receivePaymentAccount;
    }

    public void setReceivePaymentAccount(String receivePaymentAccount) {
        this.receivePaymentAccount = receivePaymentAccount;
    }

    public Integer getWithdrawalType() {
        return withdrawalType;
    }

    public void setWithdrawalType(Integer withdrawalType) {
        this.withdrawalType = withdrawalType;
    }

    public BigDecimal getWithdrawalMoney() {
        return withdrawalMoney;
    }

    public void setWithdrawalMoney(BigDecimal withdrawalMoney) {
        this.withdrawalMoney = withdrawalMoney;
    }

    public Date getWithdrawalTime() {
        return withdrawalTime;
    }

    public void setWithdrawalTime(Date withdrawalTime) {
        this.withdrawalTime = withdrawalTime;
    }

    public Integer getStatus() {
        return status;
    }

    public void setStatus(Integer status) {
        this.status = status;
    }

    public String getOpenBank() {
        return openBank;
    }

    public void setOpenBank(String openBank) {
        this.openBank = openBank;
    }

    public String getRemark() {
        return remark;
    }

    public void setRemark(String remark) {
        this.remark = remark;
    }

    public String getReceiptVoucher() {
        return receiptVoucher;
    }

    public void setReceiptVoucher(String receiptVoucher) {
        this.receiptVoucher = receiptVoucher;
    }

    @Override
    public String toString() {
        return "TWithdrawal{" +
                "id=" + id +
                ", driverId=" + driverId +
                ", receivePaymentName='" + receivePaymentName + '\'' +
                ", receivePaymentAccount='" + receivePaymentAccount + '\'' +
                ", withdrawalType=" + withdrawalType +
                ", withdrawalMoney=" + withdrawalMoney +
                ", withdrawalTime=" + withdrawalTime +
                ", status=" + status +
                ", openBank='" + openBank + '\'' +
                ", remark='" + remark + '\'' +
                ", receiptVoucher='" + receiptVoucher + '\'' +
                '}';
    }
}

 ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITWithdrawalService.java

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

import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.IService;
import com.stylefeng.guns.modular.system.model.TWithdrawal;

import java.math.BigDecimal;
import java.util.List;
import java.util.Map;

public interface ITWithdrawalService extends IService<TWithdrawal> {

    /**
     * 获取提现列表
     * @param page
     * @param beginTime
     * @param endTime
     * @param receivePaymentName
     * @param status
     * @return
     */
    List<Map<String, Object>> getWithdrawalList(Page<Map<String, Object>> page, String beginTime, String endTime, String receivePaymentName, Integer status);
}

 ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TWithdrawalServiceImpl.java

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

import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.modular.system.dao.TWithdrawalMapper;
import com.stylefeng.guns.modular.system.model.TWithdrawal;
import com.stylefeng.guns.modular.system.service.ITWithdrawalService;
import org.springframework.stereotype.Service;

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import java.util.Map;


@Service
public class TWithdrawalServiceImpl extends ServiceImpl<TWithdrawalMapper, TWithdrawal> implements ITWithdrawalService {

    @Override
    public List<Map<String, Object>> getWithdrawalList(Page<Map<String, Object>> page, String beginTime, String endTime, String receivePaymentName, Integer status) {
        return this.baseMapper.getWithdrawalList(page, beginTime, endTime, receivePaymentName, status);
    }
}

 ManagementOKTravel/guns-admin/src/main/resources/application.yml

@@ -67,16 +67,21 @@
#    url: jdbc:mysql://127.0.0.1:3306/ziang?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
#    username: root
#    password: fVa%egqp_1du
    url: jdbc:mysql://127.0.0.1:3306/xianning?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
    username: root
    password: 123456
    db-name: guns #用来搜集数据库的所有表
    filters: wall,mergeStat
#    url: jdbc:mysql://36.134.221.234:10633/xianning?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
#    username: xianning
#    password: XianNing@2024!
#    db-name: guns #用来搜集数据库的所有表
#    filters: wall,mergeStat
    url: jdbc:mysql://127.0.0.1:10633/xianning?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
    username: root
    password: XianNing@2024!
    db-name: guns #用来搜集数据库的所有表
    filters: wall,mergeStat
#    url: jdbc:mysql://127.0.0.1:10633/xianning?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
#    username: root
#    password: XianNing@2024!
#    db-name: guns #用来搜集数据库的所有表
#    filters: wall,mergeStat


#spring:

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

@@ -88,6 +88,7 @@
                        <option value="">选择车辆颜色</option>
                        <option value="蓝白色">蓝白色</option>
                        <option value="绿色">绿色</option>
                        <option value="黄色">黄色</option>
                    </#select>
                    <#input id="carLicensePlate" name="*车牌号" />
                    <#avatar id="carPhoto" name="*车辆照片：" />

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

@@ -93,6 +93,7 @@

                        <option value="蓝白色" ${'蓝白色' == item.carColor ? 'selected=selected' : ''}>蓝白色</option>
                        <option value="绿色" ${'绿色' == item.carColor ? 'selected=selected' : ''}>绿色</option>
                        <option value="黄色" ${'黄色' == item.carColor ? 'selected=selected' : ''}>黄色</option>
                    </#select>
                    <#input id="carLicensePlate" name="*车牌号" value="${item.carLicensePlate}"/>
                    <#avatar id="carPhoto" name="*车辆照片：" avatarImg="${item.carPhoto}"/>

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

@@ -143,6 +143,62 @@
<!--                            </div>-->
<!--                        </div>-->
<!--                    </div>-->


                    <div class="form-group">
                        <label class="col-sm-2 control-label">软件使用费：</label>
                    </div>
                    <div class="form-group">
                        <label class="col-sm-2 control-label"></label>
                        <div class="col-sm-5">
                            <div class="col-sm-3">
                                <span class="control-label">订单扣除固定费用</span>
                            </div>
                            <div class="col-sm-3">
                                <input type="text" class="form-control" id="fixedDeduction" name="fixedDeduction" >
                            </div>
                            <div class="col-sm-2">
                                <span class="control-label">元</span>
                            </div>
                        </div>
                        <div class="col-sm-5">
                            <div class="col-sm-2">
                                <span class="control-label">线上下单扣除</span>
                            </div>
                            <div class="col-sm-3">
                                <input type="text" class="form-control" id="percentageDeduction" name="percentageDeduction" >
                            </div>
                            <div class="col-sm-2">
                                <span class="control-label">%</span>
                            </div>
                        </div>
                    </div>

                    <div class="form-group">
                        <label class="col-sm-2 control-label"></label>
                        <div class="col-sm-5">
                            <span class="control-label" style="color: #c1c1c1">人工、一键下单、电召订单使用</span>
                        </div>
                        <div class="col-sm-5">
                            <span class="control-label" style="color: #c1c1c1">线上下单使用</span>
                        </div>
                    </div>

                    <div class="form-group">
                        <label class="col-sm-2 control-label">司机接单限制：</label>
                        <div class="col-sm-9">
                            <div class="col-sm-1">
                                <span class="control-label">余额低于</span>
                            </div>
                            <div class="col-sm-3">
                                <input type="text" class="form-control" id="driverRestriction" name="driverRestriction" >
                            </div>
                            <div class="col-sm-2">
                                <span class="control-label">元不可接单</span>
                            </div>
                        </div>
                    </div>

                    <div class="form-group">
                        <label class="col-sm-2 control-label">限登录MAC地址：</label>
                        <div class="col-sm-9">
@@ -168,6 +224,105 @@
<!--                        </div>-->
<!--                    </div>-->
                </div>


                <div style="float: left;width: 1200px;margin-left: 50px;">
                <div class="form-group exclusivePriceSettings">
                    <h3 style="color: #377CCD;margin-bottom: 20px;">在线计费规则</h3>
                    <div class="form-group">
                        <label class="col-sm-2 control-label">起步价设置：</label>
                        <div class="col-sm-10">
                            起步价为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                            起步包含&nbsp;<input type="text" onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num2" id="num2"  class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
                            &nbsp;<input type="text" onblur="checkIsMinute(this)" name="num3" id="num3"  class="form-control newWidth" placeholder="最多3位数"/>&nbsp;分钟
                            <br/>
                        </div>
                    </div>

                    <div class="form-group">
                        <label class="col-sm-2 control-label">里程费设置：</label>
                        <div class="col-sm-10">
                            超过起步里程后每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num4" id="num4"  class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                            <br/>
                        </div>
                    </div>

                    <div class="form-group">
                        <label class="col-sm-2 control-label">时长费设置：</label>
                        <div class="col-sm-10">
                            超过起步时长后每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                            <br/>
                        </div>
                    </div>

                    <div class="form-group waitFee">
                        <label class="col-sm-2 control-label">等待费设置：</label>
                        <div class="col-sm-10">
                            司机到达预约地点&nbsp;<input type="text" onblur="checkIsMinute(this)" name="num29" id="num29" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;分钟过后开始收取等待费,
                            为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num30" id="num30" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元/分,不足一分钟按照一分钟计算
                            <br/>
                        </div>
                    </div>

                    <div class="form-group">
                        <label class="col-sm-2 control-label">远途费设置：</label>
                        <div class="col-sm-10">
                            总里程超过&nbsp;<input type="text" onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num6" id="num6"  class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
                            不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num7" id="num7" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
                            超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this, 'exclusivePriceSettings')" name="num8" id="num8" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                            <br>
                            <br>
                            超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num9" id="num9" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
                            不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num10" id="num10" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里时,
                            超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num11" id="num11" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                            <br/>
                            <br>
                            超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num12" id="num12" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以后,
                            超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num13" id="num13" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                            <br/>
                        </div>
                    </div>

                    <div class="form-group">
                        <label class="col-sm-2 control-label">夜间行驶费用设置：</label>
                        <div class="col-sm-10">
                            <input type="text" name="num14" id="num14" class="form-control newWidth" placeholder="选择时间"/>&nbsp;点为夜间行驶时间,
                            起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                            <br>
                            <br>
                            里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                            时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                            <br>
                            <br>
                            远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                            、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                            、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                            <br/>
                        </div>
                    </div>

                    <div class="form-group">
                        <label class="col-sm-2 control-label">高峰期费用设置：</label>
                        <div class="col-sm-10">
                            <input type="text" name="num21" id="num21" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;
                            和&nbsp;&nbsp;<input type="text" name="num22" id="num22" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;为高峰期行车时间,
                            起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                            <br>
                            <br>
                            里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                            时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                            <br>
                            <br>
                            远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                            、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                            、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                            <br/>
                        </div>
                    </div>

                </div>
                </div>

            </div>


@@ -182,7 +337,7 @@
    </div>
</div>
<script src="${ctxPath}/static/modular/system/tCompany/tCompany_info.js"></script>
<script>
<script type="text/javascript">
    laydate.render({
        elem: '#setupTime'
    });
@@ -195,5 +350,186 @@
    laydate.render({
        elem: '#licenseEndTime'
    });
    laydate.render({
        elem: '.p1 #num14'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.p1 #num21'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.p1 #num22'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });

    laydate.render({
        elem: '.p2 #num14'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.p2 #num21'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.p2 #num22'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });

    laydate.render({
        elem: '.p3 #num14'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.p3 #num21'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.p3 #num22'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });

    laydate.render({
        elem: '.wp1 #num14'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.wp1 #num21'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.wp1 #num22'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });

    laydate.render({
        elem: '.wp2 #num14'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.wp2 #num21'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.wp2 #num22'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });

    laydate.render({
        elem: '.wp3 #num14'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.wp3 #num21'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.wp3 #num22'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });

    laydate.render({
        elem: '.exclusivePriceSettings #num14'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.exclusivePriceSettings #num21'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.exclusivePriceSettings #num22'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });

    laydate.render({
        elem: '.onePriceSetting #num14'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.onePriceSetting #num21'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });
    laydate.render({
        elem: '.onePriceSetting #num22'
        ,type: 'time'
        ,range: '-'
        ,format: 'HH:mm'
    });

    var regDouble = /^(0|[1-9]\d{0,2})(\.\d{1,2})?$/;
    var regInt = /^[0-9]{0,3}$/;
    function checkIsYuan(obj){
        var num = $(obj).val();
        if(!regDouble.test(num)){
            layer.msg("【元】输入框不能超过3位数,保留两位小数");
            $(obj).val('');
        }
    }
    function checkIsGongLi(obj, clazz){
        var num = $(obj).val();
        if(!regDouble.test(num)){
            layer.msg("【公里】输入框不能超过3位数,保留两位小数");
            $(obj).val('');
        }
        if (obj.id == "num7"){
            $("." + clazz + " #num9").val(num);
        }else if (obj.id == "num10"){
            $("." + clazz + " #num12").val(num);
        }
    }
    function checkIsMinute(obj){
        var num = $(obj).val();
        if(!regInt.test(num)){
            layer.msg("【分钟】输入框不能超过3位数");
            $(obj).val('');
        }
    }

</script>
@}

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

@@ -39,6 +39,155 @@
                        </div>
                    </div>


                    <div class="form-group exclusivePriceSettings">
                        <h3 style="color: #377CCD;margin-bottom: 20px;">在线计费规则</h3>
                        <div class="form-group">
                            <label class="col-sm-2 control-label">起步价设置：</label>
                            <div class="col-sm-10">
                                起步价为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                起步包含&nbsp;<input type="text" onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num2" id="num2"  class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
                                &nbsp;<input type="text" onblur="checkIsMinute(this)" name="num3" id="num3"  class="form-control newWidth" placeholder="最多3位数"/>&nbsp;分钟
                                <br/>
                            </div>
                        </div>

                        <div class="form-group">
                            <label class="col-sm-2 control-label">里程费设置：</label>
                            <div class="col-sm-10">
                                超过起步里程后每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num4" id="num4"  class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                <br/>
                            </div>
                        </div>

                        <div class="form-group">
                            <label class="col-sm-2 control-label">时长费设置：</label>
                            <div class="col-sm-10">
                                超过起步时长后每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                <br/>
                            </div>
                        </div>

                        <div class="form-group waitFee">
                            <label class="col-sm-2 control-label">等待费设置：</label>
                            <div class="col-sm-10">
                                司机到达预约地点&nbsp;<input type="text" onblur="checkIsMinute(this)" name="num29" id="num29" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;分钟过后开始收取等待费,
                                为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num30" id="num30" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元/分,不足一分钟按照一分钟计算
                                <br/>
                            </div>
                        </div>

                        <div class="form-group">
                            <label class="col-sm-2 control-label">远途费设置：</label>
                            <div class="col-sm-10">
                                总里程超过&nbsp;<input type="text" onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num6" id="num6"  class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
                                不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num7" id="num7" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
                                超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this, 'exclusivePriceSettings')" name="num8" id="num8" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                <br>
                                <br>
                                超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num9" id="num9" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
                                不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num10" id="num10" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里时,
                                超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num11" id="num11" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                <br/>
                                <br>
                                超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num12" id="num12" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以后,
                                超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num13" id="num13" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                <br/>
                            </div>
                        </div>

                        <div class="form-group">
                            <label class="col-sm-2 control-label">夜间行驶费用设置：</label>
                            <div class="col-sm-10">
                                <input type="text" name="num14" id="num14" class="form-control newWidth" placeholder="选择时间"/>&nbsp;点为夜间行驶时间,
                                起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                <br>
                                <br>
                                里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                <br>
                                <br>
                                远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                <br/>
                            </div>
                        </div>

                        <div class="form-group">
                            <label class="col-sm-2 control-label">高峰期费用设置：</label>
                            <div class="col-sm-10">
                                <input type="text" name="num21" id="num21" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;
                                和&nbsp;&nbsp;<input type="text" name="num22" id="num22" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;为高峰期行车时间,
                                起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                <br>
                                <br>
                                里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                <br>
                                <br>
                                远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                <br/>
                            </div>
                        </div>


                        <div class="form-group">
                            <label class="col-sm-3 control-label">软件使用费：</label>
                        </div>
                        <div class="form-group">
                            <label class="col-sm-3 control-label"></label>
                            <div class="col-sm-5">
                                <div class="col-sm-3">
                                    <span class="control-label">订单扣除固定费用</span>
                                </div>
                                <div class="col-sm-3">
                                    <input type="text" class="form-control" id="fixedDeduction" name="fixedDeduction" value="${item.fixedDeduction}">
                                </div>
                                <div class="col-sm-2">
                                    <span class="control-label">元</span>
                                </div>
                            </div>
                            <div class="col-sm-4">
                                <div class="col-sm-3">
                                    <span class="control-label">线上下单扣除</span>
                                </div>
                                <div class="col-sm-3">
                                    <input type="text" class="form-control" id="percentageDeduction" name="percentageDeduction" value="${item.percentageDeduction}">
                                </div>
                                <div class="col-sm-2">
                                    <span class="control-label">%</span>
                                </div>
                            </div>
                        </div>

                        <div class="form-group">
                            <label class="col-sm-3 control-label"></label>
                            <div class="col-sm-5">
                                <span class="control-label" style="color: #c1c1c1">人工、一键下单、电召订单使用</span>
                            </div>
                            <div class="col-sm-4">
                                <span class="control-label" style="color: #c1c1c1">线上下单使用</span>
                            </div>
                        </div>

                        <div class="form-group">
                            <label class="col-sm-3 control-label">司机接单限制：</label>
                            <div class="col-sm-9">
                                <div class="col-sm-1">
                                    <span class="control-label">余额低于</span>
                                </div>
                                <div class="col-sm-3">
                                    <input type="text" class="form-control" id="driverRestriction" name="driverRestriction"  value="${item.driverRestriction}">
                                </div>
                                <div class="col-sm-2">
                                    <span class="control-label">元不可接单</span>
                                </div>
                            </div>
                        </div>

                    <div class="form-group">
                        <label class="col-sm-3 control-label">登录账号：</label>
                        <div class="col-sm-9">

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

@@ -129,6 +129,154 @@
                        </div>
                    </div>

                    <div class="form-group exclusivePriceSettings">
                        <h3 style="color: #377CCD;margin-bottom: 20px;">在线计费规则</h3>
                        <div class="form-group">
                            <label class="col-sm-2 control-label">起步价设置：</label>
                            <div class="col-sm-10">
                                起步价为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" value="${contentExclusive.num1}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                起步包含&nbsp;<input type="text" onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num2" id="num2" value="${contentExclusive.num2}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
                                &nbsp;<input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" value="${contentExclusive.num3}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;分钟
                                <br/>
                            </div>
                        </div>

                        <div class="form-group">
                            <label class="col-sm-2 control-label">里程费设置：</label>
                            <div class="col-sm-10">
                                超过起步里程后每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" value="${contentExclusive.num4}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                <br/>
                            </div>
                        </div>

                        <div class="form-group">
                            <label class="col-sm-2 control-label">时长费设置：</label>
                            <div class="col-sm-10">
                                超过起步时长后每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" value="${contentExclusive.num5}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                <br/>
                            </div>
                        </div>

                        <div class="form-group waitFee">
                            <label class="col-sm-2 control-label">等待费设置：</label>
                            <div class="col-sm-10">
                                司机到达预约地点&nbsp;<input type="text" onblur="checkIsMinute(this)" name="num29" id="num29" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;分钟过后开始收取等待费,
                                为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num30" id="num30" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元/分,不足一分钟按照一分钟计算
                                <br/>
                            </div>
                        </div>

                        <div class="form-group">
                            <label class="col-sm-2 control-label">远途费设置：</label>
                            <div class="col-sm-10">
                                总里程超过&nbsp;<input type="text" onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num6" id="num6" value="${contentExclusive.num6}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
                                不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num7" id="num7" value="${contentExclusive.num7}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
                                超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this, 'exclusivePriceSettings')" name="num8" id="num8" value="${contentExclusive.num8}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                <br>
                                <br>
                                超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num9" id="num9" value="${contentExclusive.num9}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
                                不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num10" id="num10" value="${contentExclusive.num10}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里时,
                                超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num11" id="num11" value="${contentExclusive.num11}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                <br/>
                                <br>
                                超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num12" id="num12" value="${contentExclusive.num12}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以后,
                                超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num13" id="num13" value="${contentExclusive.num13}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                <br/>
                            </div>
                        </div>

                        <div class="form-group">
                            <label class="col-sm-2 control-label">夜间行驶费用设置：</label>
                            <div class="col-sm-10">
                                <input type="text" name="num14" id="num14" value="${contentExclusive.num14}" class="form-control newWidth" placeholder="选择时间"/>&nbsp;点为夜间行驶时间,
                                起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" value="${contentExclusive.num15}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                <br>
                                <br>
                                里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" value="${contentExclusive.num16}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" value="${contentExclusive.num17}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                <br>
                                <br>
                                远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" value="${contentExclusive.num18}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" value="${contentExclusive.num19}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" value="${contentExclusive.num20}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                <br/>
                            </div>
                        </div>

                        <div class="form-group">
                            <label class="col-sm-2 control-label">高峰期费用设置：</label>
                            <div class="col-sm-10">
                                <input type="text" name="num21" id="num21" value="${contentExclusive.num21}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;
                                和&nbsp;&nbsp;<input type="text" name="num22" id="num22" value="${contentExclusive.num22}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;为高峰期行车时间,
                                起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" value="${contentExclusive.num23}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                <br>
                                <br>
                                里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" value="${contentExclusive.num24}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" value="${contentExclusive.num25}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                <br>
                                <br>
                                远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" value="${contentExclusive.num26}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" value="${contentExclusive.num27}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" value="${contentExclusive.num28}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                <br/>
                            </div>
                        </div>
                    </div>

                    <div class="form-group">
                        <label class="col-sm-2 control-label">软件使用费：</label>
                    </div>
                    <div class="form-group">
                        <label class="col-sm-2 control-label"></label>
                        <div class="col-sm-5">
                            <div class="col-sm-3">
                                <span class="control-label">订单扣除固定费用</span>
                            </div>
                            <div class="col-sm-3">
                                <input type="text" class="form-control" id="fixedDeduction" name="fixedDeduction" value="${item.fixedDeduction}" disabled>
                            </div>
                            <div class="col-sm-2">
                                <span class="control-label">元</span>
                            </div>
                        </div>
                        <div class="col-sm-5">
                            <div class="col-sm-2">
                                <span class="control-label">线上下单扣除</span>
                            </div>
                            <div class="col-sm-3">
                                <input type="text" class="form-control" id="percentageDeduction" name="percentageDeduction" value="${item.percentageDeduction}" disabled>
                            </div>
                            <div class="col-sm-2">
                                <span class="control-label">%</span>
                            </div>
                        </div>
                    </div>

                    <div class="form-group">
                        <label class="col-sm-2 control-label"></label>
                        <div class="col-sm-5">
                            <span class="control-label" style="color: #c1c1c1">人工、一键下单、电召订单使用</span>
                        </div>
                        <div class="col-sm-5">
                            <span class="control-label" style="color: #c1c1c1">线上下单使用</span>
                        </div>
                    </div>

                    <div class="form-group">
                        <label class="col-sm-2 control-label">司机接单限制：</label>
                        <div class="col-sm-9">
                            <div class="col-sm-1">
                                <span class="control-label">余额低于</span>
                            </div>
                            <div class="col-sm-3">
                                <input type="text" class="form-control" id="driverRestriction" name="driverRestriction"  value="${item.driverRestriction}" disabled>
                            </div>
                            <div class="col-sm-2">
                                <span class="control-label">元不可接单</span>
                            </div>
                        </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;">

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

@@ -31,6 +31,154 @@
                    </div>
                </div>

                <div class="form-group exclusivePriceSettings">
                    <h3 style="color: #377CCD;margin-bottom: 20px;">在线计费规则</h3>
                    <div class="form-group">
                        <label class="col-sm-2 control-label">起步价设置：</label>
                        <div class="col-sm-10">
                            起步价为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" value="${contentExclusive.num1}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                            起步包含&nbsp;<input type="text" onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num2" id="num2" value="${contentExclusive.num2}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
                            &nbsp;<input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" value="${contentExclusive.num3}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;分钟
                            <br/>
                        </div>
                    </div>

                    <div class="form-group">
                        <label class="col-sm-2 control-label">里程费设置：</label>
                        <div class="col-sm-10">
                            超过起步里程后每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" value="${contentExclusive.num4}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                            <br/>
                        </div>
                    </div>

                    <div class="form-group">
                        <label class="col-sm-2 control-label">时长费设置：</label>
                        <div class="col-sm-10">
                            超过起步时长后每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" value="${contentExclusive.num5}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                            <br/>
                        </div>
                    </div>

                    <div class="form-group waitFee">
                        <label class="col-sm-2 control-label">等待费设置：</label>
                        <div class="col-sm-10">
                            司机到达预约地点&nbsp;<input type="text" onblur="checkIsMinute(this)" name="num29" id="num29" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;分钟过后开始收取等待费,
                            为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num30" id="num30" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元/分,不足一分钟按照一分钟计算
                            <br/>
                        </div>
                    </div>

                    <div class="form-group">
                        <label class="col-sm-2 control-label">远途费设置：</label>
                        <div class="col-sm-10">
                            总里程超过&nbsp;<input type="text" onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num6" id="num6" value="${contentExclusive.num6}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
                            不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num7" id="num7" value="${contentExclusive.num7}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
                            超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this, 'exclusivePriceSettings')" name="num8" id="num8" value="${contentExclusive.num8}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                            <br>
                            <br>
                            超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num9" id="num9" value="${contentExclusive.num9}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
                            不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num10" id="num10" value="${contentExclusive.num10}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里时,
                            超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num11" id="num11" value="${contentExclusive.num11}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                            <br/>
                            <br>
                            超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num12" id="num12" value="${contentExclusive.num12}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以后,
                            超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num13" id="num13" value="${contentExclusive.num13}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                            <br/>
                        </div>
                    </div>

                    <div class="form-group">
                        <label class="col-sm-2 control-label">夜间行驶费用设置：</label>
                        <div class="col-sm-10">
                            <input type="text" name="num14" id="num14" value="${contentExclusive.num14}" class="form-control newWidth" placeholder="选择时间"/>&nbsp;点为夜间行驶时间,
                            起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" value="${contentExclusive.num15}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                            <br>
                            <br>
                            里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" value="${contentExclusive.num16}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                            时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" value="${contentExclusive.num17}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                            <br>
                            <br>
                            远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" value="${contentExclusive.num18}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                            、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" value="${contentExclusive.num19}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                            、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" value="${contentExclusive.num20}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                            <br/>
                        </div>
                    </div>

                    <div class="form-group">
                        <label class="col-sm-2 control-label">高峰期费用设置：</label>
                        <div class="col-sm-10">
                            <input type="text" name="num21" id="num21" value="${contentExclusive.num21}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;
                            和&nbsp;&nbsp;<input type="text" name="num22" id="num22" value="${contentExclusive.num22}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;为高峰期行车时间,
                            起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" value="${contentExclusive.num23}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                            <br>
                            <br>
                            里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" value="${contentExclusive.num24}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                            时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" value="${contentExclusive.num25}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                            <br>
                            <br>
                            远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" value="${contentExclusive.num26}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                            、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" value="${contentExclusive.num27}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                            、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" value="${contentExclusive.num28}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                            <br/>
                        </div>
                    </div>
                </div>

                <div class="form-group">
                    <label class="col-sm-3 control-label">软件使用费：</label>
                </div>
                <div class="form-group">
                    <label class="col-sm-3 control-label"></label>
                    <div class="col-sm-5">
                        <div class="col-sm-3">
                            <span class="control-label">订单扣除固定费用</span>
                        </div>
                        <div class="col-sm-3">
                            <input type="text" class="form-control" id="fixedDeduction" name="fixedDeduction" value="${item.fixedDeduction}" disabled>
                        </div>
                        <div class="col-sm-2">
                            <span class="control-label">元</span>
                        </div>
                    </div>
                    <div class="col-sm-4">
                        <div class="col-sm-3">
                            <span class="control-label">线上下单扣除</span>
                        </div>
                        <div class="col-sm-3">
                            <input type="text" class="form-control" id="percentageDeduction" name="percentageDeduction" value="${item.percentageDeduction}" disabled>
                        </div>
                        <div class="col-sm-2">
                            <span class="control-label">%</span>
                        </div>
                    </div>
                </div>

                <div class="form-group">
                    <label class="col-sm-3 control-label"></label>
                    <div class="col-sm-5">
                        <span class="control-label" style="color: #c1c1c1">人工、一键下单、电召订单使用</span>
                    </div>
                    <div class="col-sm-4">
                        <span class="control-label" style="color: #c1c1c1">线上下单使用</span>
                    </div>
                </div>

                <div class="form-group">
                    <label class="col-sm-3 control-label">司机接单限制：</label>
                    <div class="col-sm-9">
                        <div class="col-sm-1">
                            <span class="control-label">余额低于</span>
                        </div>
                        <div class="col-sm-3">
                            <input type="text" class="form-control" id="driverRestriction" name="driverRestriction"  value="${item.driverRestriction}" disabled>
                        </div>
                        <div class="col-sm-2">
                            <span class="control-label">元不可接单</span>
                        </div>
                    </div>
                </div>

            </div>
        </div>


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

@@ -113,6 +113,155 @@
                        </div>
                    </div>


                    <div class="form-group exclusivePriceSettings">
                        <h3 style="color: #377CCD;margin-bottom: 20px;">在线计费规则</h3>
                        <div class="form-group">
                            <label class="col-sm-2 control-label">起步价设置：</label>
                            <div class="col-sm-10">
                                起步价为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" value="${contentExclusive.num1}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                起步包含&nbsp;<input type="text" onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num2" id="num2" value="${contentExclusive.num2}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
                                &nbsp;<input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" value="${contentExclusive.num3}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;分钟
                                <br/>
                            </div>
                        </div>

                        <div class="form-group">
                            <label class="col-sm-2 control-label">里程费设置：</label>
                            <div class="col-sm-10">
                                超过起步里程后每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" value="${contentExclusive.num4}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                <br/>
                            </div>
                        </div>

                        <div class="form-group">
                            <label class="col-sm-2 control-label">时长费设置：</label>
                            <div class="col-sm-10">
                                超过起步时长后每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" value="${contentExclusive.num5}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                <br/>
                            </div>
                        </div>

                        <div class="form-group waitFee">
                            <label class="col-sm-2 control-label">等待费设置：</label>
                            <div class="col-sm-10">
                                司机到达预约地点&nbsp;<input type="text" onblur="checkIsMinute(this)" name="num29" id="num29" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;分钟过后开始收取等待费,
                                为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num30" id="num30" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元/分,不足一分钟按照一分钟计算
                                <br/>
                            </div>
                        </div>

                        <div class="form-group">
                            <label class="col-sm-2 control-label">远途费设置：</label>
                            <div class="col-sm-10">
                                总里程超过&nbsp;<input type="text" onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num6" id="num6" value="${contentExclusive.num6}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
                                不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num7" id="num7" value="${contentExclusive.num7}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
                                超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this, 'exclusivePriceSettings')" name="num8" id="num8" value="${contentExclusive.num8}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                <br>
                                <br>
                                超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num9" id="num9" value="${contentExclusive.num9}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
                                不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num10" id="num10" value="${contentExclusive.num10}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里时,
                                超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num11" id="num11" value="${contentExclusive.num11}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                <br/>
                                <br>
                                超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num12" id="num12" value="${contentExclusive.num12}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以后,
                                超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num13" id="num13" value="${contentExclusive.num13}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                <br/>
                            </div>
                        </div>

                        <div class="form-group">
                            <label class="col-sm-2 control-label">夜间行驶费用设置：</label>
                            <div class="col-sm-10">
                                <input type="text" name="num14" id="num14" value="${contentExclusive.num14}" class="form-control newWidth" placeholder="选择时间"/>&nbsp;点为夜间行驶时间,
                                起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" value="${contentExclusive.num15}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                <br>
                                <br>
                                里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" value="${contentExclusive.num16}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" value="${contentExclusive.num17}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                <br>
                                <br>
                                远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" value="${contentExclusive.num18}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" value="${contentExclusive.num19}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" value="${contentExclusive.num20}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                <br/>
                            </div>
                        </div>

                        <div class="form-group">
                            <label class="col-sm-2 control-label">高峰期费用设置：</label>
                            <div class="col-sm-10">
                                <input type="text" name="num21" id="num21" value="${contentExclusive.num21}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;
                                和&nbsp;&nbsp;<input type="text" name="num22" id="num22" value="${contentExclusive.num22}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;为高峰期行车时间,
                                起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" value="${contentExclusive.num23}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                <br>
                                <br>
                                里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" value="${contentExclusive.num24}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" value="${contentExclusive.num25}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                <br>
                                <br>
                                远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" value="${contentExclusive.num26}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" value="${contentExclusive.num27}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" value="${contentExclusive.num28}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                <br/>
                            </div>
                        </div>
                    </div>

                    <div class="form-group">
                        <label class="col-sm-2 control-label">软件使用费：</label>
                    </div>
                    <div class="form-group">
                        <label class="col-sm-2 control-label"></label>
                        <div class="col-sm-5">
                            <div class="col-sm-3">
                                <span class="control-label">订单扣除固定费用</span>
                            </div>
                            <div class="col-sm-3">
                                <input type="text" class="form-control" id="fixedDeduction" name="fixedDeduction" value="${item.fixedDeduction}">
                            </div>
                            <div class="col-sm-2">
                                <span class="control-label">元</span>
                            </div>
                        </div>
                        <div class="col-sm-5">
                            <div class="col-sm-2">
                                <span class="control-label">线上下单扣除</span>
                            </div>
                            <div class="col-sm-3">
                                <input type="text" class="form-control" id="percentageDeduction" name="percentageDeduction" value="${item.percentageDeduction}">
                            </div>
                            <div class="col-sm-2">
                                <span class="control-label">%</span>
                            </div>
                        </div>
                    </div>

                    <div class="form-group">
                        <label class="col-sm-2 control-label"></label>
                        <div class="col-sm-5">
                            <span class="control-label" style="color: #c1c1c1">人工、一键下单、电召订单使用</span>
                        </div>
                        <div class="col-sm-5">
                            <span class="control-label" style="color: #c1c1c1">线上下单使用</span>
                        </div>
                    </div>

                    <div class="form-group">
                        <label class="col-sm-2 control-label">司机接单限制：</label>
                        <div class="col-sm-9">
                            <div class="col-sm-1">
                                <span class="control-label">余额低于</span>
                            </div>
                            <div class="col-sm-3">
                                <input type="text" class="form-control" id="driverRestriction" name="driverRestriction"  value="${item.driverRestriction}">
                            </div>
                            <div class="col-sm-2">
                                <span class="control-label">元不可接单</span>
                            </div>
                        </div>
                    </div>

                    <div class="form-group">
                        <label class="col-sm-2 control-label">限登录MAC地址：</label>
                        <div class="col-sm-9">

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

@@ -38,6 +38,156 @@
                        </div>
                    </div>


                    <div class="form-group exclusivePriceSettings">
                        <h3 style="color: #377CCD;margin-bottom: 20px;">在线计费规则</h3>
                        <div class="form-group">
                            <label class="col-sm-2 control-label">起步价设置：</label>
                            <div class="col-sm-10">
                                起步价为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num1" id="num1" value="${contentExclusive.num1}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                起步包含&nbsp;<input type="text" onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num2" id="num2" value="${contentExclusive.num2}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
                                &nbsp;<input type="text" onblur="checkIsMinute(this)" name="num3" id="num3" value="${contentExclusive.num3}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;分钟
                                <br/>
                            </div>
                        </div>

                        <div class="form-group">
                            <label class="col-sm-2 control-label">里程费设置：</label>
                            <div class="col-sm-10">
                                超过起步里程后每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num4" id="num4" value="${contentExclusive.num4}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                <br/>
                            </div>
                        </div>

                        <div class="form-group">
                            <label class="col-sm-2 control-label">时长费设置：</label>
                            <div class="col-sm-10">
                                超过起步时长后每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num5" id="num5" value="${contentExclusive.num5}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                <br/>
                            </div>
                        </div>

                        <div class="form-group waitFee">
                            <label class="col-sm-2 control-label">等待费设置：</label>
                            <div class="col-sm-10">
                                司机到达预约地点&nbsp;<input type="text" onblur="checkIsMinute(this)" name="num29" id="num29" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;分钟过后开始收取等待费,
                                为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num30" id="num30" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元/分,不足一分钟按照一分钟计算
                                <br/>
                            </div>
                        </div>

                        <div class="form-group">
                            <label class="col-sm-2 control-label">远途费设置：</label>
                            <div class="col-sm-10">
                                总里程超过&nbsp;<input type="text" onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num6" id="num6" value="${contentExclusive.num6}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
                                不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num7" id="num7" value="${contentExclusive.num7}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里,
                                超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this, 'exclusivePriceSettings')" name="num8" id="num8" value="${contentExclusive.num8}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                <br>
                                <br>
                                超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num9" id="num9" value="${contentExclusive.num9}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里
                                不足&nbsp;<input type="text" onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num10" id="num10" value="${contentExclusive.num10}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里时,
                                超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num11" id="num11" value="${contentExclusive.num11}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                <br/>
                                <br>
                                超过&nbsp;<input type="text" disabled onblur="checkIsGongLi(this, 'exclusivePriceSettings')" name="num12" id="num12" value="${contentExclusive.num12}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;公里以后,
                                超出部分每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num13" id="num13" value="${contentExclusive.num13}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                <br/>
                            </div>
                        </div>

                        <div class="form-group">
                            <label class="col-sm-2 control-label">夜间行驶费用设置：</label>
                            <div class="col-sm-10">
                                <input type="text" name="num14" id="num14" value="${contentExclusive.num14}" class="form-control newWidth" placeholder="选择时间"/>&nbsp;点为夜间行驶时间,
                                起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num15" id="num15" value="${contentExclusive.num15}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                <br>
                                <br>
                                里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num16" id="num16" value="${contentExclusive.num16}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num17" id="num17" value="${contentExclusive.num17}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                <br>
                                <br>
                                远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num18" id="num18" value="${contentExclusive.num18}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num19" id="num19" value="${contentExclusive.num19}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num20" id="num20" value="${contentExclusive.num20}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                <br/>
                            </div>
                        </div>

                        <div class="form-group">
                            <label class="col-sm-2 control-label">高峰期费用设置：</label>
                            <div class="col-sm-10">
                                <input type="text" name="num21" id="num21" value="${contentExclusive.num21}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;
                                和&nbsp;&nbsp;<input type="text" name="num22" id="num22" value="${contentExclusive.num22}" class="form-control newWidth" placeholder="选择时间段"/>&nbsp;为高峰期行车时间,
                                起步价变为&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num23" id="num23" value="${contentExclusive.num23}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                <br>
                                <br>
                                里程费为每公里&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num24" id="num24" value="${contentExclusive.num24}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元,
                                时长费为每分钟&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num25" id="num25" value="${contentExclusive.num25}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                <br>
                                <br>
                                远途费为每公里加收&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num26" id="num26" value="${contentExclusive.num26}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num27" id="num27" value="${contentExclusive.num27}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;
                                、&nbsp;<input type="text" onblur="checkIsYuan(this)" name="num28" id="num28" value="${contentExclusive.num28}" class="form-control newWidth" placeholder="最多3位数"/>&nbsp;元
                                <br/>
                            </div>
                        </div>
                    </div>


                    <div class="form-group">
                        <label class="col-sm-3 control-label">软件使用费：</label>
                    </div>
                    <div class="form-group">
                        <label class="col-sm-3 control-label"></label>
                        <div class="col-sm-5">
                            <div class="col-sm-3">
                                <span class="control-label">订单扣除固定费用</span>
                            </div>
                            <div class="col-sm-3">
                                <input type="text" class="form-control" id="fixedDeduction" name="fixedDeduction" value="${item.fixedDeduction}">
                            </div>
                            <div class="col-sm-2">
                                <span class="control-label">元</span>
                            </div>
                        </div>
                        <div class="col-sm-4">
                            <div class="col-sm-3">
                                <span class="control-label">线上下单扣除</span>
                            </div>
                            <div class="col-sm-3">
                                <input type="text" class="form-control" id="percentageDeduction" name="percentageDeduction" value="${item.percentageDeduction}">
                            </div>
                            <div class="col-sm-2">
                                <span class="control-label">%</span>
                            </div>
                        </div>
                    </div>

                    <div class="form-group">
                        <label class="col-sm-3 control-label"></label>
                        <div class="col-sm-5">
                            <span class="control-label" style="color: #c1c1c1">人工、一键下单、电召订单使用</span>
                        </div>
                        <div class="col-sm-4">
                            <span class="control-label" style="color: #c1c1c1">线上下单使用</span>
                        </div>
                    </div>

                    <div class="form-group">
                        <label class="col-sm-3 control-label">司机接单限制：</label>
                        <div class="col-sm-9">
                            <div class="col-sm-1">
                                <span class="control-label">余额低于</span>
                            </div>
                            <div class="col-sm-3">
                                <input type="text" class="form-control" id="driverRestriction" name="driverRestriction"  value="${item.driverRestriction}">
                            </div>
                            <div class="col-sm-2">
                                <span class="control-label">元不可接单</span>
                            </div>
                        </div>
                    </div>

                    <div class="form-group">
                        <label class="col-sm-3 control-label">登录账号：</label>
                        <div class="col-sm-9">

 ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_edit.html

@@ -34,6 +34,21 @@
                    <#label id="car" name="接单车辆" value="${item.car}"/>
                    <#label id="boardingAddress" name="上车地点" value="${item.boardingAddress}"/>
                    <#label id="getoffAddress" name="下车地点" value="${item.getoffAddress}"/>
                    @if(item.payManner == 2){
                        <#label id="payMoney" name="订单总价" value="${item.payMoney}"/>
                        <#label id="companyMoney" name="平台收益" value="${companyMoney}"/>
                    @}
                    @if(item.payManner == 1){
                        <#label id="payMoney" name="订单总价" value="${item.payMoney}"/>
                        <#label id="companyMoney" name="起步价" value="${item.startMoney}"/>
                        <#label id="companyMoney" name="等待费" value="${item.waitMoney}"/>
                        <#label id="companyMoney" name="时长费" value="${item.durationMoney}"/>
                        <#label id="companyMoney" name="里程费" value="${item.mileageMoney}"/>
                        <#label id="companyMoney" name="远途费" value="${item.longDistanceMoney}"/>
                        <#label id="companyMoney" name="过路费" value="${item.roadTollMoney}"/>
                        <#label id="companyMoney" name="停车费" value="${item.parkMoney}"/>
                        <#label id="companyMoney" name="平台抽成" value="${companyMoney}"/>
                    @}
                </div>

                <div class="col-sm-6">
@@ -45,6 +60,13 @@
                    <#label id="companyName" name="车辆所属机构" value="${item.companyName}"/>
                    <#label id="boardingTimeStr" name="上车时间" value="${item.boardingTimeStr}"/>
                    <#label id="getoffTimeStr" name="下车时间" value="${item.getoffTimeStr}"/>
                    @if(item.payManner == 2){
                        <#label id="payMannerStr" name="支付方式" value="${payMannerStr}"/>
                        <#label id="driverMoney" name="司机收益" value="${driverMoney}"/>
                    @}
                    @if(item.payManner == 1){
                        <#label id="payMannerStr" name="支付方式" value="${payMannerStr}"/>
                    @}
                </div>
            </div>
            <div class="row" style="margin-top: 30px;">
@@ -75,7 +97,7 @@
    </div>
</div>
<script src="https://a.amap.com/jsapi_demos/static/demo-center/js/demoutils.js"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=e17d799b2506d05faf7f88320a266803"></script>
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3mHKIXMArjgIkgADzOlTYp4XssNSNkwr"></script>
<script src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
<script src="${ctxPath}/static/modular/system/tOrderTaxi/tOrderTaxi_info.js"></script>
@}

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

@@ -147,6 +147,9 @@
        .set('scopeCode')
        .set('idCardPositive')
        .set('idCardReverse')
        .set('fixedDeduction')
        .set('percentageDeduction')
        .set('driverRestriction')
        .set('serviceScope');
}

@@ -170,6 +173,168 @@
    }
    var checkbox2 = $('#checkbox2').prop('checked');

    let fixedDeduction = $('#fixedDeduction').val();
    regexp(fixedDeduction, "固定费用")

    let percentageDeduction = $('#percentageDeduction').val();
    regexp(percentageDeduction, "线上下单扣除")

    let driverRestriction = $('#driverRestriction').val();
    regexp(driverRestriction, "司机接单限制")


    var b = false;
    var waitFee = '{';
    $('.waitFee input[type="text"]').each(function(){
        var value = $(this).val();
        if('' == value){
            b = true;
            Feng.info("请填写完整配置");
            return
        }
        waitFee = waitFee + '"'+$(this)[0].name+'":"'+value+'",';
    });
    waitFee = waitFee.substring(0,waitFee.length-1);
    waitFee += '}';
    console.log(waitFee);

    var p1 = '{';
    $('.p1 input[type="text"]').each(function(){
        var value = $(this).val();
        if('' == value){
            b = true;
            Feng.info("请填写完整配置");
            return
        }
        p1 = p1 + '"'+$(this)[0].name+'":"'+value+'",';
    });
    p1 = p1.substring(0,p1.length-1);
    p1 += '}';
    console.log(p1);
    if(b){
        return
    }

    var p2 = '{';
    $('.p2 input[type="text"]').each(function(){
        var value = $(this).val();
        if('' == value){
            b = true;
            Feng.info("请填写完整配置");
            return
        }
        p2 = p2 + '"'+$(this)[0].name+'":"'+value+'",';
    });
    p2 = p2.substring(0,p2.length-1);
    p2 += '}';
    console.log(p2);
    if(b){
        return
    }

    var p3 = '{';
    $('.p3 input[type="text"]').each(function(){
        var value = $(this).val();
        if('' == value){
            b = true;
            Feng.info("请填写完整配置");
            return
        }
        p3 = p3 + '"'+$(this)[0].name+'":"'+value+'",';
    });
    p3 = p3.substring(0,p3.length-1);
    p3 += '}';
    console.log(p3);
    if(b){
        return
    }

    var wp1 = '{';
    $('.wp1 input[type="text"]').each(function(){
        var value = $(this).val();
        if('' == value){
            b = true;
            Feng.info("请填写完整配置");
            return
        }
        wp1 = wp1 + '"'+$(this)[0].name+'":"'+value+'",';
    });
    wp1 = wp1.substring(0,wp1.length-1);
    wp1 += '}';
    console.log(wp1);
    if(b){
        return
    }

    var wp2 = '{';
    $('.wp2 input[type="text"]').each(function(){
        var value = $(this).val();
        if('' == value){
            b = true;
            Feng.info("请填写完整配置");
            return
        }
        wp2 = wp2 + '"'+$(this)[0].name+'":"'+value+'",';
    });
    wp2 = wp2.substring(0,wp2.length-1);
    wp2 += '}';
    console.log(wp2);
    if(b){
        return
    }

    var wp3 = '{';
    $('.wp3 input[type="text"]').each(function(){
        var value = $(this).val();
        if('' == value){
            b = true;
            Feng.info("请填写完整配置");
            return
        }
        wp3 = wp3 + '"'+$(this)[0].name+'":"'+value+'",';
    });
    wp3 = wp3.substring(0,wp3.length-1);
    wp3 += '}';
    console.log(wp3);
    if(b){
        return
    }

    var contentExclusive = '{';
    //拼接数据
    $(".exclusivePriceSettings input[type='text']").each(function(){
        var value = $(this).val();
        if('' == value){
            b = true;
            Feng.info("请填写完整配置");
            return
        }
        contentExclusive = contentExclusive + '"'+$(this)[0].name+'":"'+value+'",';
    });
    contentExclusive = contentExclusive.substring(0,contentExclusive.length-1);
    contentExclusive += '}';
    console.log(contentExclusive);
    if(b){
        return
    }

    var contentPrice = '{';
    //拼接数据
    $(".onePriceSetting input[type='text']").each(function(){
        var value = $(this).val();
        if('' == value){
            b = true;
            Feng.info("请填写完整配置");
            return
        }
        contentPrice = contentPrice + '"'+$(this)[0].name+'":"'+value+'",';
    });
    contentPrice = contentPrice.substring(0,contentPrice.length-1);
    contentPrice += '}';
    console.log(contentPrice);
    if(b){
        return
    }


    //提交信息
@@ -233,6 +398,170 @@
        }
    }

    let fixedDeduction = $('#fixedDeduction').val();
    regexp(fixedDeduction, "固定费用")

    let percentageDeduction = $('#percentageDeduction').val();
    regexp(percentageDeduction, "线上下单扣除")

    let driverRestriction = $('#driverRestriction').val();
    regexp(driverRestriction, "司机接单限制")


    var b = false;
    var waitFee = '{';
    $('.waitFee input[type="text"]').each(function(){
        var value = $(this).val();
        if('' == value){
            b = true;
            Feng.info("请填写完整配置");
            return
        }
        waitFee = waitFee + '"'+$(this)[0].name+'":"'+value+'",';
    });
    waitFee = waitFee.substring(0,waitFee.length-1);
    waitFee += '}';
    console.log(waitFee);

    var p1 = '{';
    $('.p1 input[type="text"]').each(function(){
        var value = $(this).val();
        if('' == value){
            b = true;
            Feng.info("请填写完整配置");
            return
        }
        p1 = p1 + '"'+$(this)[0].name+'":"'+value+'",';
    });
    p1 = p1.substring(0,p1.length-1);
    p1 += '}';
    console.log(p1);
    if(b){
        return
    }

    var p2 = '{';
    $('.p2 input[type="text"]').each(function(){
        var value = $(this).val();
        if('' == value){
            b = true;
            Feng.info("请填写完整配置");
            return
        }
        p2 = p2 + '"'+$(this)[0].name+'":"'+value+'",';
    });
    p2 = p2.substring(0,p2.length-1);
    p2 += '}';
    console.log(p2);
    if(b){
        return
    }

    var p3 = '{';
    $('.p3 input[type="text"]').each(function(){
        var value = $(this).val();
        if('' == value){
            b = true;
            Feng.info("请填写完整配置");
            return
        }
        p3 = p3 + '"'+$(this)[0].name+'":"'+value+'",';
    });
    p3 = p3.substring(0,p3.length-1);
    p3 += '}';
    console.log(p3);
    if(b){
        return
    }

    var wp1 = '{';
    $('.wp1 input[type="text"]').each(function(){
        var value = $(this).val();
        if('' == value){
            b = true;
            Feng.info("请填写完整配置");
            return
        }
        wp1 = wp1 + '"'+$(this)[0].name+'":"'+value+'",';
    });
    wp1 = wp1.substring(0,wp1.length-1);
    wp1 += '}';
    console.log(wp1);
    if(b){
        return
    }

    var wp2 = '{';
    $('.wp2 input[type="text"]').each(function(){
        var value = $(this).val();
        if('' == value){
            b = true;
            Feng.info("请填写完整配置");
            return
        }
        wp2 = wp2 + '"'+$(this)[0].name+'":"'+value+'",';
    });
    wp2 = wp2.substring(0,wp2.length-1);
    wp2 += '}';
    console.log(wp2);
    if(b){
        return
    }

    var wp3 = '{';
    $('.wp3 input[type="text"]').each(function(){
        var value = $(this).val();
        if('' == value){
            b = true;
            Feng.info("请填写完整配置");
            return
        }
        wp3 = wp3 + '"'+$(this)[0].name+'":"'+value+'",';
    });
    wp3 = wp3.substring(0,wp3.length-1);
    wp3 += '}';
    console.log(wp3);
    if(b){
        return
    }

    var contentExclusive = '{';
    //拼接数据
    $(".exclusivePriceSettings input[type='text']").each(function(){
        var value = $(this).val();
        if('' == value){
            b = true;
            Feng.info("请填写完整配置");
            return
        }
        contentExclusive = contentExclusive + '"'+$(this)[0].name+'":"'+value+'",';
    });
    contentExclusive = contentExclusive.substring(0,contentExclusive.length-1);
    contentExclusive += '}';
    console.log(contentExclusive);
    if(b){
        return
    }

    var contentPrice = '{';
    //拼接数据
    $(".onePriceSetting input[type='text']").each(function(){
        var value = $(this).val();
        if('' == value){
            b = true;
            Feng.info("请填写完整配置");
            return
        }
        contentPrice = contentPrice + '"'+$(this)[0].name+'":"'+value+'",';
    });
    contentPrice = contentPrice.substring(0,contentPrice.length-1);
    contentPrice += '}';
    console.log(contentPrice);
    if(b){
        return
    }


    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tCompany/updateFranchisee", function(data){
        if ("error" == data){
@@ -268,6 +597,20 @@
    Feng.initValidator("franchiseeInfoForm", FranchiseeInfoDlg.validateFields);
});

function regexp(value, msg){
    var reg=/^(\d+.?)?\d{0,2}$/;//由 1-9开头 的正则表达式 整数 两位小数
    //先判断是否为整数 在判断 是否在 1-总页  整数范围之内
    if(reg.test(value)){
        if(value == 0){
            Feng.error(msg+"请输入大于0的整数或保留两位小数");
            return;
        }
    }else{
        Feng.error(msg+"请输入整数或保留两位小数");
        return;
    }
}

//专车
FranchiseeInfoDlg.checkbox1 = function () {
    var checkbox1 = $('#checkbox1').prop('checked');

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

@@ -138,6 +138,9 @@
    .set('scopeCode')
    .set('idCardPositive')
    .set('idCardReverse')
    .set('fixedDeduction')
    .set('percentageDeduction')
    .set('driverRestriction')
    .set('serviceScope');
}

@@ -173,6 +176,16 @@
        Feng.error("请选择经营区域");
        return;
    }

    let fixedDeduction = $('#fixedDeduction').val();
    regexp(fixedDeduction, "固定费用")

    let percentageDeduction = $('#percentageDeduction').val();
    regexp(percentageDeduction, "线上下单扣除")

    let driverRestriction = $('#driverRestriction').val();
    regexp(driverRestriction, "司机接单限制")

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tCompany/add", function(data){
        if ("error" == data){
@@ -226,6 +239,16 @@
        Feng.error("请选择经营区域");
        return;
    }

    let fixedDeduction = $('#fixedDeduction').val();
    regexp(fixedDeduction, "固定费用")

    let percentageDeduction = $('#percentageDeduction').val();
    regexp(percentageDeduction, "线上下单扣除")

    let driverRestriction = $('#driverRestriction').val();
    regexp(driverRestriction, "司机接单限制")

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tCompany/update", function(data){
        if ("error" == data){
@@ -270,6 +293,20 @@
    idCardReverse.init();
});

function regexp(value, msg){
    var reg=/^(\d+.?)?\d{0,2}$/;//由 1-9开头 的正则表达式 整数 两位小数
    //先判断是否为整数 在判断 是否在 1-总页  整数范围之内
    if(reg.test(value)){
        if(value == 0){
            Feng.error(msg+"请输入大于0的整数或保留两位小数");
            return;
        }
    }else{
        Feng.error(msg+"请输入整数或保留两位小数");
        return;
    }
}

//专车
TCompanyInfoDlg.checkbox1 = function () {
    var checkbox1 = $('#checkbox1').prop('checked');

 ManagementOKTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver.js

@@ -96,6 +96,50 @@
                return btn;
            }
        },
        {title: '今日接单', field: 'dayReceivingOrders', visible: true, align: 'center', valign: 'middle',width:'9%',
            formatter: function (value, row) {
                var btn = "";
                if(row.dayReceivingOrders != '' && row.dayReceivingOrders != null) {
                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.dayReceivingOrders + '" onfocus="TUser.tooltip()">' + row.dayReceivingOrders + '</p>']
                }else{
                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="-" onfocus="TUser.tooltip()">-</p>']
                }
                return btn;
            }
        },
        {title: '累计接单', field: 'sumReceivingOrders', visible: true, align: 'center', valign: 'middle',width:'9%',
            formatter: function (value, row) {
                var btn = "";
                if(row.sumReceivingOrders != '' && row.sumReceivingOrders != null) {
                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.sumReceivingOrders + '" onfocus="TUser.tooltip()">' + row.sumReceivingOrders + '</p>']
                }else{
                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="-" onfocus="TUser.tooltip()">-</p>']
                }
                return btn;
            }
        },
        {title: '当天收入', field: 'dayIncome', visible: true, align: 'center', valign: 'middle',width:'9%',
            formatter: function (value, row) {
                var btn = "";
                if(row.dayIncome != '' && row.dayIncome != null) {
                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.dayIncome + '" onfocus="TUser.tooltip()">' + row.dayIncome + '</p>']
                }else{
                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="-" onfocus="TUser.tooltip()">-</p>']
                }
                return btn;
            }
        },
        {title: '共计收入', field: 'sumIncome', visible: true, align: 'center', valign: 'middle',width:'9%',
            formatter: function (value, row) {
                var btn = "";
                if(row.sumIncome != '' && row.sumIncome != null) {
                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.sumIncome + '" onfocus="TUser.tooltip()">' + row.sumIncome + '</p>']
                }else{
                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="-" onfocus="TUser.tooltip()">-</p>']
                }
                return btn;
            }
        },
        {title: '评分', field: 'fraction', visible: true, align: 'center', valign: 'middle',width:'8%'},

        {title: '历史<br/>接单数', field: 'historyNum', visible: true, align: 'center', valign: 'middle',width:'7%',