From 7cdea6d16a8b9f74800792ea412ad8b51c4df7f4 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 22 十月 2024 17:48:38 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 77 ++++++++++++++++++++++++++++++++++----
1 files changed, 69 insertions(+), 8 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
index ad2249f..7d1f53c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
@@ -575,17 +575,39 @@
approve.setType(Constants.ZERO);
approveList.add(approve);
- if(Constants.equalsInteger(approve.getStatus(),Constants.ONE)){
+ if(Constants.equalsInteger(approve.getStatus(),Constants.ONE) && StringUtils.isNotBlank(member.getPhone())){
//鍙戦�佺煭淇￠�氱煡
if(Constants.equalsInteger(noticeType,Constants.noticesObjectType.reason)){
//鐗╂祦杞﹂绾�
SmsEmailServiceImpl.sendPlatformBookSms(systemDictDataBiz,
emayService,smsEmailMapper,smsConfigMapper,platformBooksMapper,businessId,
SmsConstants.platformBookContent.platformBookWaitAudit,
- null,null
+ null,Arrays.asList(member.getPhone().split(","))
+ );
+ }else if(Constants.equalsInteger(noticeType,Constants.noticesObjectType.visit)){
+ //璁垮鐢宠
+ SmsEmailServiceImpl.sendVisitSms(systemDictDataBiz,
+ emayService,smsEmailMapper,smsConfigMapper,visitsMapper,businessId,
+ SmsConstants.visitContent.visitNotice,
+ null,Arrays.asList(member.getPhone().split(","))
+ );
+ }else if(Constants.equalsInteger(noticeType,Constants.noticesObjectType.visitReporting)){
+ //璁垮鎶ュ
+ SmsEmailServiceImpl.sendVisitReportSms(systemDictDataBiz,
+ emayService,smsEmailMapper,smsConfigMapper,visitsMapper,businessId,
+ SmsConstants.visitReportingContent.visitReportingNotice,
+ null,Arrays.asList(member.getPhone().split(","))
+ );
+ }else if(Constants.equalsInteger(noticeType,Constants.noticesObjectType.useCar)){
+ //鐢ㄨ溅鐢宠
+ SmsEmailServiceImpl.sendCarUseSms(systemDictDataBiz,
+ emayService,smsEmailMapper,smsConfigMapper,carUseBookMapper,businessId,
+ SmsConstants.carUseBookContent.carUseBookWaitAudit,
+ null,Arrays.asList(member.getPhone().split(","))
);
}
}
+
}
}
@@ -1143,7 +1165,7 @@
.last(" limit 1")
);
if(Objects.isNull(approve)){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌瀹℃壒鏁版嵁");
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鐢宠宸茶浠栦汉瀹℃壒");
}
if(!approve.getStatus().equals(Constants.ONE)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀹℃壒璁板綍鐘舵�侀敊璇�!");
@@ -1279,9 +1301,8 @@
.eq(Approve::getLevel,(approve.getLevel()+1))
);
//鍙戦�佺煭淇￠�氱煡 涓嬬骇瀹℃壒浜�
-
-
List<String> memberPhone = waitAuditList.stream().filter(i->StringUtils.isNotBlank(i.getMemberPhone())).map(i->i.getMemberPhone()).collect(Collectors.toList());
+ //鐗╂祦杞﹂绾�
if(approveDTO.getObjType().equals(Constants.approveObjectType.reason)){
SmsEmailServiceImpl.sendPlatformBookSms(systemDictDataBiz,
emayService,smsEmailMapper,smsConfigMapper,platformBooksMapper,approveDTO.getObjId(),
@@ -1290,9 +1311,15 @@
);
}
+ else if(approveDTO.getObjType().equals(Constants.approveObjectType.cityUseCar)
+ || approveDTO.getObjType().equals(Constants.approveObjectType.unCityUseCar)){
+ SmsEmailServiceImpl.sendCarUseSms(systemDictDataBiz,
+ emayService,smsEmailMapper,smsConfigMapper,carUseBookMapper,approveDTO.getObjId(),
+ SmsConstants.hiddenDangerContent.hiddenDangerDealUser,
+ approveDTO.getCheckInfo(),memberPhone);
+ }
-
-
+ //璁垮鐢宠/鎶ュ
if(approveDTO.getObjType().equals(Constants.approveObjectType.unConstructionVisit)
||approveDTO.getObjType().equals(Constants.approveObjectType.constructionVisit)
||approveDTO.getObjType().equals(Constants.approveObjectType.visitReporting)) {
@@ -1302,7 +1329,9 @@
visitsMapper.update(null,new UpdateWrapper<Visits>().lambda().set(Visits::getStatus,Constants.ONE).eq(Visits::getId,visits.getId()));
}
}
- }else if(approveDTO.getObjType().equals(Constants.approveObjectType.cityUseCar)||approveDTO.getObjType().equals(
+ }
+
+ if(approveDTO.getObjType().equals(Constants.approveObjectType.cityUseCar)||approveDTO.getObjType().equals(
Constants.approveObjectType.unCityUseCar)){
this.updDriver(approveDTO,approve,false);
}
@@ -1547,11 +1576,42 @@
visits.setStatus(Constants.VisitStatus.xfFail);
}
}
+ //璁垮鎶ュ
+ if(approveDTO.getObjType().equals(Constants.approveObjectType.visitReporting)){
+ //鍙戦�佺煭淇￠�氱煡
+ SmsEmailServiceImpl.sendVisitReportSms(systemDictDataBiz,
+ emayService,smsEmailMapper,smsConfigMapper,visitsMapper,visits.getId(),
+ Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)?SmsConstants.visitReportingContent.visitReportingAuditSuccess:
+ SmsConstants.visitReportingContent.visitReportingAuditFail,
+ approveDTO.getCheckInfo(),null
+ );
+ }else{ //璁垮鐢宠
+ //鍙戦�佺煭淇￠�氱煡
+ SmsEmailServiceImpl.sendVisitSms(systemDictDataBiz,
+ emayService,smsEmailMapper,smsConfigMapper,visitsMapper,visits.getId(),
+ Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)?SmsConstants.visitContent.visitAuditSuccess:
+ SmsConstants.visitContent.visitAuditFail,
+ approveDTO.getCheckInfo(),null
+ );
+ }
visitsMapper.updateById(visits);
}else if(approveDTO.getObjType().equals(Constants.approveObjectType.cityUseCar)||approveDTO.getObjType().equals(
Constants.approveObjectType.unCityUseCar)){
this.updDriver(approveDTO,approve,true);
+ CarUseBook carUseBook = carUseBookJoinMapper.selectById(approveDTO.getObjId());
+ if(Objects.nonNull(carUseBook)){
+ Member member = memberMapper.selectById(carUseBook.getMemberId());
+ if(Objects.nonNull(member)&&StringUtils.isNotBlank(member.getPhone())){
+ SmsEmailServiceImpl.sendCarUseSms(systemDictDataBiz,
+ emayService,smsEmailMapper,smsConfigMapper,carUseBookMapper,approveDTO.getObjId(),
+ Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)?SmsConstants.carUseBookContent.carUseBookAuditSuccess:
+ SmsConstants.carUseBookContent.carUseBookAuditFail,
+ approveDTO.getCheckInfo(),Arrays.asList(member.getPhone().split(","))
+ );
+ }
+ }
+
}else if(approveDTO.getObjType().equals(Constants.approveObjectType.reason)){
//鐗╂祦杞﹂绾�
PlatformBooks platformBooks = platformBooksMapper.selectById(approveDTO.getObjId());
@@ -1561,6 +1621,7 @@
platformBooks.setStatus(approveDTO.getStatus());
platformBooks.setEditDate(new Date());
platformBooks.setEditor(approveDTO.getLoginUserInfo().getMemberId());
+ platformBooksMapper.updateById(platformBooks);
if(Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)){
PlatformReason platformReason = platformReasonMapper.selectById(platformBooks.getReasonId());
if(Objects.isNull(platformReason)){
--
Gitblit v1.9.3