update

liujie

2025-11-27 864587b0cc2b9a2a607f01b01adf6c9ebf038648

 DriverJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/UserWithdrawalController.java

@@ -128,8 +128,11 @@
        // 查询司机
//        Driver driver = driverService.selectById(id);
        Driver driver = driverService.selectById(driverId);
        List<UserWithdrawal> userWithdrawals = userWithdrawalService.selectList(new EntityWrapper<UserWithdrawal>().eq("phone",driver.getPhone()).eq("type", 1));
        if (CollUtil.isNotEmpty(userWithdrawals)) {
        UserWithdrawal userWithdrawal1 = userWithdrawalService.selectOne(new EntityWrapper<UserWithdrawal>()
                .eq("userId",driver.getId())
                .eq("userType",2).eq("type",1)
                .last("LIMIT 1"));
        if (userWithdrawal1!=null) {
            return ResultUtil.error("该手机号已绑定进件信息");
        }
        userWithdrawalReq.setOutRequestNo(ToolUtil.getRandomString(32));
@@ -253,6 +256,8 @@
            BeanUtils.copyProperties(userWithdrawal1,userWithdrawal);

            userWithdrawal.setIdCardFrontPicture(copy1);
            userWithdrawal.setUserId(driver.getId());
            userWithdrawal.setUserType(2);
            userWithdrawal.setIdCardReversePicture(copy2);
            userWithdrawal.setImgUrl(idCardFrontPicture);
            userWithdrawal.setImgUrlOne(idCardReversePicture);
@@ -338,7 +343,8 @@
                return ResultUtil.tokenErr();
            }
            Driver driver = driverService.selectById(driverId);
            List<UserWithdrawal> userWithdrawals = userWithdrawalService.selectList(new EntityWrapper<UserWithdrawal>().eq("phone",driver.getPhone()).eq("type", 1));
            List<UserWithdrawal> userWithdrawals = userWithdrawalService.selectList(new EntityWrapper<UserWithdrawal>().eq("userId",driver.getId())
                    .eq("userType",2).eq("type",1));
            if(userWithdrawals.size()==0){
                return ResultUtil.success("yes");
            }
@@ -439,8 +445,8 @@
        // 查询当前操作电子用户
        // 司机进件信息
        UserWithdrawal userWithdrawal = userWithdrawalService.selectOne(new EntityWrapper<UserWithdrawal>()
                .eq("phone",driver.getPhone())
                .eq("type", 1)
                .eq("userId",driver.getId())
                .eq("type", 1) .eq("userType",2)
                //.eq("applicationStatus","succeeded")
                .last("LIMIT 1"));

@@ -534,7 +540,8 @@
//                    .eq("userId", driverId)
//                    .eq("userType", 2));
            userWithdrawal = userWithdrawalService.selectOne(new EntityWrapper<UserWithdrawal>()
                    .eq("phone", driver.getPhone())
                    .eq("userId",driver.getId())
                    .eq("userType",2)
                    .eq("type", 1)
                    .last("LIMIT 1"));
            if(Objects.isNull(userWithdrawal)){