From 3201bba04baf50d368fbc4ac11658701e97a0a97 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 05 三月 2025 09:59:05 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
index 2612c9a..2c5ced4 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
@@ -131,24 +131,25 @@
}
Date date = new Date();
//鍒犻櫎宸叉巿鏉冧笅鍙戠殑鍖呮湡鎺堟潈
- dealCancelBookBiz(car.getCode(),date);
- Cars model = new Cars();
- model.setEditDate(date);
- model.setEdirot(user.getId());
- model.setId(id);
- model.setIsdeleted(Constants.ONE);
+ dealCancelBookBiz(car.getCode(),date,parkBookJoinMapper);
+// Cars model = new Cars();
+// model.setEditDate(date);
+// model.setEdirot(user.getId());
+// model.setId(id);
+// model.setIsdeleted(Constants.ONE);
carsMapper.update(null,new UpdateWrapper<Cars>().lambda()
- .eq(Cars::getId,model.getId())
+ .eq(Cars::getId,id)
.set(Cars::getStartTime,null)
.set(Cars::getEndTime,null)
+ .set(Cars::getAuthTimeType,null)
.set(Cars::getAuthStatus,Constants.ZERO)
.set(Cars::getIsdeleted,Constants.ONE)
- .set(Cars::getEditDate,model.getEditDate())
- .set(Cars::getEdirot,model.getEdirot())
+ .set(Cars::getEditDate,date)
+ .set(Cars::getEdirot,user.getId())
);
- carsMapper.updateById(model);
+// carsMapper.updateById(model);
}
- public boolean dealCancelBookBiz(String code,Date date){
+ public static boolean dealCancelBookBiz(String code,Date date,ParkBookMapper parkBookJoinMapper){
List<ParkBook> parkBooks = parkBookJoinMapper.selectJoinList(ParkBook.class,new MPJLambdaWrapper<ParkBook>()
.selectAll(ParkBook.class )
@@ -310,7 +311,7 @@
model.setHkStatus(Constants.ZERO);
model.setRemark("");
model.setAuthStatus(Constants.ZERO);
- dealCancelBookBiz(car.getCode(),model.getEditDate());
+ dealCancelBookBiz(car.getCode(),model.getEditDate(),parkBookJoinMapper);
carsMapper.update(null,new UpdateWrapper<Cars>().lambda()
.eq(Cars::getId,model.getId())
.set(Cars::getAuthStatus,Constants.ZERO)
@@ -321,6 +322,7 @@
.set(Cars::getEditDate,model.getEditDate())
.set(Cars::getEdirot,model.getEdirot())
.set(Cars::getMemberId,model.getMemberId())
+ .set(Cars::getAuthTimeType,null)
.set(Cars::getStartTime,null)
.set(Cars::getEndTime,null)
);
--
Gitblit v1.9.3