From 0e079a1e51fc3f30d73bf9c4e5fce5f3f0d6d33f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 05 二月 2025 11:22:41 +0800
Subject: [PATCH] 补充
---
DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
index bd7fff7..98e673b 100644
--- a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
+++ b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
@@ -125,6 +125,8 @@
@Autowired
private IOrderLogisticsService orderLogisticsService;
+ @Autowired
+ private ICompanyService companyService;
@Value("${pushMinistryOfTransport}")
private boolean pushMinistryOfTransport;
@@ -336,7 +338,7 @@
Driver driver = this.selectById(uid);
driver.setName(registeredWarpper.getName());
driver.setSex(registeredWarpper.getSex());
-// driver.setIdCard(registeredWarpper.getIdCard());
+ driver.setIdCard(registeredWarpper.getIdCard());
// String code = registeredWarpper.getPlaceOfEmployment();
// Company query = companyCityService.query(code);
@@ -366,20 +368,20 @@
driver.setFranchiseeId(company.getId());
}
driver.setHeadImgUrl(registeredWarpper.getHeadImgUrl());
-// driver.setIdCardImgUrl1(registeredWarpper.getIdCardImgUrl1());
-// driver.setIdCardImgUrl2(registeredWarpper.getIdCardImgUrl2());
+ driver.setIdCardImgUrl1(registeredWarpper.getIdCardImgUrl1());
+ driver.setIdCardImgUrl2(registeredWarpper.getIdCardImgUrl2());
// driver.setPlaceOfEmployment(registeredWarpper.getPlaceOfEmployment());
-// driver.setDriverAddress(registeredWarpper.getDriverContactAddress());
+ driver.setDriverAddress(registeredWarpper.getDriverContactAddress());
// driver.setDriverContactAddress(registeredWarpper.getDriverContactAddress());
// driver.setDriverContactAddress_(registeredWarpper.getDriverContactAddress_());
driver.setPlaceOfPractice(registeredWarpper.getPlaceOfPractice());
Calendar calendar = Calendar.getInstance();
-// calendar.setTime(registeredWarpper.getGetDriverLicenseDate());
+ calendar.setTime(registeredWarpper.getGetDriverLicenseDate());
Calendar now = Calendar.getInstance();
now.setTime(new Date());
-// driver.setDriverAge(now.get(Calendar.YEAR) - calendar.get(Calendar.YEAR));
-// driver.setDriveCardImgUrl(registeredWarpper.getDriveCardImgUrl());
+ driver.setDriverAge(now.get(Calendar.YEAR) - calendar.get(Calendar.YEAR));
+ driver.setDriveCardImgUrl(registeredWarpper.getDriveCardImgUrl());
// driver.setGetDriverLicenseDate(registeredWarpper.getGetDriverLicenseDate());
// driver.setTaxiAptitudeCard(registeredWarpper.getTaxiAptitudeCard());
// driver.setNetworkCarlssueImg(registeredWarpper.getNetworkCarlssueImg());
@@ -605,8 +607,9 @@
return ResultUtil.error("该车辆正在服务中,请更换其他车辆");
}
}
- List<TUseMoney> tUseMoney = useMoneyMapper.selectList(null);
- if (tUseMoney.get(0).getMoney()>driver.getBalance()){
+// List<TUseMoney> tUseMoney = useMoneyMapper.selectList(null);
+ Company company = companyService.selectById(driver.getCompanyId());
+ if (company.getDriverRestriction()>driver.getBalance()){
pushUtil.expireWork(uid,2);
return new ResultUtil(-1,"您的余额不足，请及时充值!");
}
--
Gitblit v1.7.1