修改三方对接逻辑和环境参数配置

Pu Zhibing

2025-07-17 4918c9ad2c5807dd5b5dc3b2cc0a9a74031d4278

修改三方对接逻辑和环境参数配置

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

@@ -12,12 +12,10 @@
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.*;
import com.stylefeng.guns.modular.system.util.qianyuntong.EmployeeUtil;
import com.stylefeng.guns.modular.system.util.qianyuntong.SMSUtil;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.EditStaffNodeRequest;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.GetStaffNodeRequest;
import com.stylefeng.guns.modular.system.util.qianyuntong.UserUtil;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.QYTUserInfo;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.SendSmsRequest;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.StaffNodeInfo;
import com.stylefeng.guns.modular.system.warpper.ActivityWarpper;
import com.stylefeng.guns.modular.system.warpper.BaseWarpper;
import com.stylefeng.guns.modular.system.warpper.LoginWarpper;
@@ -475,12 +473,8 @@
        }
        Company company = companyMapper.selectById(driver.getCompanyId());
        //查询中台员工数据
        GetStaffNodeRequest request = new GetStaffNodeRequest();
        request.setEmpId(driver.getEmpId());
        request.setEntercode(company.getEnterCode());
        request.setMobile(company.getPrincipalPhone());
        StaffNodeInfo staffNode = EmployeeUtil.getStaffNode(request);
        if (null == staffNode || staffNode.getIsValid().equals("0")) {
        List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(driver.getPhone(), company.getEnterCode());
        if (null == userInfoByPhone || userInfoByPhone.size() == 0) {
            return ResultUtil.error("账号未注册");
        }
    
@@ -791,31 +785,9 @@
        }
        Driver driver1 = this.selectById(uid);
        Company company = companyMapper.selectById(driver1.getCompanyId());
        GetStaffNodeRequest request = new GetStaffNodeRequest();
        request.setEmpId(driver1.getEmpId());
        request.setEntercode(driver1.getEntercode());
        request.setMobile(driver1.getPhone());
        StaffNodeInfo staffNode = EmployeeUtil.getStaffNode(request);
        if ("0".equals(staffNode.getIsValid())) {
            return ResultUtil.error("无效的司机账号");
        }
        EditStaffNodeRequest editStaffNodeRequest = new EditStaffNodeRequest();
        editStaffNodeRequest.setEmpId(staffNode.getEmpId());
        editStaffNodeRequest.setMobile(company.getPrincipalPhone());
        editStaffNodeRequest.setEntercode(company.getEnterCode());
        editStaffNodeRequest.setEnterId(staffNode.getEnterId());
        editStaffNodeRequest.setEmpName(staffNode.getEmpName());
        editStaffNodeRequest.setEmpNickname(staffNode.getEmpNickname());
        editStaffNodeRequest.setLoginNo(staffNode.getLoginNo());
        editStaffNodeRequest.setMphone(phone);
        editStaffNodeRequest.setEmail(staffNode.getEmail());
        editStaffNodeRequest.setDeptId(staffNode.getDeptId());
        editStaffNodeRequest.setPositionId(1);
        editStaffNodeRequest.setSuperLevel(0);
        editStaffNodeRequest.setHideMobile(0);
        Boolean editStaffNode = EmployeeUtil.editStaffNode(editStaffNodeRequest);
        if (!editStaffNode) {
            return ResultUtil.error("修改手机号码失败");
        List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(driver1.getPhone(), company.getEnterCode());
        if (null == userInfoByPhone || userInfoByPhone.size() == 0) {
            return ResultUtil.error("账号未注册");
        }
    
        driver1.setAccount(phone);

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/EnterpriseUtil.java

@@ -308,22 +308,22 @@
//        EmployeeUtil.saveStaffNode(request);
        
        //接口参数有问题
        EditStaffNodeRequest request = new EditStaffNodeRequest();
        request.setEmpId(11448071);
        request.setMobile("15828353127");
        request.setEntercode("981100006005901");
        request.setEnterId(981100006005901L);
        request.setEmpName("蒲师傅");
        request.setEmpNickname("蒲师傅");
        request.setLoginNo("15828353127");
        request.setMphone("15828353127");
        request.setEmail("393733352@qq.com");
        request.setEmpSex("男");
        request.setDeptId(0);
        request.setPositionId(1);
        request.setSuperLevel(0);
        request.setHideMobile(0);
        EmployeeUtil.editStaffNode(request);
//        EditStaffNodeRequest request = new EditStaffNodeRequest();
//        request.setEmpId(11448071);
//        request.setMobile("15828353127");
//        request.setEntercode("981100006005901");
//        request.setEnterId(981100006005901L);
//        request.setEmpName("蒲师傅");
//        request.setEmpNickname("蒲师傅");
//        request.setLoginNo("15828353127");
//        request.setMphone("15828353127");
//        request.setEmail("393733352@qq.com");
//        request.setEmpSex("男");
//        request.setDeptId(0);
//        request.setPositionId(1);
//        request.setSuperLevel(0);
//        request.setHideMobile(0);
//        EmployeeUtil.editStaffNode(request);


//        GetStaffNodeRequest request = new GetStaffNodeRequest();

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/UserUtil.java

@@ -6,6 +6,7 @@
import com.google.gson.Gson;
import com.open.common.util.OpenApiClient;
import com.open.common.util.SystemParameterNames;
import com.stylefeng.guns.modular.system.util.SpringContextsUtil;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.*;
import lombok.extern.slf4j.Slf4j;

@@ -20,6 +21,8 @@
 */
@Slf4j
public class UserUtil {
	
    private static QianYunTongConfig qianYunTongConfig = SpringContextsUtil.getBean(QianYunTongConfig.class).getQianYunTongConfig();
    
    
    /**
@@ -212,5 +215,60 @@
    
    

    /**
     * 根据手机号码获取人员信息
     *
     * @param mobile   手机号码
     * @param enterNum 企业编号
     */
    public static List<QYTUserInfo> getUserInfoByPhone(String mobile, String enterNum) {
        //请求路径
        String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/getUserInfoByPhone";
        //私钥文件
        String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
        //注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
        String appKey = qianYunTongConfig.getAppkey();//appkey
        Map<String, String> headers = new HashMap<>();
        headers.put("Content-Type", "application/json");
        Map<String, Object> contentMap = new HashMap<String, Object>();
        Date nowdate = new Date();
        SimpleDateFormat date = new SimpleDateFormat("yyyyMMddHHmmss");
    
        String timeStamp = date.format(nowdate);
        String messageId = UUID.randomUUID().toString().replaceAll("-", "");
        contentMap.put(SystemParameterNames.getAppKey(), appKey);
        contentMap.put(SystemParameterNames.getMessage_id(), messageId);
        contentMap.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
        contentMap.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
        Map<String, String> map = new HashMap<>();
        map.put("mobile", mobile);
        if (null != enterNum) {
            map.put("enterNum", enterNum);
        }
        contentMap.put("content", JSON.toJSONString(map));
        log.info("【根据手机号码获取人员信息】请求地址:" + url);
        log.info("【根据手机号码获取人员信息】请求参数:" + JSON.toJSONString(contentMap));
        String result = OpenApiClient.sendCommonHttpRequst(url, headers, "GET", skprivateKeyFile, timeStamp, contentMap);
        log.info("【根据手机号码获取人员信息】请求结果:" + result);
        JSONObject jsonObject = JSON.parseObject(result);
        String retCode = jsonObject.getString("retCode");
        if (!"0".equals(retCode)) {
            log.error("【根据手机号码获取人员信息】请求失败:" + result);
            return null;
        }
        JSONObject object = jsonObject.getJSONObject("object");
        String status = object.getString("status");
        if (!"0".equals(status)) {
            log.error("【根据手机号码获取人员信息】失败:" + object.toJSONString());
            return null;
        }
        JSONArray data = object.getJSONArray("data");
        List<QYTUserInfo> list = new ArrayList<>();
        for (int i = 0; i < data.size(); i++) {
            data.getJSONObject(i).getString("enter_code");
            QYTUserInfo userInfo = data.getObject(i, QYTUserInfo.class);
            list.add(userInfo);
        }
        return list;
    }
}

 DriverQYTTravel/guns-admin/src/main/resources/application-dev.yml

@@ -14,8 +14,7 @@
    application:
        name: driver-server
    profiles:
        #        active: dev
        active: prod
        active: dev
    mvc:
        static-path-pattern: /static/**
        view:

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

@@ -14,8 +14,7 @@
    application:
        name: driver-server
    profiles:
        #        active: dev
        active: prod
        active: dev
    mvc:
        static-path-pattern: /static/**
        view:

 DriverQYTTravel/pom.xml

@@ -221,19 +221,13 @@

    <profiles>
        <profile>
            <id>local</id>
            <properties>
                <spring.active>local</spring.active>
            </properties>
            <activation>
                <activeByDefault>true</activeByDefault>
            </activation>
        </profile>
        <profile>
            <id>dev</id>
            <properties>
                <spring.active>dev</spring.active>
            </properties>
            <activation>
                <activeByDefault>true</activeByDefault>
            </activation>
        </profile>
        <profile>
            <id>test</id>
@@ -242,9 +236,9 @@
            </properties>
        </profile>
        <profile>
            <id>produce</id>
            <id>prod</id>
            <properties>
                <spring.active>produce</spring.active>
                <spring.active>prod</spring.active>
            </properties>
        </profile>
    </profiles>

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

@@ -327,6 +327,7 @@
        return super.packForBT(page);
    }


    /**
     * 新增分公司管理
     */
@@ -373,7 +374,7 @@
            if(null == userInfoByPhone ||userInfoByPhone.size() == 0){
                //负责人不匹配，则创建新的员工到中台
                SaveStaffNodeRequest request = new SaveStaffNodeRequest();
                request.setMobile(user2.getPhone());
                request.setMobile(checkEnterExist.getMobile());
                request.setEntercode(enterCode);
                request.setEmpName(tCompany.getName() + "管理员");
                request.setEmpNickname(tCompany.getName() + "管理员");
@@ -414,6 +415,7 @@
        //添加User对象
        User user = new User();
        user.setAccount(account);
        user.setPhone(account);
        user.setSalt(ShiroKit.getRandomSalt(5));
        user.setPassword(ShiroKit.md5(password, user.getSalt()));
        user.setRoleid("2");
@@ -450,6 +452,7 @@
        addSocpe(subArr, tCompany.getId());
        return SUCCESS_TIP;
    }

    //添加经营区域
    public void addSocpe(String subArr,Integer id){
        JSONArray jsonArray = JSON.parseArray(subArr);
@@ -483,125 +486,6 @@
                tCompanyCityService.updateById(tCompanyCity);
            }
        }
    }

    /**
     * 新增加盟商管理
     */
    @RequestMapping(value = "/addFranchisee")
    @ResponseBody
    public Object addFranchisee(TCompany tCompany,String account,String password) {
        //判断账号是否已存在
        int count = userService.selectCount(new EntityWrapper<User>().eq("account", account));
        if (count > 0) {
            return "error";
        }
        //调用中台接口创建企业
        CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterNameExist(tCompany.getName());
        String enterCode = "";
        Long empId = null;
        Integer empnew = null;
        Integer enterNew = null;
        ShiroUser user1 = shiroExtUtil.getUser();
        User user2 = userService.selectById(user1.getId());
	
        //企业未注册，进行注册
        if (null == checkEnterExist || "0".equals(checkEnterExist.getIsReg())) {
            CreateEnterpriseRequest request = new CreateEnterpriseRequest();
            request.setName(tCompany.getName());
            request.setNickName(tCompany.getName());
            request.setIndustry_code("123456");
            request.setMobile(account);
            CreateEnterprise enterprise = EnterpriseUtil.createEnterprise(request);
            enterCode = enterprise.getIdCode();
            enterNew = 1;
            List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(account, enterCode);
            if(null != userInfoByPhone && userInfoByPhone.size() > 0){
                empId = userInfoByPhone.get(0).getEmpId();
                empnew = 0;
            }else{
                empId = 0L;
                empnew = 1;
            }
        }
        //企业已注册
        if (null != checkEnterExist && "1".equals(checkEnterExist.getIsReg())) {
            List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(account, enterCode);
            enterCode = checkEnterExist.getEnterCode();
            enterNew = 0;
            if(null == userInfoByPhone || userInfoByPhone.size() == 0){
                SaveStaffNodeRequest request = new SaveStaffNodeRequest();
                request.setMobile(user2.getPhone());
                request.setEntercode(enterCode);
                request.setEmpName(tCompany.getName() + "管理员");
                request.setEmpNickname(tCompany.getName() + "管理员");
                request.setLoginNo(account);
                request.setEmpSex("女");
                request.setMphone(account);
                request.setEmail(account + "@qyt.com");
                request.setDeptId(0);
                request.setPositionId(1);
                request.setSuperLevel(0);
                request.setHideMobile(0);
                ResultUtil<SaveStaffNode> resultUtil = EmployeeUtil.saveStaffNode(request);
                if(200 != resultUtil.getStatus()){
                    return new ErrorTip(resultUtil.getStatus(), resultUtil.getMsg());
                }
                SaveStaffNode saveStaffNode = resultUtil.getData();
                empId = saveStaffNode.getEmpId();
                empnew = 1;
            }else{
                empId = userInfoByPhone.get(0).getEmpId();
                empnew = 0;
            }
        }
	
        tCompany.setEnterCode(enterCode);
        tCompany.setEnterNew(enterNew);
        tCompany.setType(3);  //2：分公司
        if (shiroExtUtil.getUser().getRoleType() == 2) {
            tCompany.setSuperiorId(shiroExtUtil.getUser().getObjectId());
        }
        tCompany.setState(0); //0：正常
        tCompany.setFlag("1");
        tCompany.setInsertTime(new Date());
        tCompanyService.insert(tCompany);
	
        //添加User对象
        User user = new User();
        user.setAccount(account);
        user.setSalt(ShiroKit.getRandomSalt(5));
        user.setPassword(ShiroKit.md5(password, user.getSalt()));
        user.setRoleid("3");
        user.setDeptid(26);
        user.setStatus(1);
        user.setCreatetime(new Date());
        user.setRoleType(3);
        user.setObjectId(tCompany.getId());
        user.setName(tCompany.getName());
        user.setSex(1);
        user.setEmpId(empId);
        user.setEntercode(enterCode);
        user.setEnterId(Long.valueOf(enterCode));
        user.setEmpnew(empnew);
        userService.insert(user);
        //编写异步延迟处理中台账号延迟创建的问题
        if(0 == empId){
            Timer timer = new Timer();
            String finalEnterCode = enterCode;
            timer.schedule(new TimerTask() {
                @Override
                public void run() {
                    List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(account, finalEnterCode);
                    if(null != userInfoByPhone && userInfoByPhone.size() > 0){
                        Long empId1 = userInfoByPhone.get(0).getEmpId();
                        user.setEmpId(empId1);
                        userService.updateById(user);
                    }
                }
            },120*1000);
        }
        return SUCCESS_TIP;
    }

    /**
@@ -679,6 +563,124 @@
        return SUCCESS_TIP;
    }

    /**
     * 新增加盟商管理
     */
    @RequestMapping(value = "/addFranchisee")
    @ResponseBody
    public Object addFranchisee(TCompany tCompany,String account,String password) {
        //判断账号是否已存在
        int count = userService.selectCount(new EntityWrapper<User>().eq("account", account));
        if (count > 0) {
            return "error";
        }
        //调用中台接口创建企业
        CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterNameExist(tCompany.getName());
        String enterCode = "";
        Long empId = null;
        Integer empnew = null;
        Integer enterNew = null;
        ShiroUser user1 = shiroExtUtil.getUser();
        User user2 = userService.selectById(user1.getId());

        //企业未注册，进行注册
        if (null == checkEnterExist || "0".equals(checkEnterExist.getIsReg())) {
            CreateEnterpriseRequest request = new CreateEnterpriseRequest();
            request.setName(tCompany.getName());
            request.setNickName(tCompany.getName());
            request.setIndustry_code("123456");
            request.setMobile(account);
            CreateEnterprise enterprise = EnterpriseUtil.createEnterprise(request);
            enterCode = enterprise.getIdCode();
            enterNew = 1;
            List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(account, enterCode);
            if(null != userInfoByPhone && userInfoByPhone.size() > 0){
                empId = userInfoByPhone.get(0).getEmpId();
                empnew = 0;
            }else{
                empId = 0L;
                empnew = 1;
            }
        }
        //企业已注册
        if (null != checkEnterExist && "1".equals(checkEnterExist.getIsReg())) {
            List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(account, enterCode);
            enterCode = checkEnterExist.getEnterCode();
            enterNew = 0;
            if(null == userInfoByPhone || userInfoByPhone.size() == 0){
                SaveStaffNodeRequest request = new SaveStaffNodeRequest();
                request.setMobile(checkEnterExist.getMobile());
                request.setEntercode(enterCode);
                request.setEmpName(tCompany.getName() + "管理员");
                request.setEmpNickname(tCompany.getName() + "管理员");
                request.setLoginNo(account);
                request.setEmpSex("女");
                request.setMphone(account);
                request.setEmail(account + "@qyt.com");
                request.setDeptId(0);
                request.setPositionId(1);
                request.setSuperLevel(0);
                request.setHideMobile(0);
                ResultUtil<SaveStaffNode> resultUtil = EmployeeUtil.saveStaffNode(request);
                if(200 != resultUtil.getStatus()){
                    return new ErrorTip(resultUtil.getStatus(), resultUtil.getMsg());
                }
                SaveStaffNode saveStaffNode = resultUtil.getData();
                empId = saveStaffNode.getEmpId();
                empnew = 1;
            }else{
                empId = userInfoByPhone.get(0).getEmpId();
                empnew = 0;
            }
        }
	
        tCompany.setEnterCode(enterCode);
        tCompany.setEnterNew(enterNew);
        tCompany.setType(3);  //2：分公司
        if (shiroExtUtil.getUser().getRoleType() == 2) {
            tCompany.setSuperiorId(shiroExtUtil.getUser().getObjectId());
        }
        tCompany.setState(0); //0：正常
        tCompany.setFlag("1");
        tCompany.setInsertTime(new Date());
        tCompanyService.insert(tCompany);
	
        //添加User对象
        User user = new User();
        user.setAccount(account);
        user.setPhone(account);
        user.setSalt(ShiroKit.getRandomSalt(5));
        user.setPassword(ShiroKit.md5(password, user.getSalt()));
        user.setRoleid("3");
        user.setDeptid(26);
        user.setStatus(1);
        user.setCreatetime(new Date());
        user.setRoleType(3);
        user.setObjectId(tCompany.getId());
        user.setName(tCompany.getName());
        user.setSex(1);
        user.setEmpId(empId);
        user.setEntercode(enterCode);
        user.setEnterId(Long.valueOf(enterCode));
        user.setEmpnew(empnew);
        userService.insert(user);
        //编写异步延迟处理中台账号延迟创建的问题
        if(0 == empId){
            Timer timer = new Timer();
            String finalEnterCode = enterCode;
            timer.schedule(new TimerTask() {
                @Override
                public void run() {
                    List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(account, finalEnterCode);
                    if(null != userInfoByPhone && userInfoByPhone.size() > 0){
                        Long empId1 = userInfoByPhone.get(0).getEmpId();
                        user.setEmpId(empId1);
                        userService.updateById(user);
                    }
                }
            },120*1000);
        }
        return SUCCESS_TIP;
    }

}

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

