From 57909bfeb70e80689cfe515198e3a30ad3868bb8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 07 八月 2024 09:35:28 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java | 33 +++++++++++++++------------------
1 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java
index ec969f8..2df350a 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java
@@ -602,29 +602,26 @@
}
@RequestMapping(value = "/updateAuth")
@ResponseBody
- public Object updateAuth(TCar tCar,String zcModel,@RequestParam String serverBox) {
+ public Object updateAuth(TCar tCar,String zcModel,String xjModel,@RequestParam String serverBox) {
//添加经营业务
if(tCar.getAuthState()==2){
+ //删除业务
+ tCarServiceService.delete(new EntityWrapper<TCarService>().eq("carId",tCar.getId()));
+
+ //添加经营业务
String[] serverArray = serverBox.split(",");
for (int i=0;i<serverArray.length;i++){
- TCarService tCarService = tCarServiceService.selectOne(new EntityWrapper<TCarService>().eq("carId", tCar.getId()).eq("type", Integer.valueOf(serverArray[i])));
- if(null == tCarService){
- tCarService = new TCarService();
- tCarService.setCarId(tCar.getId());
- tCarService.setType(Integer.valueOf(serverArray[i]));
- if (1 == tCarService.getType()){
- tCarService.setServerCarModelId(Integer.valueOf(zcModel));
- }
- tCarServiceService.insert(tCarService);
- }else{
- if (1 == tCarService.getType()){
- tCarService.setServerCarModelId(Integer.valueOf(zcModel));
- }
- tCarServiceService.updateById(tCarService);
+ TCarService service = new TCarService();
+ service.setCarId(tCar.getId());
+ service.setType(Integer.valueOf(serverArray[i]));
+ if (1 == service.getType()){
+ service.setServerCarModelId(Integer.valueOf(zcModel));
+ }else if (4 == service.getType()){
+ service.setServerCarModelId(Integer.valueOf(xjModel));
}
-
-
+ tCarServiceService.insert(service);
}
+
}
tCarService.updateById(tCar);
tCar = tCarService.selectById(tCar.getId());
@@ -656,7 +653,7 @@
if(2 == finalTCar.getAuthState()){
car_audit1_content.text("You vehicle application has been approved. See the I-GO platform for details.");
}else{
- car_audit1_content.text("Sorry, your vehicle application was not approved. The reason for the failure is: incomplete filling of vehicle information.");
+ car_audit1_content.text("We are sorry to inform you that your vehicle application was rejected. Please contact our service for relevant details, call 0577777767 or send e-mail to support@i-go.group");
}
EmailUtil.send(tDriver.getEmail(), 2 == finalTCar.getAuthState() ? "Vehicle is verified and qualified" : "Vehicle is not verified and qualified", document.html());
}catch (Exception e){
--
Gitblit v1.7.1