From f63d3a3be83fea258e7920efccd2567b6a511bb3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 16 一月 2025 16:52:46 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 65 +++++++++++++++++++++-----------
1 files changed, 42 insertions(+), 23 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 3bf827a..804ad0d 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
@@ -9,8 +9,8 @@
import com.doumee.core.haikang.model.param.request.ParkReservationAddRequest;
import com.doumee.core.haikang.model.param.respose.ParkReservationAddResponse;
import com.doumee.core.haikang.service.HKService;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.SmsConstants;
@@ -19,6 +19,7 @@
import com.doumee.core.wx.wxPlat.WxPlatNotice;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.CompanyMapper;
+import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.dao.SmsConfigMapper;
import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.dto.ApproveDTO;
@@ -27,6 +28,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.business.model.Member;
import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.dto.NoticesDTO;
import com.doumee.dao.system.join.NoticesJoinMapper;
@@ -92,11 +94,9 @@
@Autowired
private CarDriverMapper carDriverMapper;
- @Autowired
- private VisitsMapper visitsMapper;
@Autowired
- private VisitsJoinMapper visitsJoinMapper;
+ private VisitsJoinMapper visitsMapper;
@Autowired
private CarUseBookJoinMapper carUseBookJoinMapper;
@@ -592,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)){
@@ -611,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(","))
@@ -626,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(","))
@@ -646,7 +646,7 @@
SystemUser systemUser = systemUserMapper.selectById(carUseBook.getCreator());
if(Objects.nonNull(systemUser)){
carUseBook.setMemberName(systemUser.getRealname());
- wxPlatNotice.sendCarUseBookTemplateNotice(
+ wxPlatNotice.sendCarUseBookTemplateNotice(systemDictDataBiz,
wxNoticeConfigMapper,
carUseBookMapper.selectById(businessId),
WxPlatConstants.carUseBookContent.carUseBookWaitAudit,
@@ -671,7 +671,7 @@
if(Constants.equalsInteger(noticeType,Constants.noticesObjectType.visit)
|| Constants.equalsInteger(noticeType,Constants.noticesObjectType.visitReporting)){
//璁垮璁板綍涓庤瀹㈡姤澶�
- Visits visits = visitsJoinMapper.selectJoinOne(Visits.class,
+ Visits visits = visitsMapper.selectJoinOne(Visits.class,
new MPJLambdaWrapper<Visits>().selectAll(Visits.class)
.selectAs(Member::getName,Visits::getReceptMemberName)
.selectAs(Company::getName,Visits::getReceptMemberDepartment)
@@ -1434,8 +1434,16 @@
SmsConstants.platformBookContent.platformBookWaitAudit,
approveDTO.getCheckInfo(),memberPhone
);
- //TODO 鍙戦�佷笅绾х殑寰呭鎵圭殑閫氱煡
-
+ //鍏紬鍙烽�氱煡
+ 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)){
@@ -1454,7 +1462,7 @@
if(Objects.nonNull(systemUser)){
carUseBook.setMemberName(systemUser.getRealname());
//鍙戦�佸井淇″叕浼楀彿閫氱煡
- wxPlatNotice.sendCarUseBookTemplateNotice(
+ wxPlatNotice.sendCarUseBookTemplateNotice(systemDictDataBiz,
wxNoticeConfigMapper,carUseBook,
WxPlatConstants.carUseBookContent.carUseBookWaitAudit,
systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
@@ -1480,7 +1488,7 @@
);
//鍏紬鍙烽�氱煡
if(CollectionUtils.isNotEmpty(openIdList)){
- wxPlatNotice.sendVisitTemplateNotice(
+ 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(),
@@ -1724,6 +1732,13 @@
SmsConstants.visitContent.visitAuditFail,
approveDTO.getCheckInfo(),null
);
+ if(Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)){
+ SmsEmailServiceImpl.sendVisitSms(systemDictDataBiz,
+ emayService,smsEmailMapper,smsConfigMapper,visitsMapper,visits.getId(),
+ SmsConstants.visitContent.visitAuditSuccessToVisiter,
+ approveDTO.getCheckInfo(),null
+ );
+ }
objCode = Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)? WxPlatConstants.visitContent.visitAuditSuccess:
WxPlatConstants.visitContent.visitAuditFail;
}
@@ -1731,7 +1746,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(","))
@@ -1757,7 +1772,7 @@
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(),
@@ -1821,14 +1836,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(
- wxNoticeConfigMapper,platformBooks,
+ 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