DriverJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/AccountController.java
@@ -105,8 +105,8 @@ // 获取当前用户的开户用户号cusId // TODO 司机进件信息 UserWithdrawal userWithdrawal = userWithdrawalService.selectOne(new EntityWrapper<UserWithdrawal>() .eq("phone",driver.getPhone()) .eq("status", true).eq("type", 1) .eq("userId",driver.getId()) .eq("userType",2).eq("type",1) .last("LIMIT 1")); // 创建电子账簿 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)){ DriverJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/CallbackController.java
@@ -247,7 +247,8 @@ System.out.println("查询平台开户信息==============="+enterpriseWithdrawal); // TODO 司机进件信息 UserWithdrawal driverWith = userWithdrawalService.selectOne(new EntityWrapper<UserWithdrawal>() .eq("phone", driver.getPhone()) .eq("userId",driver.getId()) .eq("userType",2).eq("type",1) .last("LIMIT 1")); // DepositReq depositReq = new DepositReq(); // depositReq.setOutOrderNo(ToolUtil.getRandomString(32)); DriverJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/OrderCrossCityController.java
@@ -481,7 +481,8 @@ .eq("companyId", company.getId())); // 替换为公司id System.out.println("查询平台开户信息==============="+enterpriseWithdrawal); UserWithdrawal driverWith = userWithdrawalService.selectOne(new EntityWrapper<UserWithdrawal>() .eq("phone", driver.getPhone()) .eq("userId",driver.getId()) .eq("userType",2).eq("type",1) .last("LIMIT 1")); // DepositReq depositReq = new DepositReq(); // depositReq.setOutOrderNo(ToolUtil.getRandomString(32)); DriverJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
@@ -433,7 +433,8 @@ } // TODO 司机进件信息 UserWithdrawal driverWith = 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(driverWith)){ throw new RuntimeException("司机开户信息为空"); DriverJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java
@@ -285,7 +285,8 @@ System.out.println("查询平台开户信息==============="+enterpriseWithdrawal); // TODO 司机进件信息 UserWithdrawal driverWith = userWithdrawalService.selectOne(new EntityWrapper<UserWithdrawal>() .eq("phone", driver.getPhone()) .eq("userId",driver.getId()) .eq("userType",2).eq("type",1) .last("LIMIT 1")); try { AllocationReq allocationReq = new AllocationReq(); DriverJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/WithdrawalServiceImpl.java
@@ -280,7 +280,8 @@ Driver driver = driverService.selectById(withdrawal.getUserId()); if (Objects.nonNull(driver)) { UserWithdrawal userWithdrawal = userWithdrawalService.selectOne(new EntityWrapper<UserWithdrawal>() .eq("phone", driver.getPhone()).eq("type", 1).last("limit 1")); .eq("userId",driver.getId()) .eq("userType",2).eq("type",1).last("limit 1")); System.out.println("分账定时查询：" + map.toString()); if ("00000000".equals(map.get("resp_code")) && "S".equals(map.get("trans_stat").toString())) { String txReqSeqId = RequestSeqUtil.generate("TX");
