From c9ef2687d3460da668d08d58dee6af468ed6693e Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 05 十一月 2024 11:48:34 +0800 Subject: [PATCH] 最新版本541200007 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java | 42 ++++++++++++++++++++++++++++++++++++------ 1 files changed, 36 insertions(+), 6 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java index c3de7e7..9f757c2 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java @@ -1,7 +1,5 @@ package com.doumee.service.business.impl; -import cn.emay.sdk.util.StringUtil; -import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.A; import com.doumee.biz.system.SystemDictDataBiz; import com.doumee.core.constants.ResponseStatus; import com.doumee.core.exception.BusinessException; @@ -10,13 +8,15 @@ import com.doumee.core.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.dao.business.*; +import com.doumee.dao.business.dao.SmsEmailMapper; import com.doumee.dao.business.join.ApproveJoinMapper; import com.doumee.dao.business.model.*; import com.doumee.dao.business.vo.ApproveDataVO; + import com.doumee.dao.system.join.NoticesJoinMapper; -import com.doumee.dao.web.reqeust.ConfirmTaskDTO; import com.doumee.dao.web.reqeust.PlatformBooksApplyDTO; import com.doumee.dao.web.reqeust.PlatformBooksCheckNumDTO; import com.doumee.dao.web.reqeust.RevokeDTO; @@ -26,8 +26,8 @@ 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.third.EmayService; import org.apache.commons.lang3.StringUtils; -import org.apache.tomcat.util.bcel.Const; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -60,6 +60,9 @@ private PlatformReasonMapper platformReasonMapper; @Autowired + private PlatformGroupMapper platformGroupMapper; + + @Autowired private SystemDictDataBiz systemDictDataBiz; @Autowired @@ -74,6 +77,14 @@ @Autowired private CarsMapper carsMapper; + @Autowired + private SmsConfigMapper smsConfigMapper; + + @Autowired + private SmsEmailMapper smsEmailMapper; + + @Autowired + private EmayService emayService; @Override public Integer create(PlatformBooks platformBooks) { @@ -241,11 +252,21 @@ if(Objects.isNull(platformReason)|| !Constants.equalsInteger(platformReason.getIsdeleted(),Constants.ZERO)){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍏ュ洯鍘熷洜淇℃伅寮傚父,璇峰埛鏂伴噸璇�"); } + PlatformGroup platformGroup= platformGroupMapper.selectById(platformReason.getGroupId()); + if(Objects.isNull(platformGroup)){ + throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌缁戝畾鏈堝彴缁勬暟鎹�"); + } + if(!Constants.equalsInteger(platformGroup.getIsdeleted(),Constants.ZERO)){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"缁戝畾鏈堝彴缁勬暟鎹紓甯革紝璇疯仈绯荤鐞嗗憳"); + } + if(!Constants.checkCarNo(platformBooksApplyDTO.getCarCodeFront())){ + throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇疯緭鍏ユ纭殑杞︾墝!"); + }; //鏌ヨ杞﹁締鏄惁涓鸿嚜鏈夎溅 if(carsMapper.selectCount(new QueryWrapper<Cars>().lambda().eq(Cars::getIsdeleted,Constants.ZERO).eq(Cars::getCode,platformBooksApplyDTO.getCarCodeFront()))>Constants.ZERO){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"["+platformBooksApplyDTO.getCarCodeFront()+"]灞炰簬鍐呴儴杞﹁締锛屾棤娉曢绾�"); }; - ApproveTempl approveTempl = approveTemplMapper.selectById(platformReason.getId()); + ApproveTempl approveTempl = approveTemplMapper.selectById(platformReason.getApproveTemplId()); if(Objects.isNull(approveTempl)){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈厤缃鎵规祦,璇疯仈绯荤鐞嗗憳"); } @@ -262,7 +283,7 @@ platformBooksMapper.insert(platformBooks); //鍒涘缓瀹℃壒娴佷俊鎭� - approveService.createApproveForPlatfrom(platformReason.getApproveTemplId(),platformBooks.getId(),platformBooks.getDriverId()); + approveService.createApproveForPlatfrom(approveTempl.getId(),platformBooks.getId(),platformBooks.getDriverId()); return platformBooks.getId(); } @@ -379,6 +400,15 @@ .eq(Approve::getObjType,Constants.approveObjectType.logisticsCarUse) .eq(Approve::getObjId,revokeDTO.getId()) ); + + //鍙戦�佺煭淇¢�氱煡 + SmsEmailServiceImpl.sendPlatformBookSms(systemDictDataBiz, + emayService,smsEmailMapper,smsConfigMapper,platformBooksMapper,model.getId(), + SmsConstants.platformBookContent.platformBookCancel, + null,null + ); + + } -- Gitblit v1.9.3