From eb275c6d06d3c27fd30bbf4975d27c93d7f56eb2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 10 十二月 2024 18:29:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 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 3502b26..eea3e40 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
@@ -493,7 +493,13 @@
for (int i = 0; i < approveParamList.size(); i++) {
ApproveParam approveParam = approveParamList.get(i);
List<Integer> ids = this.getApproveUserIds(approveParam,createMember);
- List<Member> memberList = memberMapper.selectList(new QueryWrapper<Member>().lambda().in(Member::getId,ids));
+ List<Member> memberList = memberMapper.selectJoinList(Member.class,
+ new MPJLambdaWrapper<Member>()
+ .selectAll(Member.class)
+ .selectAs(SystemUser::getOpenid,Member::getSystemOpenid)
+ .leftJoin(SystemUser.class,SystemUser::getMemberId,Member::getId)
+ .in(Member::getId,ids)
+ );
List<String> memberNameList =memberList.stream().map(m->m.getName()).collect(Collectors.toList());
String memberNames = String.join(",",memberNameList);
Integer noticeType = Constants.approveTypeToNoticeType(approveTempl.getType());
@@ -600,11 +606,11 @@
null,Arrays.asList(member.getPhone().split(","))
);
//鍏紬鍙烽�氱煡
- if(StringUtils.isNotBlank(member.getOpenid())){
+ if(StringUtils.isNotBlank(member.getSystemOpenid())){
wxPlatNotice.sendVisitTemplateNotice(
wxNoticeConfigMapper,visitsMapper.selectById(businessId), WxPlatConstants.visitContent.visitWaitAudit,
token,
- Arrays.asList(member.getOpenid().split(","))
+ Arrays.asList(member.getSystemOpenid().split(","))
);
}
}else if(Constants.equalsInteger(noticeType,Constants.noticesObjectType.visitReporting)){
@@ -615,11 +621,11 @@
null,Arrays.asList(member.getPhone().split(","))
);
//鍏紬鍙烽�氱煡
- if(StringUtils.isNotBlank(member.getOpenid())){
+ if(StringUtils.isNotBlank(member.getSystemOpenid())){
wxPlatNotice.sendVisitTemplateNotice(
wxNoticeConfigMapper,visitsMapper.selectById(businessId), WxPlatConstants.visitReportContent.visitReportWaitAudit,
token,
- Arrays.asList(member.getOpenid().split(","))
+ Arrays.asList(member.getSystemOpenid().split(","))
);
}
}else if(Constants.equalsInteger(noticeType,Constants.noticesObjectType.useCar)){
@@ -630,13 +636,13 @@
null,Arrays.asList(member.getPhone().split(","))
);
//鍏紬鍙烽�氱煡
- if(StringUtils.isNotBlank(member.getOpenid())){
+ if(StringUtils.isNotBlank(member.getSystemOpenid())){
wxPlatNotice.sendCarUseBookTemplateNotice(
wxNoticeConfigMapper,
carUseBookMapper.selectById(businessId),
WxPlatConstants.carUseBookContent.carUseBookWaitAudit,
token,
- Arrays.asList(member.getOpenid().split(",")),
+ Arrays.asList(member.getSystemOpenid().split(",")),
Constants.ONE);
}
}
@@ -1623,8 +1629,8 @@
SmsConstants.visitReportingContent.visitReportingAuditFail,
approveDTO.getCheckInfo(),null
);
- objCode = Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)? WxPlatConstants.visitReportContent.visitReportAuditSuccess:WxPlatConstants.visitReportContent.visitReportAuditFail;
-
+ objCode = Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)?
+ WxPlatConstants.visitReportContent.visitReportAuditSuccess:WxPlatConstants.visitReportContent.visitReportAuditFail;
}else{ //璁垮鐢宠
//鍙戦�佺煭淇￠�氱煡
@@ -1634,17 +1640,17 @@
SmsConstants.visitContent.visitAuditFail,
approveDTO.getCheckInfo(),null
);
- objCode = Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)? WxPlatConstants.visitContent.visitAuditSuccess:WxPlatConstants.visitContent.visitAuditFail;
+ objCode = Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)? WxPlatConstants.visitContent.visitAuditSuccess:
+ WxPlatConstants.visitContent.visitAuditFail;
}
visitsMapper.updateById(visits);
//鍙戦�佸井淇″叕浼楀彿
if(StringUtils.isNotBlank(objCode)){
- Member member = memberMapper.selectById(visits.getCreateMemberId());
- if(Objects.nonNull(member) && StringUtils.isNotBlank(member.getOpenid())){
+ if(Objects.nonNull(visits) && StringUtils.isNotBlank(visits.getOpenid())){
wxPlatNotice.sendVisitTemplateNotice(
wxNoticeConfigMapper,visits, objCode,
systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
- Arrays.asList(member.getOpenid().split(","))
+ Arrays.asList(visits.getOpenid().split(","))
);
}
}
--
Gitblit v1.9.3