Merge remote-tracking branch 'origin/master'

k94314517

2024-12-11 23ac7615c09cd6a1f9e6e91875f0b8448a749191

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java

@@ -15,6 +15,7 @@
import com.doumee.dao.business.dao.SmsConfigMapper;
import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.model.vo.ValidPhoneCodeVO;
import com.doumee.service.business.SmsEmailService;
import com.doumee.service.business.third.EmayService;
import org.apache.commons.lang3.StringUtils;
@@ -75,6 +76,10 @@



    @Override
    public     void validPhoneCaptcha(ValidPhoneCodeVO param){
       isCaptcheValide(smsEmailMapper,param.getPhone(),param.getCode());
    }
    @Override
    public Integer create(SmsEmail smsEmail) {
        smsEmailMapper.insert(smsEmail);
@@ -495,6 +500,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);