@@ -588,9 +588,10 @@
        }
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        if (shiroExtUtil.getUser().getRoleType() != 1) {
            page.setRecords(null);
            User user = userService.selectById(shiroExtUtil.getUser().getId());
            page.setRecords(tDriverService.getAuthDriverList(page, beginTime, endTime, companyName, phone, account, addType, authState, user.getObjectId()));
        } else {
            page.setRecords(tDriverService.getAuthDriverList(page, beginTime, endTime, companyName, phone, account, addType, authState));
            page.setRecords(tDriverService.getAuthDriverList(page, beginTime, endTime, companyName, phone, account, addType, authState, null));
        }
        return super.packForBT(page);
    }

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TDriverMapper.java

@@ -1,8 +1,8 @@
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.TDriver;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;
@@ -29,7 +29,8 @@
                                         @Param("phone") String phone,
                                         @Param("account") String account,
                                         @Param("addType") Integer addType,
                                         @Param("authState") Integer authState);
                                         @Param("authState") Integer authState,
                                         @Param("companyId") Integer companyId);

    /**
     * 根据用户ID获取用户详情

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

@@ -90,6 +90,9 @@
        ) as o
        <where>
            FIND_IN_SET(o.authState,'1,4') and o.flag != 3
            <if test="null != companyId">
                and o.companyId = #{companyId}
            </if>
            <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
                AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
            </if>

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITDriverService.java

@@ -1,8 +1,8 @@
package com.stylefeng.guns.modular.system.service;

import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.modular.system.model.TDriver;
import com.baomidou.mybatisplus.service.IService;
import com.stylefeng.guns.modular.system.model.TDriver;
import org.apache.ibatis.annotations.Param;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;

@@ -30,7 +30,8 @@
                                               @Param("phone") String phone,
                                               @Param("account") String account,
                                               @Param("addType") Integer addType,
                                               @Param("authState") Integer authState);
                                               @Param("authState") Integer authState,
                                               @Param("companyId") Integer companyId);

    /**
     * 根据用户ID获取用户详情

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java

@@ -32,8 +32,9 @@
    private ShiroExtUtil shiroExtUtil;
    
    @Override
    public List<Map<String, Object>> getAuthDriverList(Page<Map<String, Object>> page, String beginTime, String endTime, String companyName, String phone, String account, Integer addType, Integer authState) {
        return this.baseMapper.getAuthDriverList(page, beginTime, endTime, companyName, phone, account, addType, authState);
    public List<Map<String, Object>> getAuthDriverList(Page<Map<String, Object>> page, String beginTime, String endTime, String companyName,
                                                       String phone, String account, Integer addType, Integer authState, Integer companyId) {
        return this.baseMapper.getAuthDriverList(page, beginTime, endTime, companyName, phone, account, addType, authState, companyId);
    }
    
    @Override

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/EmployeeUtil.java

@@ -58,7 +58,7 @@
     * @param request
     * @return
     */
    public static Boolean editStaffNode(EditStaffNodeRequest request){
    public static ResultUtil editStaffNode(EditStaffNodeRequest request){
        //请求路径
        String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/editStaffNode";
        //私钥文件
@@ -86,15 +86,18 @@
        String retCode = jsonObject.getString("retCode");
        if (!"0".equals(retCode)) {
            log.error("【企业修改员工信息】请求失败:" + result);
            throw new RuntimeException("【企业修改员工信息】请求失败:" + result);
            String retMsg = jsonObject.getString("retMsg");
            retMsg = retMsg.substring(retMsg.indexOf("{"));
            jsonObject = JSON.parseObject(retMsg);
            return ResultUtil.error("【企业修改员工信息】请求失败:" + jsonObject.getString("msg"));
        }
        JSONObject object = jsonObject.getJSONObject("object");
        String status = object.getString("status");
        if (!"0".equals(status)) {
            log.error("【企业修改员工信息】失败:" + object.toJSONString());
            throw new RuntimeException("【企业修改员工信息】失败:" + object.toJSONString());
            return ResultUtil.error("【企业修改员工信息】失败:" + object.toJSONString());
        }
        return true;
        return ResultUtil.success();
    }
    
    
@@ -132,7 +135,10 @@
        String retCode = jsonObject.getString("retCode");
        if (!"0".equals(retCode)) {
            log.error("【企业删除人员】请求失败:" + result);
            return ResultUtil.error("【企业删除人员】请求失败:" + result);
            String retMsg = jsonObject.getString("retMsg");
            retMsg = retMsg.substring(retMsg.indexOf("{"));
            jsonObject = JSON.parseObject(retMsg);
            return ResultUtil.error("【企业删除人员】请求失败:" + jsonObject.getString("msg"));
        }
        JSONObject object = jsonObject.getJSONObject("object");
        String status = object.getString("status");
@@ -222,7 +228,10 @@
        String retCode = jsonObject.getString("retCode");
        if (!"0".equals(retCode)) {
            log.error("【企业增加员工】请求失败:" + result);
            return ResultUtil.error("【企业增加员工】请求失败:" + result);
            String retMsg = jsonObject.getString("retMsg");
            retMsg = retMsg.substring(retMsg.indexOf("{"));
            jsonObject = JSON.parseObject(retMsg);
            return ResultUtil.error("【企业增加员工】请求失败:" + jsonObject.getString("msg"));
        }
        JSONObject object = jsonObject.getJSONObject("object");
        String status = object.getString("status");

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/EnterpriseUtil.java

@@ -241,7 +241,10 @@
        String retCode = jsonObject.getString("retCode");
        if (!"0".equals(retCode)) {
            log.error("【创建企业】请求失败:" + result);
            throw new RuntimeException("【创建企业】请求失败:" + result);
            String retMsg = jsonObject.getString("retMsg");
            retMsg = retMsg.substring(retMsg.indexOf("{"));
            jsonObject = JSON.parseObject(retMsg);
            throw new RuntimeException("【创建企业】请求失败:" + jsonObject.getString("msg"));
        }
        JSONObject object = jsonObject.getJSONObject("object");
        String status = object.getString("status");
@@ -289,7 +292,10 @@
        String retCode = jsonObject.getString("retCode");
        if (!"0".equals(retCode)) {
            log.error("【删除企业信息】请求失败:" + result);
            return ResultUtil.error("【删除企业信息】请求失败:" + result);
            String retMsg = jsonObject.getString("retMsg");
            retMsg = retMsg.substring(retMsg.indexOf("{"));
            jsonObject = JSON.parseObject(retMsg);
            return ResultUtil.error("【删除企业信息】请求失败:" + jsonObject.getString("msg"));
        }
        JSONObject object = jsonObject.getJSONObject("object");
        String status = object.getString("status");