Merge remote-tracking branch 'origin/master'

xuhy

2024-05-28 5470d21a35286abe41fafc25a7deaabefd7c55da

 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java

@@ -722,7 +722,7 @@
                    baseWarpper.setName("出租车");
                    break;
                case 3:
                    baseWarpper.setName("直通车");
                    baseWarpper.setName("城际拼车");
                    break;
                case 4:
                    baseWarpper.setName("同城小件物流");
@@ -732,6 +732,9 @@
                    break;
                case 6:
                    baseWarpper.setName("包车");
                    break;
                    case 7:
                    baseWarpper.setName("接送机");
                    break;
            }
            maps.add(baseWarpper);
@@ -836,11 +839,12 @@
     * @throws Exception
     */
    @Override
    public Map<String, Object> queryPhone(Integer uid) throws Exception {
    public Map<String, Object> queryPhone(Integer uid,String wechat) throws Exception {
        Driver driver = this.selectById(uid);
        Company company = companyMapper.selectById(driver.getFranchiseeId() != null && driver.getFranchiseeId() != 0 ? driver.getFranchiseeId() : (
                driver.getCompanyId() != null && driver.getCompanyId() != 0 ? driver.getCompanyId() : 1));
        Map<String, Object> map = new HashMap<>();
        map.put("wechatUrl",wechat);
        if(company.getType() == 3){//加盟商
            Phone phone = phoneMapper.queryInfo(company.getId(), 2);
            map.put("franchisee", null != phone ? phone.getPhone() : "");
@@ -858,6 +862,7 @@
            }else{
                map.put("platform", "");
            }

            return map;
        }
        if(company.getType() == 2){//分公司