修改bug

Pu Zhibing

4 天以前 a0af42a6acfc7a0ebbb92bffc1816525e508af70

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

@@ -117,7 +117,7 @@
    private IUserService userService;

    @Autowired
    private ITCompanyService companyService;
    private ITBranchOfficeService branchOfficeService;

    /**
     * 跳转到首页
@@ -552,21 +552,19 @@
        tDriver.setApprovalStatus(approvalStatus);
        tDriver.setApprovalNotes(approvalNotes);
        // 审核用户id
        Subject subject = ShiroKit.getSubject();
        ShiroUser shiroUser = (ShiroUser)subject.getPrincipal();
        tDriver.setApprovalUserId(shiroUser.getId());
        tDriver.setApprovalUserId(user1.getId());
        tDriver.setApprovalTime(new Date());
        if (approvalStatus==2){
            //审核通过，在中台添加司机账号
            Integer objectId = tDriver.getBranchOfficeId();
            TCompany tCompany = companyService.selectById(objectId);
            List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(tDriver.getPhone(), tCompany.getEnterCode());
            TBranchOffice tBranchOffice = branchOfficeService.selectById(objectId);
            List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(tDriver.getPhone(), tBranchOffice.getEnterCode());
            Long empId = null;
            Integer empnew = null;
            if(null == userInfoByPhone || userInfoByPhone.size() == 0){
                SaveStaffNodeRequest request = new SaveStaffNodeRequest();
                request.setMobile(user2.getPhone());
                request.setEntercode(tCompany.getEnterCode());
                request.setEntercode(tBranchOffice.getEnterCode());
                request.setEmpName(tDriver.getName());
                request.setEmpNickname(tDriver.getName());
                request.setLoginNo(tDriver.getPhone());
@@ -589,8 +587,8 @@
                empnew = 0;
            }
            tDriver.setEmpId(empId);
            tDriver.setEntercode(tCompany.getEnterCode());
            tDriver.setEnterId(Long.valueOf(tCompany.getEnterCode()));
            tDriver.setEntercode(tBranchOffice.getEnterCode());
            tDriver.setEnterId(Long.valueOf(tBranchOffice.getEnterCode()));
            tDriver.setEmpnew(empnew);
        }
        tDriverService.updateById(tDriver);
@@ -664,47 +662,44 @@
        tDriver.setBalance(BigDecimal.ZERO);
        tDriver.setBackgroundBalance(BigDecimal.ZERO);
        tDriver.setCommission(BigDecimal.ZERO);
        if(2 == tDriver.getApprovalStatus()){
            ShiroUser user = shiroExtUtil.getUser();
            User user2 = userService.selectById(user.getId());
            Integer objectId = user.getObjectId();
            TCompany tCompany = companyService.selectById(objectId);
            List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(tDriver.getPhone(), tCompany.getEnterCode());
            Long empId = null;
            Integer empnew = null;
            if(null == userInfoByPhone || userInfoByPhone.size() == 0){
                SaveStaffNodeRequest request = new SaveStaffNodeRequest();
                request.setMobile(user2.getPhone());
                request.setEntercode(tCompany.getEnterCode());
                request.setEmpName(tDriver.getName());
                request.setEmpNickname(tDriver.getName());
                request.setLoginNo(tDriver.getPhone());
                request.setEmpSex(tDriver.getSex() == 1 ? "男" : "女");
                request.setMphone(tDriver.getPhone());
                request.setEmail(tDriver.getPhone() + "@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;
            }
        tDriver.setApprovalStatus(2);

            TCompany tCompany1 = companyService.selectById(tDriver.getBranchOfficeId());
            tDriver.setEmpId(empId);
            tDriver.setEntercode(tCompany1.getEnterCode());
            tDriver.setEnterId(Long.valueOf(tCompany1.getEnterCode()));
            tDriver.setEmpnew(empnew);
        TBranchOffice tBranchOffice = branchOfficeService.selectById(tDriver.getBranchOfficeId());
        User user2 = userService.selectById(tBranchOffice.getSysUserId());
        List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(tDriver.getPhone(), tBranchOffice.getEnterCode());
        Long empId = null;
        Integer empnew = null;
        if(null == userInfoByPhone || userInfoByPhone.size() == 0){
            SaveStaffNodeRequest request = new SaveStaffNodeRequest();
            request.setMobile(user2.getPhone());
            request.setEntercode(tBranchOffice.getEnterCode());
            request.setEmpName(tDriver.getName());
            request.setEmpNickname(tDriver.getName());
            request.setLoginNo(tDriver.getPhone());
            request.setEmpSex(tDriver.getSex() == 1 ? "男" : "女");
            request.setMphone(tDriver.getPhone());
            request.setEmail(tDriver.getPhone() + "@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;
        }

        TBranchOffice tBranchOffice1 = branchOfficeService.selectById(tDriver.getBranchOfficeId());
        tDriver.setEmpId(empId);
        tDriver.setEntercode(tBranchOffice1.getEnterCode());
        tDriver.setEnterId(Long.valueOf(tBranchOffice1.getEnterCode()));
        tDriver.setEmpnew(empnew);

        tDriverService.insert(tDriver);
        return SUCCESS_TIP;
@@ -719,15 +714,15 @@
        TDriver driver = tDriverService.selectById(tDriverId);

        ShiroUser user = shiroExtUtil.getUser();
        TCompany tCompany = companyService.selectById(user.getObjectId());
        TBranchOffice tBranchOffice = branchOfficeService.selectById(user.getObjectId());
        if (null != driver.getEmpId() && 1 == driver.getEmpnew()) {
            //中台先删除司机
            List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(driver.getPhone(), tCompany.getEnterCode());
            List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(driver.getPhone(), tBranchOffice.getEnterCode());
            if (null != userInfoByPhone && 0 < userInfoByPhone.size() && 1 == driver.getEmpnew()) {
                DeleteStafNodeRequest deleteStafNodeRequest = new DeleteStafNodeRequest();
                deleteStafNodeRequest.setEmpId(driver.getEmpId());
                deleteStafNodeRequest.setEntercode(tCompany.getEnterCode());
                deleteStafNodeRequest.setMobile(tCompany.getPrincipalPhone());
                deleteStafNodeRequest.setEntercode(tBranchOffice.getEnterCode());
                deleteStafNodeRequest.setMobile(tBranchOffice.getPrincipalPhone());
                ResultUtil resultUtil = EmployeeUtil.ecrmDeleteStafNode(deleteStafNodeRequest);
                if(200 != resultUtil.getStatus()){
                    return new ErrorTip(resultUtil.getStatus(), resultUtil.getMsg());
@@ -784,10 +779,10 @@

        // 添加充值记录
        TRechargeRecord tRechargeRecord = new TRechargeRecord();
        Integer roleType = ShiroKit.getUser().getRoleType();
        Integer roleType = shiroExtUtil.getUser().getRoleType();
        if(roleType == 2){
            tRechargeRecord.setType(UserTypeEnum.BRANCH_OFFICE.getCode());
            Integer id1 = Objects.requireNonNull(ShiroKit.getUser()).getObjectId();
            Integer id1 = Objects.requireNonNull(shiroExtUtil.getUser()).getObjectId();
            tRechargeRecord.setBranchOfficeId(id1);
        }
        if(roleType == 3){
@@ -838,10 +833,10 @@
        if(!b){
            return "司机姓名和身份证号不匹配";
        }
        Object o = tDriverService.addOrUpdate(tDriver);
        if(Objects.nonNull(o)){
            return o;
        }
//        Object o = tDriverService.addOrUpdate(tDriver);
//        if(Objects.nonNull(o)){
//            return o;
//        }
        tDriver.setName(tDriver.getName().replace(" ",""));
        tDriver.setEmergencyContact(tDriver.getEmergencyContact().replace(" ",""));
        tDriverService.updateById(tDriver);