From 1c20c8231980a8d4b91688ff8641a06d3b2f68ab Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 14 十月 2025 16:34:22 +0800
Subject: [PATCH] 改bug
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
index 8cc0ade..e4fcb35 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
@@ -58,6 +58,8 @@
@Autowired
private CarUseBookMapper carUseBookMapper;
+ @Autowired
+ private ApproveMapper approveMapper;
@Autowired
private UserActionMapper userActionMapper;
@@ -163,7 +165,6 @@
wxPlatNotice.sendCarUseBookTemplateNotice(systemDictDataBiz,
wxNoticeConfigMapper,carUseBook,
WxPlatConstants.carUseBookContent.carUseBookUpload,
- systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
Arrays.asList(systemUser.getOpenid().split(",")),0);
}
return carUseBook.getId();
@@ -199,6 +200,11 @@
params[2]=model.getCarCode()+"-銆愪箻杞︿汉锛�"+model.getMemberNames()+" 銆�-銆愰绾︿汉锛�"+model.getMemberName()+"銆�-銆愭椂闂达細"+DateUtil.getPlusTime2(model.getStartTime())+"-"+DateUtil.getPlusTime2(model.getEndTime())+"銆�";
//璁板綍鍒犻櫎鏃ュ織
UserActionServiceImpl.saveUserActionBiz(user,id,Constants.UserActionType.CAR_BOOK_DEL,userActionMapper,date,params, JSONObject.toJSONString(model));
+
+ VisitsServiceImpl.dealCancelNoticesData(noticesJoinMapper,approveMapper,"绯荤粺鍒犻櫎",model.getId(),
+ Constants.equalsInteger(model.getType(),Constants.ZERO)?Constants.approveObjectType.cityUseCar:Constants.approveObjectType.unCityUseCar,
+ Constants.noticesObjectType.useCar
+ );
}
@Override
public void delete(CarUseBook carUseBook) {
@@ -563,7 +569,7 @@
.set(Approve::getStatus,Constants.FOUR)
.set(Approve::getCheckInfo,"鐢ㄨ溅鐢宠鍙栨秷")
.in(Approve::getStatus,Constants.ZERO,Constants.ONE)
- .in(Approve::getObjType,Constants.approveObjectType.cityUseCar,Constants.approveObjectType.unCityUseCar)
+ .in(Approve::getObjType,Constants.approveObjectType.cityUseCar,Constants.approveObjectType.unCityUseCar)
.eq(Approve::getObjId,id)
);
@@ -591,7 +597,6 @@
wxNoticeConfigMapper,
carUseBook,
WxPlatConstants.carUseBookContent.carUseBookCancel,
- systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
Arrays.asList(systemUser.getOpenid().split(",")),
Constants.TWO);
}
@@ -612,19 +617,20 @@
//鐢宠浜哄彲浠ユ挙閿�鑷繁鐢宠涓殑鐢宠璁板綍
return Constants.ONE;
}
- if(Constants.equalsInteger(carUseBook.getStatus(),Constants.TWO) && carUseBook.getStartTime()!=null
+ if(Constants.equalsInteger(carUseBook.getStatus(),Constants.TWO)
+ && carUseBook.getStartTime()!=null
&& System.currentTimeMillis() >= carUseBook.getStartTime().getTime()){
//瀹℃壒閫氳繃锛屼絾鏄� 宸插埌鍙戣溅鏃堕棿锛屼笉鍙互鎾ら攢
return Constants.ZERO;
}
- if(!(Constants.equalsInteger(carUseBook.getStatus(),Constants.ZERO))
+ if((Constants.equalsInteger(carUseBook.getStatus(),Constants.ZERO))
||Constants.equalsInteger(carUseBook.getStatus(),Constants.ONE)
||Constants.equalsInteger(carUseBook.getStatus(),Constants.TWO)){
//瀹℃壒浜哄彲浠ユ挙閿� 鑷繁瀹℃壒鐨勭敵璇疯褰�
Approve approve = approveJoinMapper.selectOne(new QueryWrapper<Approve>().lambda()
.eq(Approve::getIsdeleted,Constants.ZERO)
.ge(Approve::getLevel,Constants.ZERO)
- .eq(Approve::getChekorId,loginUserInfo.getId())
+ .eq(Approve::getChekorId,loginUserInfo.getMemberId())
.eq(Approve::getObjId,carUseBook.getId())
.eq(Approve::getObjType,carUseBook.getType()==0?3:4)
.last("limit 1"));
--
Gitblit v1.9.3