From 71a01448f9e6de4a05381a74e415b9f0964cddef Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期四, 24 七月 2025 19:21:23 +0800 Subject: [PATCH] 新增部分三方接口 --- DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java | 29 ++++++++++++++++++++++------- 1 files changed, 22 insertions(+), 7 deletions(-) diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java index cbb0ed1..354d01b 100644 --- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java +++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java @@ -21,6 +21,7 @@ import com.stylefeng.guns.modular.system.warpper.LoginWarpper; import com.stylefeng.guns.modular.system.warpper.RegisteredWarpper; import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService; +import io.rong.models.response.TokenResult; import org.apache.shiro.authc.SimpleAuthenticationInfo; import org.apache.shiro.authc.UsernamePasswordToken; import org.apache.shiro.authc.credential.HashedCredentialsMatcher; @@ -344,11 +345,23 @@ @Override public ResultUtil updateDriver(RegisteredWarpper registeredWarpper, Integer uid) throws Exception { Driver driver = this.selectById(uid); + //调用中台接口校验实名信息 + Boolean auth = UserUtil.idCardAuth(registeredWarpper.getName(), registeredWarpper.getIdCard()); + if(!auth){ + return ResultUtil.error("实名认证失败,请输入正确的姓名和身份证号码"); + } driver.setName(registeredWarpper.getName()); driver.setSex(registeredWarpper.getSex()); driver.setIdCard(registeredWarpper.getIdCard()); - String code = registeredWarpper.getPlaceOfEmployment(); + driver.setArea(registeredWarpper.getArea()); + driver.setAreaCode(registeredWarpper.getAreaCode()); + driver.setCity(registeredWarpper.getCity()); + driver.setCityCode(registeredWarpper.getCityCode()); + driver.setProvince(registeredWarpper.getProvince()); + driver.setProvinceCode(registeredWarpper.getProvinceCode()); + + String code = registeredWarpper.getAreaCode(); Company query = companyCityService.query(code); if(null == query){ return ResultUtil.error("选择从业地暂未开通业务"); @@ -395,7 +408,7 @@ boolean b = true; for(String t : split){ for(DriverService driverService : list){ - if(driverService.getType() == Integer.valueOf(t)){ + if(driverService.getType().equals(Integer.valueOf(t))){ b = false; break; } @@ -502,7 +515,9 @@ loginWarpper.setToken(token); loginWarpper.setAppid(UUIDUtil.getRandomCode()); loginWarpper.setState(ToolUtil.isEmpty(driver.getIdCard()) ? 1 : 0); - + TokenResult token1 = RongCloudUtil.getToken(driver.getId().toString(), driver.getName(), driver.getHeadImgUrl()); + loginWarpper.setRongYunToken(token1.getToken()); + //创建高德猎鹰的终端数据 String tid = gdFalconUtil.createTerminal(phone); loginWarpper.setServerId(gdFalconUtil.getServerId()); @@ -838,10 +853,10 @@ if(driver.getState() == 3){ return ResultUtil.error("还在服务中,不能更换"); } -// boolean idle = carService.idle(carId); -// if(!idle){ -// return ResultUtil.error("车辆已被绑定了"); -// } + boolean idle = carService.idle(carId); + if(!idle){ + return ResultUtil.error("当前车辆已经有其他司机在使用,请更换车辆"); + } driver.setCarId(carId); this.updateById(driver); return ResultUtil.success(); -- Gitblit v1.7.1