From b3059e1a596b4fb05a708f3c3ac0ff3bc369d06b Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 12 十二月 2024 16:03:27 +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/ApproveServiceImpl.java | 213 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 155 insertions(+), 58 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 eea3e40..642c52d 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
@@ -27,6 +27,7 @@
import com.doumee.dao.business.join.VisitsJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.vo.ApproveDataVO;
+import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.dto.NoticesDTO;
import com.doumee.dao.system.join.NoticesJoinMapper;
import com.doumee.dao.system.model.Notices;
@@ -84,6 +85,9 @@
@Autowired
private CarUseBookMapper carUseBookMapper;
+
+ @Autowired
+ private SystemUserMapper systemUserMapper;
@Autowired
private CarDriverMapper carDriverMapper;
@@ -588,13 +592,13 @@
null,Arrays.asList(member.getPhone().split(","))
);
//鍏紬鍙烽�氱煡
- if(StringUtils.isNotBlank(member.getOpenid())){
- wxPlatNotice.sendPlatformBookTemplateNotice(
+ if(StringUtils.isNotBlank(member.getSystemOpenid())){
+ wxPlatNotice.sendPlatformBookTemplateNotice(systemDictDataBiz,
wxNoticeConfigMapper,
platformBooksMapper.selectById(businessId),
WxPlatConstants.platformBookContent.platformBookWaitAudit,
token,
- Arrays.asList(member.getOpenid().split(",")),
+ Arrays.asList(member.getSystemOpenid().split(",")),
Constants.ONE);
}
}else if(Constants.equalsInteger(noticeType,Constants.noticesObjectType.visit)){
@@ -607,7 +611,7 @@
);
//鍏紬鍙烽�氱煡
if(StringUtils.isNotBlank(member.getSystemOpenid())){
- wxPlatNotice.sendVisitTemplateNotice(
+ wxPlatNotice.sendVisitTemplateNotice(systemDictDataBiz,
wxNoticeConfigMapper,visitsMapper.selectById(businessId), WxPlatConstants.visitContent.visitWaitAudit,
token,
Arrays.asList(member.getSystemOpenid().split(","))
@@ -622,7 +626,7 @@
);
//鍏紬鍙烽�氱煡
if(StringUtils.isNotBlank(member.getSystemOpenid())){
- wxPlatNotice.sendVisitTemplateNotice(
+ wxPlatNotice.sendVisitTemplateNotice(systemDictDataBiz,
wxNoticeConfigMapper,visitsMapper.selectById(businessId), WxPlatConstants.visitReportContent.visitReportWaitAudit,
token,
Arrays.asList(member.getSystemOpenid().split(","))
@@ -637,13 +641,20 @@
);
//鍏紬鍙烽�氱煡
if(StringUtils.isNotBlank(member.getSystemOpenid())){
- wxPlatNotice.sendCarUseBookTemplateNotice(
- wxNoticeConfigMapper,
- carUseBookMapper.selectById(businessId),
- WxPlatConstants.carUseBookContent.carUseBookWaitAudit,
- token,
- Arrays.asList(member.getSystemOpenid().split(",")),
- Constants.ONE);
+ CarUseBook carUseBook = carUseBookMapper.selectById(businessId);
+ if(Objects.nonNull(carUseBook)){
+ SystemUser systemUser = systemUserMapper.selectById(carUseBook.getCreator());
+ if(Objects.nonNull(systemUser)){
+ carUseBook.setMemberName(systemUser.getRealname());
+ wxPlatNotice.sendCarUseBookTemplateNotice(systemDictDataBiz,
+ wxNoticeConfigMapper,
+ carUseBookMapper.selectById(businessId),
+ WxPlatConstants.carUseBookContent.carUseBookWaitAudit,
+ token,
+ Arrays.asList(member.getSystemOpenid().split(",")),
+ Constants.ONE);
+ }
+ }
}
}
}
@@ -1187,6 +1198,7 @@
@Override
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
public void approved(ApproveDTO approveDTO){
+ WxPlatNotice wxPlatNotice = new WxPlatNotice();
if(Objects.isNull(approveDTO)
|| Objects.isNull(approveDTO.getObjId())
|| Objects.isNull(approveDTO.getObjType())
@@ -1326,7 +1338,9 @@
new MPJLambdaWrapper<Approve>()
.selectAll(Approve.class)
.selectAs(Member::getPhone,Approve::getMemberPhone)
+ .selectAs(SystemUser::getOpenid,Approve::getSystemOpenid)
.leftJoin(Member.class,Member::getId,Approve::getChekorId)
+ .leftJoin(SystemUser.class,SystemUser::getMemberId,Member::getId)
.eq(Approve::getStatus,Constants.approveStatus.wait)
.eq(Approve::getObjId,approve.getObjId())
.eq(Approve::getObjType,approve.getObjType())
@@ -1342,41 +1356,17 @@
.eq(Approve::getObjType,approve.getObjType())
.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(),
- SmsConstants.platformBookContent.platformBookWaitAudit,
- approveDTO.getCheckInfo(),memberPhone
- );
- }
+ List<String> openIdList =waitAuditList.stream().filter(i->StringUtils.isNotBlank(i.getSystemOpenid())).map(i->i.getSystemOpenid()).collect(Collectors.toList());
- 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);
- }
+ this.sendNextLvSms(approve,approveDTO,memberPhone,openIdList);
- //璁垮鐢宠/鎶ュ
- if(approveDTO.getObjType().equals(Constants.approveObjectType.unConstructionVisit)
- ||approveDTO.getObjType().equals(Constants.approveObjectType.constructionVisit)
- ||approveDTO.getObjType().equals(Constants.approveObjectType.visitReporting)) {
- Visits visits = visitsMapper.selectById(approve.getObjId());
- if(Objects.nonNull(visits)){
- if(Constants.equalsInteger(visits.getStatus(),Constants.ZERO)){
- visitsMapper.update(null,new UpdateWrapper<Visits>().lambda().set(Visits::getStatus,Constants.ONE).eq(Visits::getId,visits.getId()));
- }
- }
- }
-
- if(approveDTO.getObjType().equals(Constants.approveObjectType.cityUseCar)||approveDTO.getObjType().equals(
- Constants.approveObjectType.unCityUseCar)){
- this.updDriver(approveDTO,approve,false);
- }
+// if(approveDTO.getObjType().equals(Constants.approveObjectType.cityUseCar)||approveDTO.getObjType().equals(
+// Constants.approveObjectType.unCityUseCar)){
+// this.updDriver(approveDTO,approve,false);
+// }
}else if(approve.getApproveType().equals(Constants.ONE)){
//浼氱 涓旂粓瀹�
//鏃犱粬浜哄鎵圭殑鎯呭喌 鍒欎慨鏀规暟鎹姸鎬�
@@ -1385,6 +1375,20 @@
}else{
if(Constants.equalsInteger(approveList.size(),Constants.ZERO)&&Constants.equalsInteger(approve.getIsEndCheck(),Constants.ZERO)){
/**寮�鍚笅涓�绾у埆鐨勬暟鎹负寰呭鏍�**/
+
+ List<Approve> waitAuditList = approveJoinMapper.selectJoinList(Approve.class,
+ new MPJLambdaWrapper<Approve>()
+ .selectAll(Approve.class)
+ .selectAs(Member::getPhone,Approve::getMemberPhone)
+ .selectAs(SystemUser::getOpenid,Approve::getSystemOpenid)
+ .leftJoin(Member.class,Member::getId,Approve::getChekorId)
+ .leftJoin(SystemUser.class,SystemUser::getMemberId,Member::getId)
+ .eq(Approve::getStatus,Constants.approveStatus.wait)
+ .eq(Approve::getObjId,approve.getObjId())
+ .eq(Approve::getObjType,approve.getObjType())
+ .eq(Approve::getLevel,(approve.getLevel()+1)));
+
+
approveJoinMapper.update(null,new UpdateWrapper<Approve>()
.lambda()
.set(Approve::getStatus,Constants.approveStatus.auditIng)
@@ -1395,11 +1399,19 @@
.eq(Approve::getObjType,approve.getObjType())
.eq(Approve::getLevel,(approve.getLevel()+1))
);
+
+
+ //鍙戦�佺煭淇￠�氱煡 涓嬬骇瀹℃壒浜�
+ List<String> memberPhone = waitAuditList.stream().filter(i->StringUtils.isNotBlank(i.getMemberPhone())).map(i->i.getMemberPhone()).collect(Collectors.toList());
+ List<String> openIdList =waitAuditList.stream().filter(i->StringUtils.isNotBlank(i.getSystemOpenid())).map(i->i.getSystemOpenid()).collect(Collectors.toList());
+
+ this.sendNextLvSms(approve,approveDTO,memberPhone,openIdList);
+
}
- if(approveDTO.getObjType().equals(Constants.approveObjectType.cityUseCar)||approveDTO.getObjType().equals(
- Constants.approveObjectType.unCityUseCar)){
- this.updDriver(approveDTO,approve,false);
- }
+// if(approveDTO.getObjType().equals(Constants.approveObjectType.cityUseCar)||approveDTO.getObjType().equals(
+// Constants.approveObjectType.unCityUseCar)){
+// this.updDriver(approveDTO,approve,false);
+// }
}
}
this.passNextNotices(dealBusinessBean,notices,approve,approveList,approveCopyList,approveDTO);
@@ -1409,6 +1421,86 @@
this.dealBusinessData(approveDTO,approve);
}
}
+
+
+
+
+ public void sendNextLvSms(Approve approve ,ApproveDTO approveDTO , List<String> memberPhone ,List<String> openIdList){
+ WxPlatNotice wxPlatNotice = new WxPlatNotice();
+ //鐗╂祦杞﹂绾�
+ if(approveDTO.getObjType().equals(Constants.approveObjectType.reason)){
+ SmsEmailServiceImpl.sendPlatformBookSms(systemDictDataBiz,
+ emayService,smsEmailMapper,smsConfigMapper,platformBooksMapper,approveDTO.getObjId(),
+ SmsConstants.platformBookContent.platformBookWaitAudit,
+ approveDTO.getCheckInfo(),memberPhone
+ );
+ //鍏紬鍙烽�氱煡
+ if(CollectionUtils.isNotEmpty(openIdList)){
+ wxPlatNotice.sendPlatformBookTemplateNotice(systemDictDataBiz,
+ wxNoticeConfigMapper,
+ platformBooksMapper.selectById(approveDTO.getObjId()),
+ WxPlatConstants.platformBookContent.platformBookWaitAudit,
+ systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
+ openIdList,
+ Constants.ONE);
+ }
+
+ } else if(approveDTO.getObjType().equals(Constants.approveObjectType.cityUseCar)
+ || approveDTO.getObjType().equals(Constants.approveObjectType.unCityUseCar)){
+
+ this.updDriver(approveDTO,approve,false);
+
+ SmsEmailServiceImpl.sendCarUseSms(systemDictDataBiz,
+ emayService,smsEmailMapper,smsConfigMapper,carUseBookMapper,approveDTO.getObjId(),
+ SmsConstants.carUseBookContent.carUseBookWaitAudit,
+ approveDTO.getCheckInfo(),memberPhone);
+ //鍙戦�佸叕浼楀彿閫氱煡
+ if(CollectionUtils.isNotEmpty(openIdList)){
+ CarUseBook carUseBook = carUseBookMapper.selectById(approve.getObjId());
+ if(Objects.nonNull(carUseBook)){
+ SystemUser systemUser = systemUserMapper.selectById(carUseBook.getCreator());
+ if(Objects.nonNull(systemUser)){
+ carUseBook.setMemberName(systemUser.getRealname());
+ //鍙戦�佸井淇″叕浼楀彿閫氱煡
+ wxPlatNotice.sendCarUseBookTemplateNotice(systemDictDataBiz,
+ wxNoticeConfigMapper,carUseBook,
+ WxPlatConstants.carUseBookContent.carUseBookWaitAudit,
+ systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
+ openIdList,1);
+ }
+ }
+ }
+ }else
+ //璁垮鐢宠/鎶ュ
+ if(approveDTO.getObjType().equals(Constants.approveObjectType.unConstructionVisit)
+ ||approveDTO.getObjType().equals(Constants.approveObjectType.constructionVisit)
+ ||approveDTO.getObjType().equals(Constants.approveObjectType.visitReporting)) {
+ Visits visits = visitsMapper.selectById(approve.getObjId());
+ if(Objects.nonNull(visits)){
+ if(Constants.equalsInteger(visits.getStatus(),Constants.ZERO)){
+ visitsMapper.update(null,new UpdateWrapper<Visits>().lambda().set(Visits::getStatus,Constants.ONE).eq(Visits::getId,visits.getId()));
+ }
+ SmsEmailServiceImpl.sendVisitSms(systemDictDataBiz,
+ emayService,smsEmailMapper,smsConfigMapper,visitsMapper,approveDTO.getObjId(),
+ approveDTO.getObjType().equals(Constants.approveObjectType.visitReporting)?
+ SmsConstants.visitReportingContent.visitReportingNotice:SmsConstants.visitContent.visitNotice,
+ null,memberPhone
+ );
+ //鍏紬鍙烽�氱煡
+ if(CollectionUtils.isNotEmpty(openIdList)){
+ wxPlatNotice.sendVisitTemplateNotice(systemDictDataBiz,
+ wxNoticeConfigMapper,visitsMapper.selectById(approveDTO.getObjId()),
+ approveDTO.getObjType().equals(Constants.approveObjectType.visitReporting)?WxPlatConstants.visitReportContent.visitReportWaitAudit:WxPlatConstants.visitContent.visitWaitAudit,
+ systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
+ openIdList
+ );
+ }
+
+ }
+ }
+ }
+
+
/**
* 澶勭悊寰呭姙淇℃伅
@@ -1647,7 +1739,7 @@
//鍙戦�佸井淇″叕浼楀彿
if(StringUtils.isNotBlank(objCode)){
if(Objects.nonNull(visits) && StringUtils.isNotBlank(visits.getOpenid())){
- wxPlatNotice.sendVisitTemplateNotice(
+ wxPlatNotice.sendVisitTemplateNotice(systemDictDataBiz,
wxNoticeConfigMapper,visits, objCode,
systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
Arrays.asList(visits.getOpenid().split(","))
@@ -1660,23 +1752,24 @@
this.updDriver(approveDTO,approve,true);
CarUseBook carUseBook = carUseBookJoinMapper.selectById(approveDTO.getObjId());
if(Objects.nonNull(carUseBook)){
- Member member = memberMapper.selectById(carUseBook.getMemberId());
+ SystemUser systemUser = systemUserMapper.selectById(carUseBook.getCreator());
//鍙戦�侀�氱煡鐭伅
- if(Objects.nonNull(member)&&StringUtils.isNotBlank(member.getPhone())){
+ if(Objects.nonNull(systemUser)&&StringUtils.isNotBlank(systemUser.getMobile())){
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(","))
+ approveDTO.getCheckInfo(),Arrays.asList(systemUser.getMobile().split(","))
);
}
- if(StringUtils.isNotBlank(member.getOpenid())){
+ if(Objects.nonNull(systemUser)&&StringUtils.isNotBlank(systemUser.getOpenid())){
+ carUseBook.setMemberName(systemUser.getRealname());
//鍙戦�佸井淇″叕浼楀彿閫氱煡
- wxPlatNotice.sendCarUseBookTemplateNotice(
+ wxPlatNotice.sendCarUseBookTemplateNotice(systemDictDataBiz,
wxNoticeConfigMapper,carUseBook,
Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)?WxPlatConstants.carUseBookContent.carUseBookAuditSuccess: WxPlatConstants.carUseBookContent.carUseBookAuditFail,
systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
- Arrays.asList(member.getOpenid().split(",")),0);
+ Arrays.asList(systemUser.getOpenid().split(",")),0);
}
}
@@ -1736,14 +1829,18 @@
);
//鍙戦�佸井淇″叕浼楀彿娑堟伅
- Member member = memberMapper.selectById(platformBooks.getDriverId() );
- if(Objects.nonNull(member) && StringUtils.isNotBlank(member.getOpenid())){
+ SystemUser driver = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
+ .eq(SystemUser::getDeleted, Constants.ZERO)
+ .eq(SystemUser::getType, Constants.ZERO)
+ .eq(SystemUser::getMobile,platformBooks.getDriverPhone())
+ .last(" limit 1 "));
+ if(Objects.nonNull(driver) && StringUtils.isNotBlank(driver.getOpenid())){
//鍙戦�佸井淇″叕浼楀彿閫氱煡
- wxPlatNotice.sendPlatformBookTemplateNotice(
+ wxPlatNotice.sendPlatformBookTemplateNotice(systemDictDataBiz,
wxNoticeConfigMapper,platformBooks,
Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)?WxPlatConstants.platformBookContent.platformBookAuditSuccess: WxPlatConstants.platformBookContent.platformBookAuditFail,
systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
- Arrays.asList(member.getOpenid().split(",")),0);
+ Arrays.asList(driver.getOpenid().split(",")),0);
}
}else{
--
Gitblit v1.9.3