更新最新代码

puzhibing

2023-07-09 80a2026cfc4357f940add8092d6e773c6d8d15b7

更新最新代码

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

@@ -624,7 +624,7 @@
                    document.getElementById("rewardToday1").attr("style", "display: none;");
                    document.getElementById("driverAudit1").attr("style", "display: none;");
                    Element car_audit1_user = document.getElementById("car_audit1_user");
                    car_audit1_user.text("Hello " + tDriver.getName() + "，");
                    car_audit1_user.text("Hello " + tDriver.getFirstName() + " " + tDriver.getLastName() + "，");
                    Element car_audit1_content = document.getElementById("car_audit1_content");
                    if(2 == finalTCar.getAuthState()){
                        car_audit1_content.text("You vehicle application has been approved. See the I-GO platform for details.");

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

@@ -609,7 +609,7 @@
                        document.getElementById("carAudit1").attr("style", "display: none;");

                        Element driver_audit1_user = document.getElementById("driver_audit1_user");
                        driver_audit1_user.text("Hello " + tDriver.getName() + "，");
                        driver_audit1_user.text("Hello " + tDriver.getFirstName() + " " + tDriver.getLastName() + "，");
                        Element driver_audit1_content = document.getElementById("driver_audit1_content");
                        if(1 == authState){
                            driver_audit1_content.text("You application has been approved.");
@@ -699,6 +699,16 @@

        tDriver.setPassword(ShiroKit.md5(tDriver.getPassword(), "SA;d5#"));

        String phone = tDriver.getPhone();
        String substring = phone.substring(0, 1);
        if("0".equals(substring)){
            phone = "233" + phone.substring(1);
        }
        if(phone.indexOf("233") < 0){
            phone = "233" + phone;
        }
        tDriver.setPhone(phone);
        tDriver.setAccount(phone);
        tDriverService.insert(tDriver);

        //添加经营业务
@@ -822,6 +832,16 @@
            tDriver.setPassword(obj.getPassword());
        }

        String phone = tDriver.getPhone();
        String substring = phone.substring(0, 1);
        if("0".equals(substring)){
            phone = "233" + phone.substring(1);
        }
        if(phone.indexOf("233") < 0){
            phone = "233" + phone;
        }
        tDriver.setPhone(phone);
        tDriver.setAccount(phone);
        tDriverService.updateById(tDriver);

        //删除业务
@@ -865,7 +885,8 @@
        if (ShiroKit.getUser().getRoleType() == 1){
            title = "平台导入司机模板";

            shellList.add("司机名称");
            shellList.add("司机姓");
            shellList.add("司机名");
            shellList.add("所属机构[平台司机/加盟司机]");
            shellList.add("所属分公司[提示:加盟司机选填]");
            shellList.add("所属加盟商[提示:加盟司机选填]");
@@ -887,7 +908,8 @@
        }else if (ShiroKit.getUser().getRoleType() == 2){
            title = "分公司导入司机模板";

            shellList.add("司机名称");
            shellList.add("司机姓");
            shellList.add("司机名");
            shellList.add("所属加盟商[选填]");
            shellList.add("性别[男/女]");
            shellList.add("驾驶证号码");
@@ -907,7 +929,8 @@
        }else if (ShiroKit.getUser().getRoleType() == 3){
            title = "加盟商导入司机模板";

            shellList.add("司机名称");
            shellList.add("司机姓");
            shellList.add("司机名");
            shellList.add("性别[男/女]");
            shellList.add("驾驶证号码");
            shellList.add("驾龄");
@@ -957,115 +980,128 @@
                        zero = String.valueOf(cell0.getStringCellValue()).trim();
                    }

                    Cell cell1 = row.getCell(1);  //所属机构[平台司机/加盟司机]
                    Cell cell01 = row.getCell(1);  //司机名称
                    String zero1 = null;
                    if (SinataUtil.isNotEmpty(cell01)){
                        zero1 = String.valueOf(cell01.getStringCellValue()).trim();
                    }

                    Cell cell1 = row.getCell(2);  //所属机构[平台司机/加盟司机]
                    String one = null;
                    if (SinataUtil.isNotEmpty(cell1)){
                        one = String.valueOf(cell1.getStringCellValue()).trim();
                    }

                    Cell cell2 = row.getCell(2);  //所属分公司[提示:加盟司机选填]
                    Cell cell2 = row.getCell(3);  //所属分公司[提示:加盟司机选填]
                    String two = null;
                    if (SinataUtil.isNotEmpty(cell2)){
                        two = String.valueOf(cell2.getStringCellValue()).trim();
                    }

                    Cell cell3 = row.getCell(3);  //所属加盟商[提示:加盟司机选填]
                    Cell cell3 = row.getCell(4);  //所属加盟商[提示:加盟司机选填]
                    String three = null;
                    if (SinataUtil.isNotEmpty(cell3)){
                        three = String.valueOf(cell3.getStringCellValue()).trim();
                    }

                    Cell cell4 = row.getCell(4);  //性别[男/女]
                    Cell cell4 = row.getCell(5);  //性别[男/女]
                    String four = null;
                    if (SinataUtil.isNotEmpty(cell4)){
                        four = String.valueOf(cell4.getStringCellValue()).trim();
                    }

                    Cell cell5 = row.getCell(5);  //驾驶证号码
                    Cell cell5 = row.getCell(6);  //驾驶证号码
                    String five = null;
                    if (SinataUtil.isNotEmpty(cell5)){
                        five = String.valueOf(cell5.getStringCellValue()).trim();
                    }

                    Cell cell6 = row.getCell(6);  //驾龄
                    Cell cell6 = row.getCell(7);  //驾龄
                    String six = null;
                    if (SinataUtil.isNotEmpty(cell6)){
                        six = String.valueOf(cell6.getStringCellValue()).trim();
                    }

                    Cell cell7 = row.getCell(7);  //身份证号
                    Cell cell7 = row.getCell(8);  //身份证号
                    String seven = null;
                    if (SinataUtil.isNotEmpty(cell7)){
                        seven = String.valueOf(cell7.getStringCellValue()).trim();
                    }

                    Cell cell8 = row.getCell(8);  //居住地址
                    Cell cell8 = row.getCell(9);  //居住地址
                    String eight = null;
                    if (SinataUtil.isNotEmpty(cell8)){
                        eight = String.valueOf(cell8.getStringCellValue()).trim();
                    }

                    Cell cell9 = row.getCell(9);  //出租车资格证号
                    Cell cell9 = row.getCell(10);  //出租车资格证号
                    String nine = null;
                    if (SinataUtil.isNotEmpty(cell9)){
                        nine = String.valueOf(cell9.getStringCellValue()).trim();
                    }

                    Cell cell10 = row.getCell(10);  //工号[选填]
                    Cell cell10 = row.getCell(11);  //工号[选填]
                    String ten = null;
                    if (SinataUtil.isNotEmpty(cell10)){
                        ten = String.valueOf(cell10.getStringCellValue()).trim();
                    }

                    Cell cell11 = row.getCell(11);  //经营业务:专车[是/否]
                    Cell cell11 = row.getCell(12);  //经营业务:专车[是/否]
                    String eleven = null;
                    if (SinataUtil.isNotEmpty(cell11)){
                        eleven = String.valueOf(cell11.getStringCellValue()).trim();
                    }

                    Cell cell12 = row.getCell(12);  //经营业务:专车[是/否]
                    Cell cell12 = row.getCell(13);  //经营业务:专车[是/否]
                    String twelve = null;
                    if (SinataUtil.isNotEmpty(cell12)){
                        twelve = String.valueOf(cell12.getStringCellValue()).trim();
                    }

                    Cell cell13 = row.getCell(13);  //经营业务:跨城出行[是/否]
                    Cell cell13 = row.getCell(14);  //经营业务:跨城出行[是/否]
                    String thirteen = null;
                    if (SinataUtil.isNotEmpty(cell13)){
                        thirteen = String.valueOf(cell13.getStringCellValue()).trim();
                    }

                    Cell cell14 = row.getCell(14);  //经营业务:小件同城物流[是/否]
                    Cell cell14 = row.getCell(15);  //经营业务:小件同城物流[是/否]
                    String fourteen = null;
                    if (SinataUtil.isNotEmpty(cell14)){
                        fourteen = String.valueOf(cell14.getStringCellValue()).trim();
                    }

                    Cell cell15 = row.getCell(15);  //经营业务:小件跨城物流[是/否]
                    Cell cell15 = row.getCell(16);  //经营业务:小件跨城物流[是/否]
                    String fifteen = null;
                    if (SinataUtil.isNotEmpty(cell15)){
                        fifteen = String.valueOf(cell15.getStringCellValue()).trim();
                    }

                    Cell cell16 = row.getCell(16);  //经营业务:包车[是/否]
                    Cell cell16 = row.getCell(17);  //经营业务:包车[是/否]
                    String sixteen = null;
                    if (SinataUtil.isNotEmpty(cell16)){
                        sixteen = String.valueOf(cell16.getStringCellValue()).trim();
                    }

                    Cell cell17 = row.getCell(17);  //登录账号[手机号]
                    Cell cell17 = row.getCell(18);  //登录账号[手机号]
                    String seventeen = null;
                    if (SinataUtil.isNotEmpty(cell17)){
                        seventeen = String.valueOf(cell17.getStringCellValue()).trim();
                        String substring = seventeen.substring(0, 1);
                        if("0".equals(substring)){
                            seventeen = "233" + seventeen.substring(1);
                        }
                        if(seventeen.indexOf("233") < 0){
                            seventeen = "233" + seventeen;
                        }
                    }

                    Cell cell18 = row.getCell(18);  //登录密码[密码长度为6-18]
                    Cell cell18 = row.getCell(19);  //登录密码[密码长度为6-18]
                    String eighteen = null;
                    if (SinataUtil.isNotEmpty(cell18)){
                        eighteen = String.valueOf(cell18.getStringCellValue()).trim();
                    }

                    if (SinataUtil.isEmpty(zero) || SinataUtil.isEmpty(one) || SinataUtil.isEmpty(four)
                    if (SinataUtil.isEmpty(zero) || SinataUtil.isEmpty(zero1) || SinataUtil.isEmpty(one) || SinataUtil.isEmpty(four)
                            || SinataUtil.isEmpty(five) || SinataUtil.isEmpty(six) || SinataUtil.isEmpty(nine)
                            || SinataUtil.isEmpty(eleven) || SinataUtil.isEmpty(twelve) || SinataUtil.isEmpty(thirteen)
                            || SinataUtil.isEmpty(fourteen) || SinataUtil.isEmpty(fifteen) || SinataUtil.isEmpty(sixteen)
@@ -1148,7 +1184,8 @@
                        driver.setJobNumber(ten);
                        driver.setPhone(seventeen);
                        driver.setPassword(ShiroKit.md5(eighteen, "SA;d5#"));
                        driver.setName(zero);
                        driver.setLastName(zero);
                        driver.setFirstName(zero1);
                        if ("男".equals(four)){
                            driver.setSex(1);
                        }else if ("女".equals(four)){
@@ -1234,102 +1271,116 @@
                        zero = String.valueOf(cell0.getStringCellValue()).trim();
                    }

                    Cell cell1 = row.getCell(1);  //所属加盟商[选填]
                    Cell cell01 = row.getCell(1);  //司机名称
                    String zero1 = null;
                    if (SinataUtil.isNotEmpty(cell01)){
                        zero1 = String.valueOf(cell01.getStringCellValue()).trim();
                    }

                    Cell cell1 = row.getCell(2);  //所属加盟商[选填]
                    String one = null;
                    if (SinataUtil.isNotEmpty(cell1)){
                        one = String.valueOf(cell1.getStringCellValue()).trim();
                    }

                    Cell cell2 = row.getCell(2);  //性别[男/女]
                    Cell cell2 = row.getCell(3);  //性别[男/女]
                    String two = null;
                    if (SinataUtil.isNotEmpty(cell2)){
                        two = String.valueOf(cell2.getStringCellValue()).trim();
                    }

                    Cell cell3 = row.getCell(3);  //驾驶证号码
                    Cell cell3 = row.getCell(4);  //驾驶证号码
                    String three = null;
                    if (SinataUtil.isNotEmpty(cell3)){
                        three = String.valueOf(cell3.getStringCellValue()).trim();
                    }

                    Cell cell4 = row.getCell(4);  //驾龄
                    Cell cell4 = row.getCell(5);  //驾龄
                    String four = null;
                    if (SinataUtil.isNotEmpty(cell4)){
                        four = String.valueOf(cell4.getStringCellValue()).trim();
                    }

                    Cell cell5 = row.getCell(5);  //身份证号
                    Cell cell5 = row.getCell(6);  //身份证号
                    String five = null;
                    if (SinataUtil.isNotEmpty(cell5)){
                        five = String.valueOf(cell5.getStringCellValue()).trim();
                    }

                    Cell cell6 = row.getCell(6);  //居住地址
                    Cell cell6 = row.getCell(7);  //居住地址
                    String six = null;
                    if (SinataUtil.isNotEmpty(cell6)){
                        six = String.valueOf(cell6.getStringCellValue()).trim();
                    }

                    Cell cell7 = row.getCell(7);  //出租车资格证号
                    Cell cell7 = row.getCell(8);  //出租车资格证号
                    String seven = null;
                    if (SinataUtil.isNotEmpty(cell7)){
                        seven = String.valueOf(cell7.getStringCellValue()).trim();
                    }

                    Cell cell8 = row.getCell(8);  //工号[选填]
                    Cell cell8 = row.getCell(9);  //工号[选填]
                    String eight = null;
                    if (SinataUtil.isNotEmpty(cell8)){
                        eight = String.valueOf(cell8.getStringCellValue()).trim();
                    }

                    Cell cell9 = row.getCell(9);  //经营业务:专车[是/否]
                    Cell cell9 = row.getCell(10);  //经营业务:专车[是/否]
                    String nine = null;
                    if (SinataUtil.isNotEmpty(cell9)){
                        nine = String.valueOf(cell9.getStringCellValue()).trim();
                    }

                    Cell cell10 = row.getCell(10);  //经营业务:出租车[是/否]
                    Cell cell10 = row.getCell(11);  //经营业务:出租车[是/否]
                    String ten = null;
                    if (SinataUtil.isNotEmpty(cell10)){
                        ten = String.valueOf(cell10.getStringCellValue()).trim();
                    }

                    Cell cell11 = row.getCell(11);  //经营业务:跨城出行[是/否]
                    Cell cell11 = row.getCell(12);  //经营业务:跨城出行[是/否]
                    String eleven = null;
                    if (SinataUtil.isNotEmpty(cell11)){
                        eleven = String.valueOf(cell11.getStringCellValue()).trim();
                    }

                    Cell cell12 = row.getCell(12);  //经营业务:小件同城物流[是/否]
                    Cell cell12 = row.getCell(13);  //经营业务:小件同城物流[是/否]
                    String twelve = null;
                    if (SinataUtil.isNotEmpty(cell12)){
                        twelve = String.valueOf(cell12.getStringCellValue()).trim();
                    }

                    Cell cell13 = row.getCell(13);  //经营业务:小件跨城物流[是/否]
                    Cell cell13 = row.getCell(14);  //经营业务:小件跨城物流[是/否]
                    String thirteen = null;
                    if (SinataUtil.isNotEmpty(cell13)){
                        thirteen = String.valueOf(cell13.getStringCellValue()).trim();
                    }

                    Cell cell14 = row.getCell(14);  //经营业务:包车[是/否]
                    Cell cell14 = row.getCell(15);  //经营业务:包车[是/否]
                    String fourteen = null;
                    if (SinataUtil.isNotEmpty(cell14)){
                        fourteen = String.valueOf(cell14.getStringCellValue()).trim();
                    }

                    Cell cell15 = row.getCell(15);  //登录账号[手机号]
                    Cell cell15 = row.getCell(16);  //登录账号[手机号]
                    String fifteen = null;
                    if (SinataUtil.isNotEmpty(cell15)){
                        fifteen = String.valueOf(cell15.getStringCellValue()).trim();

                        String substring = fifteen.substring(0, 1);
                        if("0".equals(substring)){
                            fifteen = "233" + fifteen.substring(1);
                        }
                        if(fifteen.indexOf("233") < 0){
                            fifteen = "233" + fifteen;
                        }
                    }

                    Cell cell16 = row.getCell(16);  //登录密码[密码长度为6-18]
                    Cell cell16 = row.getCell(17);  //登录密码[密码长度为6-18]
                    String sixteen = null;
                    if (SinataUtil.isNotEmpty(cell16)){
                        sixteen = String.valueOf(cell16.getStringCellValue()).trim();
                    }
                    if (SinataUtil.isEmpty(zero) || SinataUtil.isEmpty(two) || SinataUtil.isEmpty(three) || SinataUtil.isEmpty(four)
                    if (SinataUtil.isEmpty(zero) || SinataUtil.isEmpty(zero1) || SinataUtil.isEmpty(two) || SinataUtil.isEmpty(three) || SinataUtil.isEmpty(four)
                            || SinataUtil.isEmpty(five) || SinataUtil.isEmpty(seven)
                            || SinataUtil.isEmpty(nine) || SinataUtil.isEmpty(ten)
                            || SinataUtil.isEmpty(eleven) || SinataUtil.isEmpty(twelve) || SinataUtil.isEmpty(thirteen)
@@ -1397,7 +1448,8 @@
                        driver.setJobNumber(eight);
                        driver.setPhone(fifteen);
                        driver.setPassword(ShiroKit.md5(sixteen, "SA;d5#"));
                        driver.setName(zero);
                        driver.setLastName(zero);
                        driver.setFirstName(zero1);
                        if ("男".equals(two)){
                            driver.setSex(1);
                        }else if ("女".equals(two)){
@@ -1479,96 +1531,109 @@
                        zero = String.valueOf(cell0.getStringCellValue()).trim();
                    }

                    Cell cell2 = row.getCell(1);  //性别[男/女]
                    Cell cell01 = row.getCell(1);  //司机名称
                    String zero1 = null;
                    if (SinataUtil.isNotEmpty(cell01)){
                        zero1 = String.valueOf(cell01.getStringCellValue()).trim();
                    }

                    Cell cell2 = row.getCell(2);  //性别[男/女]
                    String one = null;
                    if (SinataUtil.isNotEmpty(cell2)){
                        one = String.valueOf(cell2.getStringCellValue()).trim();
                    }

                    Cell cell3 = row.getCell(2);  //驾驶证号码
                    Cell cell3 = row.getCell(3);  //驾驶证号码
                    String two = null;
                    if (SinataUtil.isNotEmpty(cell3)){
                        two = String.valueOf(cell3.getStringCellValue()).trim();
                    }

                    Cell cell4 = row.getCell(3);  //驾龄
                    Cell cell4 = row.getCell(4);  //驾龄
                    String three = null;
                    if (SinataUtil.isNotEmpty(cell4)){
                        three = String.valueOf(cell4.getStringCellValue()).trim();
                    }

                    Cell cell5 = row.getCell(4);  //身份证号
                    Cell cell5 = row.getCell(5);  //身份证号
                    String four = null;
                    if (SinataUtil.isNotEmpty(cell5)){
                        four = String.valueOf(cell5.getStringCellValue()).trim();
                    }

                    Cell cell6 = row.getCell(5);  //居住地址
                    Cell cell6 = row.getCell(6);  //居住地址
                    String five = null;
                    if (SinataUtil.isNotEmpty(cell6)){
                        five = String.valueOf(cell6.getStringCellValue()).trim();
                    }

                    Cell cell7 = row.getCell(6);  //出租车资格证号
                    Cell cell7 = row.getCell(7);  //出租车资格证号
                    String six = null;
                    if (SinataUtil.isNotEmpty(cell7)){
                        six = String.valueOf(cell7.getStringCellValue()).trim();
                    }

                    Cell cell8 = row.getCell(7);  //工号[选填]
                    Cell cell8 = row.getCell(8);  //工号[选填]
                    String seven = null;
                    if (SinataUtil.isNotEmpty(cell8)){
                        seven = String.valueOf(cell8.getStringCellValue()).trim();
                    }

                    Cell cell9 = row.getCell(8);  //经营业务:专车[是/否]
                    Cell cell9 = row.getCell(9);  //经营业务:专车[是/否]
                    String eight = null;
                    if (SinataUtil.isNotEmpty(cell9)){
                        eight = String.valueOf(cell9.getStringCellValue()).trim();
                    }

                    Cell cell10 = row.getCell(9);  //经营业务:出租车[是/否]
                    Cell cell10 = row.getCell(10);  //经营业务:出租车[是/否]
                    String nine = null;
                    if (SinataUtil.isNotEmpty(cell10)){
                        nine = String.valueOf(cell10.getStringCellValue()).trim();
                    }

                    Cell cell11 = row.getCell(10);  //经营业务:跨城出行[是/否]
                    Cell cell11 = row.getCell(11);  //经营业务:跨城出行[是/否]
                    String ten = null;
                    if (SinataUtil.isNotEmpty(cell11)){
                        ten = String.valueOf(cell11.getStringCellValue()).trim();
                    }

                    Cell cell12 = row.getCell(11);  //经营业务:小件同城物流[是/否]
                    Cell cell12 = row.getCell(12);  //经营业务:小件同城物流[是/否]
                    String eleven = null;
                    if (SinataUtil.isNotEmpty(cell12)){
                        eleven = String.valueOf(cell12.getStringCellValue()).trim();
                    }

                    Cell cell13 = row.getCell(12);  //经营业务:小件跨城物流[是/否]
                    Cell cell13 = row.getCell(13);  //经营业务:小件跨城物流[是/否]
                    String twelve = null;
                    if (SinataUtil.isNotEmpty(cell13)){
                        twelve = String.valueOf(cell13.getStringCellValue()).trim();
                    }

                    Cell cell14 = row.getCell(13);  //经营业务:包车[是/否]
                    Cell cell14 = row.getCell(14);  //经营业务:包车[是/否]
                    String thirteen = null;
                    if (SinataUtil.isNotEmpty(cell14)){
                        thirteen = String.valueOf(cell14.getStringCellValue()).trim();
                    }

                    Cell cell15 = row.getCell(14);  //登录账号[手机号]
                    Cell cell15 = row.getCell(15);  //登录账号[手机号]
                    String fourteen = null;
                    if (SinataUtil.isNotEmpty(cell15)){
                        fourteen = String.valueOf(cell15.getStringCellValue()).trim();
                        String substring = fourteen.substring(0, 1);
                        if("0".equals(substring)){
                            fourteen = "233" + fourteen.substring(1);
                        }
                        if(fourteen.indexOf("233") < 0){
                            fourteen = "233" + fourteen;
                        }
                    }

                    Cell cell16 = row.getCell(15);  //登录密码[密码长度为6-18]
                    Cell cell16 = row.getCell(16);  //登录密码[密码长度为6-18]
                    String fifteen = null;
                    if (SinataUtil.isNotEmpty(cell16)){
                        fifteen = String.valueOf(cell16.getStringCellValue()).trim();
                    }
                    if (SinataUtil.isEmpty(zero) || SinataUtil.isEmpty(one)  || SinataUtil.isEmpty(two) || SinataUtil.isEmpty(three) || SinataUtil.isEmpty(four)
                    if (SinataUtil.isEmpty(zero) || SinataUtil.isEmpty(zero1) || SinataUtil.isEmpty(one)  || SinataUtil.isEmpty(two) || SinataUtil.isEmpty(three) || SinataUtil.isEmpty(four)
                            || SinataUtil.isEmpty(six) || SinataUtil.isEmpty(eight)
                            || SinataUtil.isEmpty(nine) || SinataUtil.isEmpty(ten)
                            || SinataUtil.isEmpty(eleven) || SinataUtil.isEmpty(twelve) || SinataUtil.isEmpty(thirteen)
@@ -1637,7 +1702,8 @@
                        driver.setJobNumber(seven);
                        driver.setPhone(fourteen);
                        driver.setPassword(ShiroKit.md5(fifteen, "SA;d5#"));
                        driver.setName(zero);
                        driver.setLastName(zero);
                        driver.setFirstName(zero1);
                        if ("男".equals(one)){
                            driver.setSex(1);
                        }else if ("女".equals(one)){

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TPubWithdrawalController.java

@@ -148,19 +148,22 @@

            String serviceCode = "";
            String phone = "";
            String narration = "";
            if(tPubWithdrawal.getUserType() == 1){
                TUser tUser = userService.selectById(tPubWithdrawal.getUserId());
                serviceCode = tUser.getPhoneOperator();
                phone = tUser.getPhone();
                narration = "用户提现";
            }else{
                TDriver tDriver = driverService.selectById(tPubWithdrawal.getUserId());
                serviceCode = tDriver.getPhoneOperator();
                phone = tDriver.getPhone();
                narration = "司机提现";
            }
            if(2 == state){
                SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
                String payerTransactionID = sdf.format(new Date()) + tPubWithdrawal.getId();
                PayoutResponse payoutResponse = tinggPayoutUtil.sendPayout(serviceCode, "+" + phone, payerTransactionID, tPubWithdrawal.getMoney().doubleValue(), callbackPath + "/tPubWithdrawal/base/withdrawalCallback", "用户提现");
                PayoutResponse payoutResponse = tinggPayoutUtil.sendPayout(serviceCode, "+" + phone, payerTransactionID, tPubWithdrawal.getMoney().doubleValue(), callbackPath + "/tPubWithdrawal/base/withdrawalCallback", narration);
                AuthStatus authStatus = payoutResponse.getAuthStatus();
                Results results = payoutResponse.getResults().get(0);
                String statusCode = results.getStatusCode();
@@ -285,13 +288,11 @@
        List<String> shellList = new ArrayList<String>();
        shellList.add("申请时间");
        shellList.add("提现人");
        shellList.add("银行卡号");
        shellList.add("开户行");
        shellList.add("提现方式");
        shellList.add("提现手机号");
        shellList.add("账户类型");
        shellList.add("提现金额");
        shellList.add("提现类型");
        shellList.add("账户余额");
        shellList.add("提现金额");
        shellList.add("联系人");
        shellList.add("联系电话");
        shellList.add("备注");
@@ -315,26 +316,6 @@
            }else{
                shellList.add("-");
            }
            if(SinataUtil.isNotEmpty(map.get("bankName"))){
                shellList.add(map.get("bankName").toString());
            }else{
                shellList.add("-");
            }
            //withdrawalType
            if(SinataUtil.isNotEmpty(map.get("withdrawalType"))){
                switch (map.get("withdrawalType").toString()){
                    case "1":
                        shellList.add("银行卡");
                        break;
                    case "2":
                        shellList.add("线下");
                        break;
                    default:
                        shellList.add("-");
                }
            }else{
                shellList.add("-");
            }
            //userType
            if(SinataUtil.isNotEmpty(map.get("userType"))){
                switch (map.get("userType").toString()){
@@ -347,6 +328,12 @@
                    default:
                        shellList.add("-");
                }
            }else{
                shellList.add("-");
            }
            //money
            if(SinataUtil.isNotEmpty(map.get("money"))){
                shellList.add(map.get("money").toString());
            }else{
                shellList.add("-");
            }
@@ -368,12 +355,6 @@
            //balance
            if(SinataUtil.isNotEmpty(map.get("balance"))){
                shellList.add(map.get("balance").toString());
            }else{
                shellList.add("-");
            }
            //money
            if(SinataUtil.isNotEmpty(map.get("money"))){
                shellList.add(map.get("money").toString());
            }else{
                shellList.add("-");
            }

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml

@@ -8,8 +8,10 @@
        <result column="account" property="account" />
        <result column="jobNumber" property="jobNumber" />
        <result column="phone" property="phone" />
        <result column="phoneOperator" property="phoneOperator"/>
        <result column="password" property="password" />
        <result column="name" property="name" />
        <result column="lastName" property="lastName" />
        <result column="firstName" property="firstName" />
        <result column="sex" property="sex" />
        <result column="idCard" property="idCard" />
        <result column="companyId" property="companyId" />
@@ -74,7 +76,7 @@

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, account, jobNumber, phone, password, name, sex, idCard, companyId, headImgUrl, faceImgUrl, idCardImgUrl1, idCardImgUrl2, placeOfEmployment, birthday, bankCardNumber, driverNationality, driverNation, driverMaritalStatus, driverLanguageLevel, driverEducation, driverCensus, driverAddress, driverContactAddress, licenseCode, licenselImgUrl, driverAge, driveCard, driveCardImgUrl, driverType, getDriverLicenseDate, driverLicenseOn, driverLicenseOff, taxiDriver, taxiAptitudeCard, networkCarlssueImg, networkCarlssueOrganization, networkCarlssueDate, getNetworkCarProofDate, networkCarProofOn, networkCarProofOff, registerDate, fullTimeDriver, inDriverBlacklist, commercialType, contractCompany, contractOn, contractOff, emergencyContact, emergencyContactPhone, emergencyContactAddress, remark, isPlatCar, carId, authState, state, flag, insertTime, insertUser, updateTime, updateUser, addType,uid,teamId
        id, account, jobNumber, phone, phoneOperator, password, lastName, firstName, sex, idCard, companyId, headImgUrl, faceImgUrl, idCardImgUrl1, idCardImgUrl2, placeOfEmployment, birthday, bankCardNumber, driverNationality, driverNation, driverMaritalStatus, driverLanguageLevel, driverEducation, driverCensus, driverAddress, driverContactAddress, licenseCode, licenselImgUrl, driverAge, driveCard, driveCardImgUrl, driverType, getDriverLicenseDate, driverLicenseOn, driverLicenseOff, taxiDriver, taxiAptitudeCard, networkCarlssueImg, networkCarlssueOrganization, networkCarlssueDate, getNetworkCarProofDate, networkCarProofOn, networkCarProofOff, registerDate, fullTimeDriver, inDriverBlacklist, commercialType, contractCompany, contractOn, contractOff, emergencyContact, emergencyContactPhone, emergencyContactAddress, remark, isPlatCar, carId, authState, state, flag, insertTime, insertUser, updateTime, updateUser, addType,uid,teamId
    </sql>

    <!--根据条件查询待审核司机列表-->
@@ -163,7 +165,7 @@
                and o.phone  LIKE CONCAT('%',#{phone},'%')
            </if>
            <if test="name != null and name != ''">
                and o.name  LIKE CONCAT('%',#{name},'%')
                and o.lastName  LIKE CONCAT('%',#{name},'%') or o.firstName  LIKE CONCAT('%',#{name},'%')
            </if>
            <if test="addType != null and addType != ''">
                and o.addType = #{addType}
@@ -303,7 +305,7 @@
        select
        concat('driver_',id) as id,
        phone as phone,
        name as name,
        CONCAT(firstName, " ", lastName) as name,
        2 as uType,
        insertTime as insertTime
        from
@@ -320,7 +322,7 @@
    <select id="queryDriverIncomeData" parameterType="com.baomidou.mybatisplus.plugins.Page" resultType="map">
        SELECT
            td.id as id,
            td.`name` as driverName,
            CONCAT(td.firstName, " ", td.lastName) as driverName,
            tc1.name as companyName,
            tc2.name as franchiseeName,
            <if test="1 == type">
@@ -379,7 +381,7 @@
    <select id="queryDriverIncomeDataNoPage"  resultType="map">
        SELECT
        td.id as id,
        td.`name` as driverName,
        CONCAT(td.firstName, " ", td.lastName) as driverName,
        tc1.name as companyName,
        tc2.name as franchiseeName,
        <if test="1 == type">

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TPubWithdrawalMapper.xml

@@ -27,7 +27,7 @@
    <!--根据条件查询提现列表-->
    <select id="getWithdrawalList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
        SELECT * FROM (SELECT
        case when pw.userType = 1 then uu.nickName when pw.userType = 2 then dd.`name` else '' end as userName,
        case when pw.userType = 1 then uu.nickName when pw.userType = 2 then CONCAT(dd.firstName, " ", dd.lastName) else '' end as userName,
        case when pw.userType = 1 then uu.phone when pw.userType = 2 then dd.phone else '' end as userPhone,
        pw.*
        FROM t_pub_withdrawal as pw
@@ -59,7 +59,7 @@

    <select id="getWithdrawalListNoPage" resultType="map">
        SELECT * FROM (SELECT
        case when pw.userType = 1 then uu.nickName when pw.userType = 2 then dd.`name` else '' end as userName,
        case when pw.userType = 1 then uu.nickName when pw.userType = 2 then CONCAT(dd.firstName, " ", dd.lastName) else '' end as userName,
        case when pw.userType = 1 then uu.phone when pw.userType = 2 then dd.phone else '' end as userPhone,
        DATE_FORMAT(pw.insertTime, '%Y-%m-%d %H:%i') as applyTime,
        pw.*

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java

@@ -47,9 +47,13 @@
     */
    private String password;
    /**
     * 姓名
     * 姓
     */
    private String name;
    private String lastName;
    /**
     * 名
     */
    private String firstName;
    /**
     * 性别(1=男，2=女)
     */
@@ -442,12 +446,20 @@
        this.password = password;
    }

    public String getName() {
        return name;
    public String getLastName() {
        return lastName;
    }

    public void setName(String name) {
        this.name = name;
    public void setLastName(String lastName) {
        this.lastName = lastName;
    }

    public String getFirstName() {
        return firstName;
    }

    public void setFirstName(String firstName) {
        this.firstName = firstName;
    }

    public Integer getSex() {
@@ -919,75 +931,5 @@
        return this.id;
    }

    @Override
    public String toString() {
        return "TDriver{" +
                "id=" + id +
                ", account='" + account + '\'' +
                ", jobNumber='" + jobNumber + '\'' +
                ", phone='" + phone + '\'' +
                ", password='" + password + '\'' +
                ", name='" + name + '\'' +
                ", sex=" + sex +
                ", idCard='" + idCard + '\'' +
                ", companyId=" + companyId +
                ", franchiseeId=" + franchiseeId +
                ", headImgUrl='" + headImgUrl + '\'' +
                ", faceImgUrl='" + faceImgUrl + '\'' +
                ", idCardImgUrl1='" + idCardImgUrl1 + '\'' +
                ", idCardImgUrl2='" + idCardImgUrl2 + '\'' +
                ", placeOfEmployment='" + placeOfEmployment + '\'' +
                ", birthday=" + birthday +
                ", bankCardNumber='" + bankCardNumber + '\'' +
                ", driverNationality='" + driverNationality + '\'' +
                ", driverNation='" + driverNation + '\'' +
                ", driverMaritalStatus=" + driverMaritalStatus +
                ", driverLanguageLevel='" + driverLanguageLevel + '\'' +
                ", driverEducation='" + driverEducation + '\'' +
                ", driverCensus='" + driverCensus + '\'' +
                ", driverAddress='" + driverAddress + '\'' +
                ", driverContactAddress='" + driverContactAddress + '\'' +
                ", driverAge=" + driverAge +
                ", driveCard='" + driveCard + '\'' +
                ", driverType='" + driverType + '\'' +
                ", getDriverLicenseDate=" + getDriverLicenseDate +
                ", driverLicenseOn=" + driverLicenseOn +
                ", driverLicenseOff=" + driverLicenseOff +
                ", taxiDriver=" + taxiDriver +
                ", taxiAptitudeCard='" + taxiAptitudeCard + '\'' +
                ", networkCarlssueImg='" + networkCarlssueImg + '\'' +
                ", networkCarlssueOrganization='" + networkCarlssueOrganization + '\'' +
                ", networkCarlssueDate=" + networkCarlssueDate +
                ", getNetworkCarProofDate=" + getNetworkCarProofDate +
                ", networkCarProofOn=" + networkCarProofOn +
                ", networkCarProofOff=" + networkCarProofOff +
                ", registerDate=" + registerDate +
                ", fullTimeDriver=" + fullTimeDriver +
                ", inDriverBlacklist=" + inDriverBlacklist +
                ", commercialType=" + commercialType +
                ", contractCompany='" + contractCompany + '\'' +
                ", contractOn=" + contractOn +
                ", contractOff=" + contractOff +
                ", emergencyContact='" + emergencyContact + '\'' +
                ", emergencyContactPhone='" + emergencyContactPhone + '\'' +
                ", emergencyContactAddress='" + emergencyContactAddress + '\'' +
                ", remark='" + remark + '\'' +
                ", isPlatCar=" + isPlatCar +
                ", carId=" + carId +
                ", authState=" + authState +
                ", state=" + state +
                ", flag='" + flag + '\'' +
                ", insertTime=" + insertTime +
                ", insertUser=" + insertUser +
                ", updateTime=" + updateTime +
                ", updateUser=" + updateUser +
                ", addType=" + addType +
                ", balance=" + balance +
                ", businessMoney=" + businessMoney +
                ", laveBusinessMoney=" + laveBusinessMoney +
                ", addObjectId=" + addObjectId +
                ", uid=" + uid +
                ", teamId=" + teamId +
                '}';
    }

}

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

@@ -15,8 +15,8 @@

spring:
  profiles:
#    active: dev
    active: produce
    active: dev
#    active: produce
  mvc:
    static-path-pattern: /static/**
    view:
@@ -41,34 +41,25 @@
    log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl #输出Sql，如需打印Sql注释该配置



#eureka:
#  client:
#    service-url: #注册中心地址
#      defaultZone: http://sinata:sinata@139.9.249.67:8000/eureka #启用身份验证的方式连接
#    register-with-eureka: true #在注册中心进行注册
#    fetch-registry: true #从Eureka中获取注册信息。


---

spring:
  datasource:
    url: jdbc:mysql://127.0.0.1:3306/igotravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
    username: root
    password: HjKbXilb9zajmXbl
    db-name: guns #用来搜集数据库的所有表
    filters: wall,mergeStat

################# 测试环境 ###################
#spring:
#  datasource:
#    url: jdbc:mysql://127.0.0.1:3306/igotravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
#    username: root
#    password: 123456
#    db-name: igotravel #用来搜集数据库的所有表
#    password: HjKbXilb9zajmXbl
#    db-name: guns #用来搜集数据库的所有表
#    filters: wall,mergeStat

################# 测试环境 ###################
spring:
  datasource:
    url: jdbc:mysql://127.0.0.1:3306/igotravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
    username: root
    password: 123456
    db-name: igotravel #用来搜集数据库的所有表
    filters: wall,mergeStat


#多数据源情况的配置
guns:

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

@@ -5,7 +5,8 @@
            <input type="hidden" id="roleType" name="roleType" value="${roleType}">
            <div class="row">
                <div class="col-sm-10">
                    <#input id="name" name="司机姓名" />
                    <#input id="lastName" name="司机姓" />
                    <#input id="firstName" name="司机名" />

                    <div class="form-group">
                        <label class="col-sm-3 control-label">所属机构：</label>
@@ -140,7 +141,7 @@
                    </div>
                </div>
                -->

                    <#input id="phoneOperator" name="手机号运营商" />
                    <#input id="phone" name="登录账号【手机号】" />
                    <#input id="password" name="密码" type="password"/>
                    <#input id="rePassword" name="确认密码" type="password"/>

 ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html

@@ -6,7 +6,8 @@
            <input type="hidden" id="roleType" name="roleType" value="${roleType}">
            <div class="row">
                <div class="col-sm-11">
                    <#input id="name" name="司机姓名" value="${item.name}"/>
                    <#input id="lastName" name="司机姓" value="${item.lastName}"/>
                    <#input id="firstName" name="司机名" value="${item.firstName}"/>

                    <div class="form-group">
                        <label class="col-sm-3 control-label">所属机构：</label>
@@ -148,6 +149,7 @@
                        </div>
                    </div>
                    -->
                    <#input id="phoneOperator" name="手机号运营商" value="${item.phoneOperator}"/>
                    <#input id="phone" name="登录账号【手机号】" value="${item.phone}"/>
                    <#input id="password" name="密码" type="password" />
                    <#input id="rePassword" name="确认密码" type="password"  />

 ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_immediately.html

@@ -5,7 +5,9 @@
            <input type="hidden" id="id" name="id" value="${item.id}">
            <div class="row">
                <div class="col-sm-6 b-r">
                    <#label id="name" name="姓名" value="${item.name}"/>
                    <#label id="name" name="姓" value="${item.lastName}"/>
                    <#label id="name" name="名" value="${item.firstName}"/>
                    <#label id="phoneOperator" name="手机号运营商" value="${item.phoneOperator}"/>
                    <#label id="phone" name="手机号" value="${item.phone}"/>
                    <#label id="sexStr" name="性别" value="${item.sexStr}"/>
                    <#label id="addTypeStr" name="司机来源" value="${item.addTypeStr}"/>

 ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_look.html

@@ -5,7 +5,9 @@
            <input type="hidden" id="id" name="id" value="${item.id}">
            <div class="row">
                <div class="col-sm-6 b-r">
                    <#label id="name" name="姓名" value="${item.name}"/>
                    <#label id="name" name="姓" value="${item.lastName}"/>
                    <#label id="name" name="名" value="${item.firstName}"/>
                    <#label id="phoneOperator" name="手机号运营商" value="${item.phoneOperator}"/>
                    <#label id="phone" name="手机号" value="${item.phone}"/>
                    <#label id="sexStr" name="性别" value="${item.sexStr}"/>
                    <#label id="addTypeStr" name="司机来源" value="${item.addTypeStr}"/>

 ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/yesDriver.html

@@ -16,10 +16,16 @@
                                <#NameCon id="companyName" name="所属分公司/加盟商" />
                            </div>
                            <div class="col-sm-3">
                                <#NameCon id="phoneOperator" name="手机号运营商" />
                            </div>
                            <div class="col-sm-3">
                                <#NameCon id="phone" name="手机号" />
                            </div>
                            <div class="col-sm-3">
                                <#NameCon id="name" name="姓名" />
                                <#NameCon id="lastName" name="姓" />
                            </div>
                            <div class="col-sm-3">
                                <#NameCon id="firstName" name="名" />
                            </div>
                            <div class="col-sm-3">
                                <#SelectCon id="addType" name="司机来源" >

 ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tPubWithdrawal/tPubWithdrawal.html

@@ -16,13 +16,6 @@
                                <#NameCon id="name" name="提现人" />
                            </div>
                            <div class="col-sm-3">
                                <#SelectCon id="withdrawalType" name="提现方式" >
                                    <option value="">全部</option>
                                    <option value="1">银行卡</option>
                                    <option value="2">线下</option>
                                </#SelectCon>
                            </div>
                            <div class="col-sm-3">
                                <#SelectCon id="userType" name="用户类型" >
                                    <option value="">全部</option>
                                    <option value="1">用户</option>

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

@@ -25,11 +25,20 @@
                return btn;
            }
        },
        {title: '司机姓名', field: 'name', visible: true, align: 'center', valign: 'middle',
        {title: '司机姓', field: 'lastName', visible: true, align: 'center', valign: 'middle',
            formatter: function (value, row) {
                var btn = "";
                if(row.name != '' && row.name != null) {
                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.name + '" onfocus="TUser.tooltip()">' + row.name + '</p>']
                if(row.lastName != '' && row.lastName != null) {
                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.lastName + '" onfocus="TUser.tooltip()">' + row.lastName + '</p>']
                }
                return btn;
            }
        },
        {title: '司机名', field: 'firstName', visible: true, align: 'center', valign: 'middle',
            formatter: function (value, row) {
                var btn = "";
                if(row.firstName != '' && row.firstName != null) {
                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.firstName + '" onfocus="TUser.tooltip()">' + row.firstName + '</p>']
                }
                return btn;
            }
@@ -93,6 +102,15 @@
                return btn;
            }
        },
        {title: '手机号运营商', field: 'phoneOperator', visible: true, align: 'center', valign: 'middle',width:'5%',
            formatter: function (value, row) {
                var btn = "";
                if(row.phoneOperator != '' && row.phoneOperator != null) {
                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.phoneOperator + '" onfocus="TUser.tooltip()">' + row.phoneOperator + '</p>']
                }
                return btn;
            }
        },
        {title: '性别', field: 'sex', visible: true, align: 'center', valign: 'middle',
            formatter: function (value, row) {
                var btn = "";

 ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver_info.js

@@ -49,8 +49,10 @@
    .set('account')
    .set('jobNumber')
    .set('phone')
    .set('phoneOperator')
    .set('password')
    .set('name')
    .set('lastName')
    .set('firstName')
    .set('sex')
    .set('idCard')
    .set('companyId')

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

@@ -26,11 +26,20 @@
                return btn;
            }
        },
        {title: '姓名', field: 'name', visible: true, align: 'center', valign: 'middle',width:'5%',
        {title: '姓', field: 'lastName', visible: true, align: 'center', valign: 'middle',width:'5%',
            formatter: function (value, row) {
                var btn = "";
                if(row.name != '' && row.name != null) {
                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.name + '" onfocus="TUser.tooltip()">' + row.name + '</p>']
                if(row.lastName != '' && row.lastName != null) {
                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.lastName + '" onfocus="TUser.tooltip()">' + row.lastName + '</p>']
                }
                return btn;
            }
        },
        {title: '名', field: 'firstName', visible: true, align: 'center', valign: 'middle',width:'5%',
            formatter: function (value, row) {
                var btn = "";
                if(row.firstName != '' && row.firstName != null) {
                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.firstName + '" onfocus="TUser.tooltip()">' + row.firstName + '</p>']
                }
                return btn;
            }
@@ -54,6 +63,15 @@
                return btn;
            }
        },
        {title: '手机号运营商', field: 'phoneOperator', visible: true, align: 'center', valign: 'middle',width:'5%',
            formatter: function (value, row) {
                var btn = "";
                if(row.phoneOperator != '' && row.phoneOperator != null) {
                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.phoneOperator + '" onfocus="TUser.tooltip()">' + row.phoneOperator + '</p>']
                }
                return btn;
            }
        },
        {title: '性别', field: 'sex', visible: true, align: 'center', valign: 'middle',width:'3%',
            formatter: function (value, row) {
                var btn = "";

 ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver_info.js

@@ -322,8 +322,10 @@
    .set('account')
    .set('jobNumber')
    .set('phone')
    .set('phoneOperator')
    .set('password')
    .set('name')
    .set('lastName')
    .set('firstName')
    .set('sex')
    .set('idCard')
    .set('companyId')

 ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tPubWithdrawal/tPubWithdrawal.js

@@ -34,33 +34,11 @@
                return btn;
            }
        },
        {title: '银行卡号', field: 'code', visible: true, align: 'center', valign: 'middle',
        {title: '提现手机号', field: 'code', visible: true, align: 'center', valign: 'middle',
            formatter: function (value, row) {
                var btn = "";
                if(row.code != '' && row.code != null) {
                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.code + '" onfocus="TUser.tooltip()">' + row.code + '</p>']
                }
                return btn;
            }
        },
        {title: '开户行', field: 'bankName', visible: true, align: 'center', valign: 'middle',
            formatter: function (value, row) {
                var btn = "";
                if(row.bankName != '' && row.bankName != null) {
                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.bankName + '" onfocus="TUser.tooltip()">' + row.bankName + '</p>']
                }
                return btn;
            }
        },
        {title: '提现方式', field: 'withdrawalType', visible: true, align: 'center', valign: 'middle',
            formatter: function (value, row) {
                var btn = "";
                if(row.withdrawalType != '' && row.withdrawalType != null) {
                    if (row.withdrawalType == 1){
                        btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="银行卡" onfocus="TUser.tooltip()">银行卡</p>']
                    } else if (row.withdrawalType == 2){
                        btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="线下" onfocus="TUser.tooltip()">线下</p>']
                    }
                }
                return btn;
            }
@@ -74,6 +52,17 @@
                    } else if (row.userType == 2){
                        btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="司机" onfocus="TUser.tooltip()">司机</p>']
                    }
                }
                return btn;
            }
        },
        {title: '提现金额', field: 'money', visible: true, align: 'center', valign: 'middle',
            formatter: function (value, row) {
                var btn = "";
                if(row.money != '' && row.money != null) {
                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.money + '" onfocus="TUser.tooltip()">' + row.money + '</p>']
                }else if (row.withdrawalType == 2){
                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="0" onfocus="TUser.tooltip()">0</p>']
                }
                return btn;
            }
@@ -92,17 +81,6 @@
            }
        },
        {title: '账户余额', field: 'balance', visible: true, align: 'center', valign: 'middle',
            formatter: function (value, row) {
                var btn = "";
                if(row.money != '' && row.money != null) {
                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.money + '" onfocus="TUser.tooltip()">' + row.money + '</p>']
                }else if (row.withdrawalType == 2){
                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="0" onfocus="TUser.tooltip()">0</p>']
                }
                return btn;
            }
        },
        {title: '提现金额', field: 'money', visible: true, align: 'center', valign: 'middle',
            formatter: function (value, row) {
                var btn = "";
                if(row.money != '' && row.money != null) {