From 4e45a8252d7bccd23a1a57aa541a2ea521760572 Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期一, 21 十月 2024 15:39:04 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java | 33 +++++++++++++++++++++++++-------- 1 files changed, 25 insertions(+), 8 deletions(-) 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 5befe39..5c44198 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 @@ -6,10 +6,7 @@ import com.doumee.core.model.LoginUserInfo; import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; -import com.doumee.core.utils.Constants; -import com.doumee.core.utils.DESUtil; -import com.doumee.core.utils.DateUtil; -import com.doumee.core.utils.Utils; +import com.doumee.core.utils.*; import com.doumee.dao.business.*; import com.doumee.dao.business.join.ApproveJoinMapper; import com.doumee.dao.business.join.CarUseBookJoinMapper; @@ -24,6 +21,7 @@ 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 com.github.yulichang.wrapper.MPJLambdaWrapper; import io.swagger.annotations.ApiModelProperty; import org.apache.commons.lang3.StringUtils; @@ -36,10 +34,8 @@ import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.time.temporal.ChronoUnit; +import java.util.*; import java.util.Date; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; import java.util.stream.Collectors; /** @@ -75,6 +71,15 @@ private MemberMapper memberMapper; + @Autowired + private SmsConfigMapper smsConfigMapper; + + @Autowired + private SmsEmailMapper smsEmailMapper; + + @Autowired + private EmayService emayService; + @Override @Transactional(rollbackFor = {Exception.class,BusinessException.class}) public Integer create(CarUseBook carUseBook) throws Exception { @@ -107,7 +112,7 @@ carUseBook.setCreateDate(new Date()); carUseBook.setIsdeleted(Constants.ZERO); Cars cars = carsMapper.selectById(carUseBook.getCarId()); - if(Objects.isNull(cars)||!cars.getType().equals(Constants.ONE)){ + if(Objects.isNull(cars)||!cars.getType().equals(Constants.ZERO)){ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"杞﹁締淇℃伅寮傚父"); } carUseBook.setCarCode(cars.getCode()); @@ -186,6 +191,9 @@ .eq(CarUseBook::getId,id) .last("limit 1" ); CarUseBook model = carUseBookMapper.selectJoinOne(CarUseBook.class,queryWrapper); + if(Objects.isNull(model)){ + throw new BusinessException(ResponseStatus.DATA_EMPTY); + } ApproveDataVO approveDataVO = approveService.arrangeApprovedData(id, Constants.equalsInteger(model.getType(),Constants.ZERO)?3:4, memberId); @@ -456,6 +464,15 @@ .in(Approve::getObjType,Constants.approveObjectType.cityUseCar,Constants.approveObjectType.unCityUseCar) .eq(Approve::getObjId,id) ); + Member member = memberMapper.selectById(carUseBook.getMemberId()); + if(Objects.nonNull(member)&&StringUtils.isNotBlank(member.getPhone())){ + //鐢ㄨ溅鐢宠鍙栨秷 + SmsEmailServiceImpl.sendCarUseSms(systemDictDataBiz, + emayService,smsEmailMapper,smsConfigMapper,carUseBookMapper,carUseBook.getId(), + SmsConstants.carUseBookContent.carUseBookCancel, + null, Arrays.asList(member.getPhone().split(",")) + ); + } } -- Gitblit v1.9.3