From 1c20c8231980a8d4b91688ff8641a06d3b2f68ab Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 14 十月 2025 16:34:22 +0800
Subject: [PATCH] 改bug
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 597 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 463 insertions(+), 134 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 7b9f344..b352a5e 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
@@ -6,21 +6,30 @@
import com.doumee.core.exception.BusinessException;
import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.haikang.model.param.BaseResponse;
-import com.doumee.core.haikang.model.param.request.CarChargeAddRequest;
+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;
import com.doumee.core.utils.Utils;
+import com.doumee.core.wx.wxPlat.WxPlatConstants;
+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;
import com.doumee.dao.business.join.ApproveJoinMapper;
import com.doumee.dao.business.join.CarUseBookJoinMapper;
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;
import com.doumee.dao.system.model.Notices;
@@ -31,19 +40,13 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.doumee.service.business.impl.hksync.HkSyncParkServiceImpl;
-import com.doumee.service.business.impl.hksync.fhk.HkSyncVehicleFromHKServiceImpl;
-import com.doumee.service.system.NoticesService;
+import com.doumee.service.business.third.EmayService;
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import io.swagger.models.auth.In;
-import javafx.application.Platform;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
-import org.apache.xpath.operations.Bool;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -67,6 +70,8 @@
@Autowired
private SystemDictDataBiz systemDictDataBiz;
+ @Autowired
+ private WxNoticeConfigMapper wxNoticeConfigMapper;
@Autowired
private ApproveTemplMapper approveTemplMapper;
@@ -82,15 +87,16 @@
@Autowired
private CarUseBookMapper carUseBookMapper;
+
+ @Autowired
+ private SystemUserMapper systemUserMapper;
@Autowired
private CarDriverMapper carDriverMapper;
- @Autowired
- private VisitsMapper visitsMapper;
@Autowired
- private VisitsJoinMapper visitsJoinMapper;
+ private VisitsJoinMapper visitsMapper;
@Autowired
private CarUseBookJoinMapper carUseBookJoinMapper;
@@ -104,32 +110,34 @@
private PlatformLogMapper platformLogMapper;
@Autowired
private PlatformReasonMapper platformReasonMapper;
-
-
+ @Autowired
+ private PlatformGroupMapper platformGroupMapper;
@Autowired
private ParksMapper parksMapper;
-
@Autowired
private ParkBookMapper parkBookMapper;
-
-
+ @Autowired
+ private VisitParkMapper visitParkMapper;
+ @Autowired
+ private SmsConfigMapper smsConfigMapper;
+ @Autowired
+ private SmsEmailMapper smsEmailMapper;
+ @Autowired
+ private EmayService emayService;
@Override
public Integer create(Approve approve) {
approveMapper.insert(approve);
return approve.getId();
}
-
@Override
public void deleteById(Integer id) {
approveMapper.deleteById(id);
}
-
@Override
public void delete(Approve approve) {
UpdateWrapper<Approve> deleteWrapper = new UpdateWrapper<>(approve);
approveMapper.delete(deleteWrapper);
}
-
@Override
public void deleteByIdInBatch(List<Integer> ids) {
if (CollectionUtils.isEmpty(ids)) {
@@ -274,14 +282,17 @@
if(CollectionUtils.isNotEmpty(noticesList)){
//寰呮垜澶勭悊鐨勬暟鎹�
internalHomeVO.setNoticeWaitNum(
- noticesList.stream().filter(i->Constants.equalsInteger(i.getUserId(),memberId)
+ noticesList.stream().filter(i->
+ Constants.equalsInteger(i.getUserId(),memberId)
&&Constants.equalsInteger(i.getStatus(),Constants.ZERO)
&&Constants.equalsInteger(i.getSendacopy(),Constants.ZERO)
+ &&StringUtils.equals(i.getParam2(),"0")
).count()
);
//宸插鐞嗘暟鎹�
internalHomeVO.setNoticeDealNum(
- noticesList.stream().filter(i->Constants.equalsInteger(i.getUserId(),memberId)
+ noticesList.stream().filter(i->
+ Constants.equalsInteger(i.getUserId(),memberId)
&&StringUtils.equals(i.getParam4(),i.getUserId().toString())
&&Constants.equalsInteger(i.getStatus(),Constants.ONE)
&&Constants.equalsInteger(i.getSendacopy(),Constants.ZERO)
@@ -295,6 +306,7 @@
internalHomeVO.setNoticeCopyNum(
noticesList.stream().filter(i->Constants.equalsInteger(i.getUserId(),memberId)
&&Constants.equalsInteger(i.getSendacopy(),Constants.ONE)
+ &&Constants.equalsInteger(i.getReaded(),Constants.ZERO)
).count()
);
}
@@ -324,6 +336,7 @@
noticesList.stream().filter(i->Constants.equalsInteger(i.getUserId(),noticesDTO.getMemberId())
&&Constants.equalsInteger(i.getStatus(),Constants.ZERO)
&&Constants.equalsInteger(i.getSendacopy(),Constants.ZERO)
+ &&StringUtils.equals(i.getParam2(),"0")
).count()
);
internalHomeVO.setNoticeDealNum(
@@ -340,6 +353,7 @@
internalHomeVO.setNoticeCopyNum(
noticesList.stream().filter(i->Constants.equalsInteger(i.getUserId(),noticesDTO.getMemberId())
&&Constants.equalsInteger(i.getSendacopy(),Constants.ONE)
+ &&Constants.equalsInteger(i.getReaded(),Constants.ZERO)
).count()
);
}
@@ -352,10 +366,11 @@
* @param tempType 妯℃澘绫诲瀷 0闈炴柦宸ヤ汉鍛樿瀹㈢敵璇� 1鏂藉伐浜哄憳璁垮鐢宠 2璁垮鎶ュ 3鍏溅甯傚唴鐢ㄨ溅 4鍏溅瀹ゅ鐢ㄨ溅 5甯傚叕鍙哥墿娴佽溅棰勭害
* @param businessId 涓氬姟涓婚敭 鏍规嵁 tempType
* @param createMemberId 鎻愪氦娴佺▼浜哄憳
+ * @param applyMember 鐢宠浜哄璞★紙濡傛灉涓虹┖锛岄粯璁や负鎻愪氦浜猴級
*/
@Override
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
- public void createApproveFlow(Integer tempType,Integer businessId,Integer createMemberId){
+ public void createApproveFlow(Integer tempType,Integer businessId,Integer createMemberId,Member applyMember){
//鏌ヨ澶勭悊妯℃澘
ApproveTempl approveTempl = approveTemplMapper.selectOne(new QueryWrapper<ApproveTempl>().lambda()
.eq(ApproveTempl::getType,tempType)
@@ -382,18 +397,15 @@
}
List<ApproveParam> approveCopyList = approveParamAllList.stream().filter(i->i.getType().equals(Constants.ONE)).collect(Collectors.toList());
- Member createMember = memberMapper.selectById(createMemberId);
+ Member createMember = memberMapper.selectById(createMemberId);
if(Objects.isNull(createMember)|| Objects.isNull(createMember.getCompanyId())){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鐢宠浜虹粍缁囦俊鎭紓甯�");
}
List<Approve> approveList = new ArrayList<>();
-
- this.organizeApproveData(approveTempl,approveParamList,createMember,businessId,approveList);
-
+ this.organizeApproveData(approveTempl,approveParamList,createMember,applyMember,businessId,approveList);
if(CollectionUtils.isEmpty(approveList)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀹℃壒娴侀厤缃敊璇�");
}
-
//澶勭悊鎶勯�佹暟鎹�
if(CollectionUtils.isNotEmpty(approveCopyList)){
this.organizeApproveCopyData(approveTempl,approveCopyList,businessId,approveList);
@@ -405,7 +417,7 @@
@Override
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
- public void createApproveForPlatfrom(Integer tempId,Integer businessId,Integer createMemberId){
+ public void createApproveForPlatfrom(Integer tempId,Integer businessId,Integer createMemberId ){
//鏌ヨ澶勭悊妯℃澘
ApproveTempl approveTempl = approveTemplMapper.selectById(tempId);
if(Objects.isNull(approveTempl)){
@@ -434,7 +446,7 @@
}
List<Approve> approveList = new ArrayList<>();
- this.organizeApproveData(approveTempl,approveParamList,createMember,businessId,approveList);
+ this.organizeApproveData(approveTempl,approveParamList,createMember,null,businessId,approveList);
if(CollectionUtils.isEmpty(approveList)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀹℃壒娴侀厤缃敊璇�");
@@ -445,7 +457,6 @@
this.organizeApproveCopyData(approveTempl,approveCopyList,businessId,approveList);
}
approveJoinMapper.insert(approveList);
-
}
@@ -457,15 +468,18 @@
* @param businessId
* @param approveList
*/
- public void organizeApproveData(ApproveTempl approveTempl,List<ApproveParam> approveParamList,Member createMember,Integer businessId,List<Approve> approveList){
+ public void organizeApproveData(ApproveTempl approveTempl,List<ApproveParam> approveParamList,Member createMember,Member applyMember,Integer businessId,List<Approve> approveList){
+ if(applyMember ==null){
+ applyMember = createMember;
+ }
//鍒涘缓榛樿浜轰俊鎭�
Approve createUserApprove = new Approve();
createUserApprove.setRemark("鍙戣捣鐢宠");
createUserApprove.setCreateDate(new Date());
createUserApprove.setIsdeleted(Constants.ZERO);
createUserApprove.setTemplatId(approveTempl.getId());
- createUserApprove.setChekorId(createMember.getId());
+ createUserApprove.setChekorId(applyMember.getId());
createUserApprove.setCheckDate(createUserApprove.getCreateDate());
createUserApprove.setStatus(Constants.approveStatus.pass);
createUserApprove.setTitle("鍙戣捣鐢宠");
@@ -481,12 +495,18 @@
approveList.add(createUserApprove);
//鏌ヨ鎵�鏈夊緟澶勭悊浜�
-
+// String token = systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode();
//瀹℃壒涓氬姟鏁版嵁
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());
@@ -501,22 +521,25 @@
title = this.createNoticesData(noticeType,businessId,title,jsonMap);
}
if(j==0){
- //榛樿鐢熸垚涓�鏉� 鐢宠浜虹殑鏁版嵁 鏍囪鍒犻櫎鐘舵�佺敤浜庡鐞嗗埌 浠诲姟涓績锛堟垜鍙戣捣锛変娇鐢�
- Notices notices = new Notices();
- notices.setCreateDate(new Date());
- notices.setIsdeleted(Constants.ONE);
- notices.setObjId(businessId);
- notices.setObjType(noticeType);
- notices.setType(noticeType);
- notices.setTitle(title);
- notices.setParam1(JSONObject.toJSONString(jsonMap));
- notices.setStatus(Constants.ZERO);
- notices.setReaded(Constants.ZERO);
- notices.setSendacopy(Constants.ZERO);
- notices.setParam2("0");
- notices.setParam3(createMember.getId().toString());
- notices.setInfo("澶勭悊涓�");
- noticesJoinMapper.insert(notices);
+ //璁垮浜哄憳涓嶇敓鎴愭璁板綍
+ if(!(Constants.equalsInteger(noticeType,Constants.noticesObjectType.visit)&&Constants.equalsInteger(applyMember.getType(),Constants.ONE))){
+ //榛樿鐢熸垚涓�鏉� 鐢宠浜虹殑鏁版嵁 鏍囪鍒犻櫎鐘舵�佺敤浜庡鐞嗗埌 浠诲姟涓績锛堟垜鍙戣捣锛変娇鐢�
+ Notices notices = new Notices();
+ notices.setCreateDate(new Date());
+ notices.setIsdeleted(Constants.ONE);
+ notices.setObjId(businessId);
+ notices.setObjType(noticeType);
+ notices.setType(noticeType);
+ notices.setTitle(title);
+ notices.setParam1(JSONObject.toJSONString(jsonMap));
+ notices.setStatus(Constants.ZERO);
+ notices.setReaded(Constants.ZERO);
+ notices.setSendacopy(Constants.ZERO);
+ notices.setParam2("0");
+ notices.setParam3(createMember.getId().toString());
+ notices.setInfo("澶勭悊涓�");
+ noticesJoinMapper.insert(notices);
+ }
}
if(CollectionUtils.isEmpty(memberList)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌瀹℃壒浜轰俊鎭�");
@@ -552,7 +575,7 @@
approve.setTemplatId(approveTempl.getId());
approve.setChekorId(memberId);
approve.setStatus(i==0?Constants.ONE:Constants.ZERO);
- approve.setStatusInfo(i==0?"瀹℃壒涓�":"澶勭悊涓�");
+ approve.setStatusInfo(i==0?"瀹℃壒涓�":"寰呭鐞�");
approve.setTitle(StringUtils.isBlank(approveParam.getRemark())?"瀹℃壒涓�":approveParam.getRemark());
approve.setIsEndCheck((i+1) == approveParamList.size()?Constants.ONE:Constants.ZERO);
approve.setObjId(businessId);
@@ -563,6 +586,82 @@
approve.setAddrParam(approveParam.getAddrParam());
approve.setType(Constants.ZERO);
approveList.add(approve);
+
+ WxPlatNotice wxPlatNotice = new WxPlatNotice();
+ 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,Arrays.asList(member.getPhone().split(","))
+ );
+ //鍏紬鍙烽�氱煡
+ if(StringUtils.isNotBlank(member.getSystemOpenid())){
+ wxPlatNotice.sendPlatformBookTemplateNotice(systemDictDataBiz,
+ wxNoticeConfigMapper,
+ platformBooksMapper.selectById(businessId),
+ WxPlatConstants.platformBookContent.platformBookWaitAudit,
+ Arrays.asList(member.getSystemOpenid().split(",")),
+ Constants.ONE);
+ }
+ }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(","))
+ );
+ //鍏紬鍙烽�氱煡
+ if(StringUtils.isNotBlank(member.getSystemOpenid())){
+ wxPlatNotice.sendVisitTemplateNotice(systemDictDataBiz,
+ wxNoticeConfigMapper,visitsMapper.selectById(businessId), WxPlatConstants.visitContent.visitWaitAudit,
+ Arrays.asList(member.getSystemOpenid().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(","))
+ );
+ //鍏紬鍙烽�氱煡
+ if(StringUtils.isNotBlank(member.getSystemOpenid())){
+ wxPlatNotice.sendVisitTemplateNotice(systemDictDataBiz,
+ wxNoticeConfigMapper,visitsMapper.selectById(businessId), WxPlatConstants.visitReportContent.visitReportWaitAudit,
+ Arrays.asList(member.getSystemOpenid().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(","))
+ );
+ //鍏紬鍙烽�氱煡
+ if(StringUtils.isNotBlank(member.getSystemOpenid())){
+ 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,
+ Arrays.asList(member.getSystemOpenid().split(",")),
+ Constants.ONE);
+ }
+ }
+ }
+ }
+ }
+
+
}
}
}
@@ -574,7 +673,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)
@@ -622,13 +721,23 @@
if(Objects.isNull(platformBooks)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌涓氬姟鏁版嵁淇℃伅");
}
- title = "[鐗╂祦杞﹀叆鍥绾鐢宠浜�-" + platformBooks.getDriverName();
- jsonMap.put("inType", "鍏ュ簱绫诲瀷锛�"+(Constants.equalsInteger(platformBooks.getInType(),Constants.ZERO)?"鏁存墭鐩�":"浠剁儫"));
- jsonMap.put("totalNum", "鎬昏繍杈撻噺锛�"+platformBooks.getTotalNum()+"涓囨敮");
- jsonMap.put("arriveDate", "鍒板満鏃堕棿锛�" + DateUtil.DateToStr(platformBooks.getArriveDate() , "yyyy-MM-dd HH:mm"));
- jsonMap.put("carNum", "杞︾墝鐓э細"+platformBooks.getCarCodeFront());
+ title = ApproveServiceImpl.creatPlatformBookNotice(platformBooks,jsonMap);
+// title = "[鐗╂祦杞﹀叆鍥绾鐢宠浜�-" + platformBooks.getDriverName();
+// jsonMap.put("inType", "鍏ュ簱绫诲瀷锛�"+(Constants.equalsInteger(platformBooks.getInType(),Constants.ZERO)?"鏁存墭鐩�":"浠剁儫"));
+// jsonMap.put("totalNum", "鎬昏繍杈撻噺锛�"+platformBooks.getTotalNum()+"涓囨敮");
+// jsonMap.put("arriveDate", "鍒板満鏃堕棿锛�" + DateUtil.DateToStr(platformBooks.getArriveDate() , "yyyy-MM-dd HH:mm"));
+// jsonMap.put("carNum", "杞︾墝鐓э細"+platformBooks.getCarCodeFront());
}
return title;
+ }
+
+ public static String creatPlatformBookNotice(PlatformBooks platformBooks,Map<String,Object> jsonMap){
+ jsonMap.put("inType", "浣滀笟绫诲瀷锛�"+(Constants.equalsInteger(platformBooks.getInType(),Constants.ZERO)?"鏁存墭鐩�":"浠剁儫"));
+ jsonMap.put("totalNum", "鎬昏繍杈撻噺锛�"+platformBooks.getTotalNum()+"涓囨敮");
+ jsonMap.put("arriveDate", "鍒板満鏃堕棿锛�" + DateUtil.DateToStr(platformBooks.getArriveDate() , "yyyy-MM-dd HH:mm"));
+ jsonMap.put("carNum", "杞︾墝鐓э細"+platformBooks.getCarCodeFront());
+ return "[鐗╂祦杞﹀叆鍥绾鐢宠浜�-" + platformBooks.getDriverName() ;
+
}
@@ -742,6 +851,9 @@
* @param objLevel 鏌ヨ绾у埆
*/
public Company getAuditCompanyHead(Integer companyId, Integer objLevel){
+ if(Objects.isNull(objLevel)||Objects.isNull(companyId)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀹℃壒娴侀厤缃紓甯革紝璇疯仈绯荤鐞嗗憳");
+ }
Company auditCompany = companyMapper.selectById(companyId);
Integer queryLevel = Constants.ONE;
while(queryLevel<objLevel){
@@ -870,11 +982,11 @@
if(Constants.equalsInteger(level.getStatus(),Constants.approveStatus.pass)){
waitModel.setStatus(level.getStatus());
waitModel.setType(Constants.ONE);
- waitModel.setTitle("瀹℃壒浜猴紙鎶勯�佹垨绛惧鎵逛汉锛�");
+ waitModel.setCheckDate(level.getCheckDate());
+ waitModel.setTitle(StringUtils.defaultString(level.getTitle(),"瀹℃壒浜�"));
}else{
waitModel.setStatus(level.getStatus());
waitModel.setType(Constants.ZERO);
- //waitModel.setStatusInfo(passList.size()<=0?StringUtils.defaultString(level.getTitle(),"瀹℃壒浜�"):"鎶勯�佹垨绛惧鎵逛汉");
waitModel.setTitle(passList.size()<=0?StringUtils.defaultString(level.getTitle(),"瀹℃壒浜�"):"鎶勯�佹垨绛惧鎵逛汉");
}
@@ -1098,6 +1210,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())
@@ -1105,8 +1218,10 @@
|| Objects.isNull(approveDTO.getLoginUserInfo())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
- if(approveDTO.getStatus().equals(Constants.THREE)&&StringUtils.isBlank(approveDTO.getCheckInfo())){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇疯緭鍏ユ嫆缁濊鏄�");
+ if(!(Constants.equalsInteger(approveDTO.getObjType(),Constants.THREE)||Constants.equalsInteger(approveDTO.getObjType(),Constants.FOUR))){
+ if(approveDTO.getStatus().equals(Constants.THREE)&&StringUtils.isBlank(approveDTO.getCheckInfo())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇疯緭鍏ユ嫆缁濊鏄�");
+ }
}
Approve approve = approveMapper.selectOne(new QueryWrapper<Approve>()
.lambda()
@@ -1118,7 +1233,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(),"瀹℃壒璁板綍鐘舵�侀敊璇�!");
@@ -1203,7 +1318,7 @@
.set(Notices::getInfo,"宸叉嫆缁�")
.eq(Notices::getObjId,notices.getObjId())
.eq(Notices::getObjType,notices.getObjType())
- .eq(Notices::getReaded,Constants.ZERO)
+// .eq(Notices::getReaded,Constants.ZERO)
.ne(Notices::getId,notices.getId())
);
}
@@ -1232,6 +1347,19 @@
.in(Approve::getId,approveList.stream().map(m->m.getId()).collect(Collectors.toList())));
}
/**寮�鍚笅涓�绾у埆鐨勬暟鎹负寰呭鏍�**/
+
+ 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)
@@ -1242,21 +1370,17 @@
.eq(Approve::getObjType,approve.getObjType())
.eq(Approve::getLevel,(approve.getLevel()+1))
);
- 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()));
- }
- }
+ //鍙戦�佺煭淇￠�氱煡 涓嬬骇瀹℃壒浜�
+ 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());
- }else if(approveDTO.getObjType().equals(Constants.approveObjectType.cityUseCar)||approveDTO.getObjType().equals(
- Constants.approveObjectType.unCityUseCar)){
- this.updDriver(approveDTO,approve,false);
- }
+ this.sendNextLvSms(approve,approveDTO,memberPhone,openIdList);
+
+// 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)){
//浼氱 涓旂粓瀹�
//鏃犱粬浜哄鎵圭殑鎯呭喌 鍒欎慨鏀规暟鎹姸鎬�
@@ -1265,6 +1389,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)
@@ -1275,11 +1413,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);
@@ -1289,6 +1435,83 @@
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,
+ 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,
+ 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,
+ openIdList
+ );
+ }
+
+ }
+ }
+ }
+
+
/**
* 澶勭悊寰呭姙淇℃伅
@@ -1430,6 +1653,7 @@
public void dealBusinessData(ApproveDTO approveDTO,Approve approve){
+ WxPlatNotice wxPlatNotice = new WxPlatNotice();
if(approveDTO.getObjType().equals(Constants.approveObjectType.unConstructionVisit)
||approveDTO.getObjType().equals(Constants.approveObjectType.constructionVisit)
||approveDTO.getObjType().equals(Constants.approveObjectType.visitReporting)){
@@ -1442,62 +1666,129 @@
visits.setEditDate(new Date());
visits.setEditor(approveDTO.getLoginUserInfo().getMemberId());
//涓嬪彂璁垮鎶ュ杞﹁締淇℃伅
-
- if(approveDTO.getObjType().equals(Constants.approveObjectType.visitReporting)){
+ if(Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)&&approveDTO.getObjType().equals(Constants.approveObjectType.visitReporting)){
Boolean sendStatus = true;
//鏌ヨ褰撳墠鍚敤鐨勫仠杞﹀満
List<Parks> parksList = parksMapper.selectList(new QueryWrapper<Parks>()
.lambda()
.isNotNull(Parks::getHkId)
.eq(Parks::getIsdeleted,Constants.ZERO));
- List<ParkBook> parkBookList = new ArrayList<>();
+ List<VisitPark> parkBookList = new ArrayList<>();
if(CollectionUtils.isNotEmpty(parksList)){
for (Parks parks:parksList) {
- ParkBook parkBook = new ParkBook();
- parkBook.setIsdeleted(Constants.ZERO);
- parkBook.setCreateDate(new Date());
- parkBook.setVisitId(visits.getId());
- parkBook.setCarCode(visits.getCarNos());
- parkBook.setParkId(parks.getId());
- parkBook.setOrigin(Constants.TWO);
- parkBook.setStartTime(visits.getStarttime());
- parkBook.setEndTime(visits.getEndtime());
- parkBook.setMemberId( visits.getMemberId());
- parkBook.setTimeType(Constants.ONE);
- parkBook.setParkHkId(parks.getHkId());
+ VisitPark visitPark = new VisitPark();
+ visitPark.setIsdeleted(Constants.ZERO);
+ visitPark.setCreateDate(new Date());
+ visitPark.setVisitApplyId(visits.getId().toString());
+ visitPark.setCarCode(visits.getCarNos());
+ visitPark.setParkId(parks.getId().toString());
+ visitPark.setStartTime(visits.getStarttime());
+ visitPark.setEndTime(visits.getEndtime());
+ visitPark.setParkHkId(parks.getHkId());
+ visitPark.setObjType(Constants.ZERO);
- CarChargeAddRequest param = new CarChargeAddRequest();
- param.setPlateNo(parkBook.getCarCode());
- param.setParkSyscode(parkBook.getParkHkId());
- param.setStartTime(Objects.isNull(parkBook.getStartTime())?DateUtil.getDate(new Date(),"yyyy-MM-dd"):DateUtil.getShortTimeToNull(parkBook.getStartTime()));
- param.setEndTime(Objects.isNull(parkBook.getEndTime())?"2999-12-31":DateUtil.getShortTimeToNull(parkBook.getEndTime()));
- BaseResponse response = HKService.carChargeAddtion(param);
- parkBook.setHkDate(new Date());
+ ParkReservationAddRequest request = new ParkReservationAddRequest();
+ request.setPlateNo(visitPark.getCarCode());
+ request.setParkSyscode(visitPark.getParkHkId());
+ request.setPhoneNo(visits.getPhone());
+ request.setOwner(visits.getName());
+ request.setAllowTimes(Constants.ONE+"");
+ request.setIsCharge(Constants.ONE+"");
+ request.setStartTime(Objects.isNull(visitPark.getStartTime())?DateUtil.getISO8601Timestamp2(new Date()):DateUtil.getISO8601Timestamp2(visitPark.getStartTime()));
+ request.setEndTime(Objects.isNull(visitPark.getEndTime())?"2999-12-31T00:00:00+08:00":DateUtil.getISO8601Timestamp2(visitPark.getEndTime()));
+ BaseResponse response = HKService.parkReservationAddition(request);
+
+ visitPark.setHkDate(new Date());
if(response!=null
&& StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){
- parkBook.setHkStatus(Constants.ONE);
- parkBook.setRemark("鍖呮湡鎴愬姛");
+ ParkReservationAddResponse parkReservationAddResponse = (ParkReservationAddResponse) response.getData();
+ visitPark.setHkId(parkReservationAddResponse.getReserveOrderNo());
+ visitPark.setHkStatus(Constants.ONE);
+ visitPark.setRemark("鍖呮湡鎴愬姛");
}else{
- parkBook.setHkStatus(Constants.TWO);
- parkBook.setRemark("鍖呮湡澶辫触~");
+ visitPark.setHkStatus(Constants.TWO);
+ visitPark.setRemark("鍖呮湡澶辫触~");
//涓嬪彂澶辫触 鏍囪涓讳笟鍔＄姸鎬佷负涓嬪彂澶辫触
sendStatus = false;
}
- parkBookList.add(parkBook);
+ parkBookList.add(visitPark);
+
}
- parkBookMapper.insert(parkBookList);
+ visitParkMapper.insert(parkBookList);
}
if(sendStatus){
- visits.setStatus(Constants.VisitStatus.xfFail);
- }else{
visits.setStatus(Constants.VisitStatus.xfSuccess);
+ }else{
+ visits.setStatus(Constants.VisitStatus.xfFail);
+ }
+ }
+ //璁垮鎶ュ
+ String objCode = "";
+ 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
+ );
+ objCode = Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)?
+ WxPlatConstants.visitReportContent.visitReportAuditSuccess:WxPlatConstants.visitReportContent.visitReportAuditFail;
+
+ }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
+ );
+ 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;
+ }
+ visitsMapper.updateById(visits);
+ //鍙戦�佸井淇″叕浼楀彿
+ if(StringUtils.isNotBlank(objCode)){
+ if(Objects.nonNull(visits) && StringUtils.isNotBlank(visits.getOpenid())){
+ wxPlatNotice.sendVisitTemplateNotice(systemDictDataBiz,
+ wxNoticeConfigMapper,visits, objCode,
+ Arrays.asList(visits.getOpenid().split(","))
+ );
}
}
- 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)){
+ SystemUser systemUser = systemUserMapper.selectById(carUseBook.getCreator());
+ //鍙戦�侀�氱煡鐭伅
+ 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(systemUser.getMobile().split(","))
+ );
+ }
+ if(Objects.nonNull(systemUser)&&StringUtils.isNotBlank(systemUser.getOpenid())){
+ carUseBook.setMemberName(systemUser.getRealname());
+ //鍙戦�佸井淇″叕浼楀彿閫氱煡
+ wxPlatNotice.sendCarUseBookTemplateNotice(systemDictDataBiz,
+ wxNoticeConfigMapper,carUseBook,
+ Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)?WxPlatConstants.carUseBookContent.carUseBookAuditSuccess: WxPlatConstants.carUseBookContent.carUseBookAuditFail,
+ Arrays.asList(systemUser.getOpenid().split(",")),0);
+ }
+ }
+
}else if(approveDTO.getObjType().equals(Constants.approveObjectType.reason)){
//鐗╂祦杞﹂绾�
PlatformBooks platformBooks = platformBooksMapper.selectById(approveDTO.getObjId());
@@ -1507,27 +1798,65 @@
platformBooks.setStatus(approveDTO.getStatus());
platformBooks.setEditDate(new Date());
platformBooks.setEditor(approveDTO.getLoginUserInfo().getMemberId());
- PlatformReason platformReason = platformReasonMapper.selectById(platformBooks.getReasonId());
-
- //鐢熸垚浠诲姟璁板綍
- PlatformJob platformJob = platformBooks.toPlatformJob();
- platformJob.setPlatformGroupId(platformReason.getGroupId().intValue());
- platformJob.setType(Constants.platformJobType.sgscxh);
- platformJob.setStatus(Constants.PlatformJobStatus.WART_SIGN_IN.getKey());
- platformJobMapper.insert(platformJob);
- platformBooks.setJobId(platformJob.getId());
platformBooksMapper.updateById(platformBooks);
- //鐢熸垚浠诲姟鎿嶄綔璁板綍
- PlatformLog platformLog = new PlatformLog();
- platformLog.setCreateDate(new Date());
- platformLog.setJobId(platformJob.getId());
- platformLog.setIsdeleted(Constants.ZERO);
- platformLog.setParam4(platformJob.getCarCodeFront());
- platformLog.setContent(Constants.PlatformJobLogType.CREATE.getInfo());
- platformLog.setObjType(Constants.PlatformJobLogType.CREATE.getKey());
- platformLog.setObjId(platformJob.getId().toString());
- platformLog.setAfterContent(JSONObject.toJSONString(platformJob));
- platformLogMapper.insert(platformLog);
+ if(Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)){
+ PlatformReason platformReason = platformReasonMapper.selectById(platformBooks.getReasonId());
+ if(Objects.isNull(platformReason)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鍏ュ洯鍘熷洜鏁版嵁");
+ }
+ PlatformGroup platformGroup = platformGroupMapper.selectById(platformReason.getGroupId());
+ if(Objects.isNull(platformGroup)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鍏ュ洯鍘熷洜閰嶇疆鏈堝彴缁勬暟鎹�");
+ }
+
+ //鐢熸垚浠诲姟璁板綍
+ PlatformJob platformJob = platformBooks.toPlatformJob();
+ platformJob.setId(null);
+ platformJob.setPlatformGroupId(platformReason.getGroupId().intValue());
+ if(Constants.equalsInteger(platformGroup.getType(),Constants.ZERO)){
+ platformJob.setType(Constants.platformJobType.wxcxh);
+ }else if(Constants.equalsInteger(platformGroup.getType(),Constants.ONE)){
+ platformJob.setType(Constants.platformJobType.wxczh);
+ }else{
+ platformJob.setType(Constants.platformJobType.sgscxh);
+ }
+ platformJob.setStatus(Constants.PlatformJobStatus.WART_SIGN_IN.getKey());
+ platformJobMapper.insert(platformJob);
+ platformBooks.setJobId(platformJob.getId());
+ platformBooksMapper.updateById(platformBooks);
+ //鐢熸垚浠诲姟鎿嶄綔璁板綍
+ PlatformLog platformLog = new PlatformLog();
+ platformLog.setCreateDate(new Date());
+ platformLog.setJobId(platformJob.getId());
+ platformLog.setIsdeleted(Constants.ZERO);
+ platformLog.setParam4(platformJob.getCarCodeFront());
+ platformLog.setContent(Constants.PlatformJobLogType.CREATE.getInfo());
+ platformLog.setObjType(Constants.PlatformJobLogType.CREATE.getKey());
+ platformLog.setObjId(platformJob.getId().toString());
+ platformLog.setAfterContent(JSONObject.toJSONString(platformJob));
+ platformLogMapper.insert(platformLog);
+ }
+ //鍙戦�佺煭淇￠�氱煡
+ SmsEmailServiceImpl.sendPlatformBookSms(systemDictDataBiz,
+ emayService,smsEmailMapper,smsConfigMapper,platformBooksMapper,platformBooks.getId(),
+ Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)?SmsConstants.platformBookContent.platformBookAuditSuccess:
+ SmsConstants.platformBookContent.platformBookAuditFail,
+ approveDTO.getCheckInfo(),null
+ );
+
+ //鍙戦�佸井淇″叕浼楀彿娑堟伅
+ 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(systemDictDataBiz,
+ wxNoticeConfigMapper, platformBooks,
+ Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)?WxPlatConstants.platformBookContent.platformBookAuditSuccess: WxPlatConstants.platformBookContent.platformBookAuditFail,
+ Arrays.asList(driver.getOpenid().split(",")),0);
+ }
}else{
throw new BusinessException(ResponseStatus.BAD_REQUEST);
@@ -1563,7 +1892,7 @@
if(approveDTO.getStatus()==Constants.TWO&&Constants.equalsInteger(approve.getDriverParam(),Constants.ONE)){
CarDriver carDriver = carDriverMapper.selectOne(new QueryWrapper<CarDriver>().lambda()
.eq(CarDriver::getIsdeleted,Constants.ZERO)
- .eq(CarDriver::getStatus,Constants.ZERO)
+// .eq(CarDriver::getStatus,Constants.ZERO)
.eq(CarDriver::getMemberId,approveDTO.getDriverId()));
if(Objects.isNull(carDriver)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌鍙告満淇℃伅");
--
Gitblit v1.9.3