From e5f748afe45590d4bb9b3f00fd535175d0cde4b9 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 11 十二月 2024 10:05:36 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java | 30 ++++++-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 179 +++++++++++++++++++++++++++++++++-----------
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java | 5 +
server/meeting/meeting_service/src/main/java/com/doumee/dao/business/BookingsMapper.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java | 8 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatConstants.java | 4
7 files changed, 174 insertions(+), 59 deletions(-)
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/BookingsMapper.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/BookingsMapper.java
index 2130b39..5692153 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/BookingsMapper.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/BookingsMapper.java
@@ -37,7 +37,7 @@
" CONCAT(date_format(a.START_TIME,'%H:%i') , ' ~ ',date_format(a.END_TIME,'%H:%i')) as meetingTime, c.REALNAME as bookingUser ," +
//" CASE WHEN a.START_TIME > now() AND a.`STATUS` = 0 THEN 1 WHEN ( (a.END_TIME < now() AND a.`STATUS` = 0 ) or a.`STATUS` = 2 ) THEN 3 WHEN a.`STATUS` = 1 THEN 5 ELSE 2 END meetingStatus ," +
" CASE WHEN a.START_TIME_REAL IS NULL AND a.`STATUS` = 0 THEN 1 " +
-// " WHEN ( (a.END_TIME < now() AND a.`STATUS` = 0 ) or a.`STATUS` = 2 ) THEN 3 " +
+ " WHEN ( (a.END_TIME < now() AND a.`STATUS` = 0 ) or a.`STATUS` = 2 ) THEN 3 " +
"WHEN a.`STATUS` = 1 THEN 5 ELSE 2 END meetingStatus ," +
" b.IMGURL as imgUrl ," +
" a.remark " +
@@ -49,7 +49,7 @@
@Select(" select a.id , a.START_TIME , a.END_TIME , b.id as roomId, b.`NAME` as roomName , a.`NAME` as meetingName ,date_format(a.START_TIME,'%Y骞�%m鏈�%d鏃�') as meetingDate ," +
" CONCAT(date_format(a.START_TIME,'%H:%i') , ' ~ ',date_format(a.END_TIME,'%H:%i')) as meetingTime, c.REALNAME as bookingUserName ," +
//" CASE WHEN a.START_TIME > now() AND a.`STATUS` = 0 THEN 1 WHEN a.END_TIME < now() AND a.`STATUS` = 0 THEN 3 WHEN a.`STATUS` = 1 THEN 5 ELSE 2 END meetingStatus ," +
- " CASE WHEN a.START_TIME_REAL IS NULL AND a.`STATUS` = 0 THEN 1 WHEN a.END_TIME < now() AND a.`STATUS` = 0 THEN 3 WHEN a.`STATUS` = 1 THEN 5 ELSE 2 END meetingStatus ," +
+ " CASE WHEN a.START_TIME_REAL IS NULL AND a.`STATUS` = 0 THEN 1 WHEN ( (a.END_TIME < now() AND a.`STATUS` = 0 ) or a.status = 2 ) THEN 3 WHEN a.`STATUS` = 1 THEN 5 ELSE 2 END meetingStatus ," +
" a.CONTENT as meetingContent, c.MOBILE as bookingUserMobile , e.`NAME` as bookingUserDepartment , a.CREATOR as bookingUserId , a.remark " +
" from meeting_book a inner join meeting_rooms b on a.ROOM_ID = b.ID " +
" left join system_user c on a.CREATOR = c.id " +
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatConstants.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatConstants.java
index c445890..f558446 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatConstants.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatConstants.java
@@ -71,8 +71,10 @@
String carUseBookAuditSuccess = "carUseBookAuditSuccess";
//鐢ㄨ溅鐢宠-瀹℃壒椹冲洖閫氱煡锛堢粰鐢宠浜猴級锛氥��
String carUseBookAuditFail = "carUseBookAuditFail";
- //鐢ㄨ溅鐢宠-瀹℃壒椹冲洖閫氱煡锛堢粰鐢宠浜猴級锛氥��
+ //鐢ㄨ溅鐢宠-寰呭鎵癸紙缁欑敵璇蜂汉锛夛細銆�
String carUseBookWaitAudit = "carUseBookWaitAudit";
+ //鐢ㄨ溅鐢宠-寰呭鎵癸紙缁欑敵璇蜂汉锛夛細銆�
+ String carUseBookCancel = "carUseBookCancel";
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java
index 4f6a7b5..a42e117 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java
@@ -272,7 +272,7 @@
List<String> openIds,Integer sendType){
try {
if(CollectionUtils.isNotEmpty(openIds)){
- WxNoticeConfig wxNoticeConfig = wxNoticeConfigMapper.selectOne(new QueryWrapper<WxNoticeConfig>().lambda().eq(WxNoticeConfig::getObjType,WxPlatConstants.visit)
+ WxNoticeConfig wxNoticeConfig = wxNoticeConfigMapper.selectOne(new QueryWrapper<WxNoticeConfig>().lambda().eq(WxNoticeConfig::getObjType,WxPlatConstants.carUse)
.eq(WxNoticeConfig::getObjCode,objCode)
.eq(WxNoticeConfig::getStatus, Constants.ZERO)
.last(" limit 1")
@@ -289,7 +289,7 @@
Map<String, Object> thing3 = new HashMap<String,Object>();
if(Constants.equalsInteger(sendType,Constants.ONE)){
thing3.put("value","鐢宠寰呮偍瀹℃壒");
- }else{
+ }else if(Constants.equalsInteger(sendType,Constants.ZERO)){
if(Constants.equalsInteger(carUseBook.getStatus(),Constants.ZERO)){
thing3.put("value","鐢宠鎻愪氦鎴愬姛寰呭鏍�");
}else if(Constants.equalsInteger(carUseBook.getStatus(),Constants.TWO)){
@@ -297,6 +297,8 @@
}else{
thing3.put("value","鐢宠宸茶椹冲洖");
}
+ }else{
+ thing3.put("value","鐢宠宸茶鍙栨秷");
}
//鐢宠浜�
Map<String, Object> thing1 = new HashMap<String,Object>();
@@ -315,10 +317,10 @@
dataMap.put("thing1",thing1);
dataMap.put("thing11",thing11);
dataMap.put("time14",time14);
- paramMap.put("template_id", wxNoticeConfig.getTempId());
paramMap.put("data", dataMap);
for (String openId:openIds) {
paramMap.clear();
+ paramMap.put("template_id", wxNoticeConfig.getTempId());
paramMap.put("touser", openId);
paramMap.put("data", dataMap);
String response = HttpsUtil.postJson(postUrL, JSONObject.toJSONString(paramMap));
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java
index 1836078..7fdb6dd 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java
@@ -147,6 +147,11 @@
private String companyName;
+ @ApiModelProperty(value = "openid", example = "1")
+ @ExcelColumn(name="openid")
+ @TableField(exist = false)
+ private String systemOpenid;
+
@ApiModelProperty(value = "寰呭鎵硅褰�", example = "1")
@TableField(exist = false)
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..3bf827a 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;
@@ -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(
+ 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,78 @@
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
+ );
+ //TODO 鍙戦�佷笅绾х殑寰呭鎵圭殑閫氱煡
+
+
+ } 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(
+ 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(
+ 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
+ );
+ }
+
+ }
+ }
+ }
+
+
/**
* 澶勭悊寰呭姙淇℃伅
@@ -1660,23 +1744,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(
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);
}
}
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 b881fa4..70a2761 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
@@ -18,9 +18,11 @@
import com.doumee.dao.business.vo.ApproveDataVO;
import com.doumee.dao.business.vo.DateIntervalVO;
+import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.join.NoticesJoinMapper;
import com.doumee.dao.system.model.Notices;
import com.doumee.dao.system.model.SystemDictData;
+import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.ApproveService;
import com.doumee.service.business.CarUseBookService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -89,6 +91,9 @@
@Autowired
private WxNoticeConfigMapper wxNoticeConfigMapper;
+ @Autowired
+ private SystemUserMapper systemUserMapper;
+
@Override
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
public Integer create(CarUseBook carUseBook) throws Exception {
@@ -145,13 +150,14 @@
//鍙戦�佸井淇″叕浼楀彿閫氱煡
//鍙戦�佸井淇″叕浼楀彿閫氱煡
WxPlatNotice wxPlatNotice = new WxPlatNotice();
- Member member = memberMapper.selectById(carUseBook.getMemberId());
- if(Objects.nonNull(member) && StringUtils.isNotBlank(member.getOpenid())){
+ SystemUser systemUser = systemUserMapper.selectById(carUseBook.getCreator());
+ if(Objects.nonNull(systemUser) && StringUtils.isNotBlank(systemUser.getOpenid())){
+ carUseBook.setMemberName(systemUser.getRealname());
wxPlatNotice.sendCarUseBookTemplateNotice(
wxNoticeConfigMapper,carUseBook,
WxPlatConstants.carUseBookContent.carUseBookUpload,
systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
- Arrays.asList(member.getOpenid().split(",")),0);
+ Arrays.asList(systemUser.getOpenid().split(",")),0);
}
return carUseBook.getId();
@@ -505,14 +511,26 @@
);
- Member member = memberMapper.selectById(carUseBook.getMemberId());
- if(Objects.nonNull(member)&&StringUtils.isNotBlank(member.getPhone())){
+ SystemUser systemUser = systemUserMapper.selectById(carUseBook.getCreator());
+ if(Objects.nonNull(systemUser)&&StringUtils.isNotBlank(systemUser.getMobile())){
//鐢ㄨ溅鐢宠鍙栨秷
SmsEmailServiceImpl.sendCarUseSms(systemDictDataBiz,
emayService,smsEmailMapper,smsConfigMapper,carUseBookMapper,carUseBook.getId(),
SmsConstants.carUseBookContent.carUseBookCancel,
- null, Arrays.asList(member.getPhone().split(","))
+ info, Arrays.asList(systemUser.getMobile().split(","))
);
+ if(StringUtils.isNotBlank(systemUser.getOpenid())){
+ carUseBook.setMemberName(systemUser.getRealname());
+ WxPlatNotice wxPlatNotice = new WxPlatNotice();
+ wxPlatNotice.sendCarUseBookTemplateNotice(
+ wxNoticeConfigMapper,
+ carUseBook,
+ WxPlatConstants.carUseBookContent.carUseBookCancel,
+ systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
+ Arrays.asList(systemUser.getOpenid().split(",")),
+ Constants.TWO);
+ }
+
}
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
index ab15d31..a35a1b2 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
@@ -495,6 +495,9 @@
content = content.replace("{鎻愪氦鐨勫嚭鍙戞椂闂磢",DateUtil.getFomartDate(carUseBook.getStartTime(),"yyyy-MM-dd HH:mm"));
}else if(objCode.equals(SmsConstants.carUseBookContent.carUseBookAuditFail) || objCode.equals(SmsConstants.carUseBookContent.carUseBookCancel)){
//鎮ㄧ殑銆愮敤杞︾敵璇枫�戝凡琚┏鍥烇紝椹冲洖鍘熷洜涓猴細{椹冲洖鍘熷洜}銆傚鏈夌枒闂紝璇疯仈绯绘淳杞﹀憳銆�
+ if(StringUtils.isBlank(msg)){
+ msg = "鍏朵粬鍘熷洜";
+ }
content = content.replace("{椹冲洖鍘熷洜}",msg);
//鎮ㄧ殑銆愮敤杞︾敵璇枫�戝凡琚彇娑堬紝鍙栨秷鍘熷洜涓猴細{鍙栨秷鍘熷洜}銆傚鏈夌枒闂紝璇疯仈绯绘淳杞﹀憳銆�
content = content.replace("{鍙栨秷鍘熷洜}",msg);
--
Gitblit v1.9.3