productDev/dmvisit.git

			@@ -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;

			/**
			@@ -74,6 +70,15 @@
			@Autowired
			private MemberMapper memberMapper;


			@Autowired
			private SmsConfigMapper smsConfigMapper;

			@Autowired
			private SmsEmailMapper smsEmailMapper;

			@Autowired
			private EmayService emayService;

			@Override
			@Transactional(rollbackFor = {Exception.class,BusinessException.class})
			@@ -459,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(","))
			);
			}
			}