Merge remote-tracking branch 'origin/feature-2022.07.29' into feature-2022.07.29

eladmin-system/src/main/java/me/zhengjie/application/admin/service/impl/SmsTemplateServiceImpl.java

@@ -183,8 +183,10 @@ public class SmsTemplateServiceImpl extends AbstractServiceImpl<ISmsTemplateDao,
 	public void remindSignNotarialCertificate(String businessNo) {
 		// 保存发送短信
 		// 查询发送的短信，如果发送过了就不发送
+		//发送短信
 		QueryWrapper<SmsSendLogEntity> log = new QueryWrapper<>();
 		log.eq("business_no", businessNo);
+		log.eq("order_type", 5);
 		long count = sendLogMapper.selectCount(log);
 		if (count == 0) {
 			sendNotary(5, businessNo, "公证书签发");
@@ -234,6 +236,7 @@ public class SmsTemplateServiceImpl extends AbstractServiceImpl<ISmsTemplateDao,
 		log.setUpdateTime(LocalDateTime.now());
 		log.setReturnContent(result);
 		log.setOrderType(orderType);
+		sendLogMapper.insert(log);
 	}
 
 	/**
@@ -246,7 +249,7 @@ public class SmsTemplateServiceImpl extends AbstractServiceImpl<ISmsTemplateDao,
 	private void sendNotary(Integer orderType, String businessNo, String notaryName) {
 		Long templateId = getTemplateId(orderType);
 		if (templateId == null) {
-			log.warn("短信模板不存在或者被停用  {}  ", orderType);
+			log.warn("短信模板不存在或者被停用订单类型  {}  ", orderType);
 			return;
 		}
 		QueryWrapper<ContractOrderEntity> queryWrapper = new QueryWrapper<>();
@@ -271,5 +274,6 @@ public class SmsTemplateServiceImpl extends AbstractServiceImpl<ISmsTemplateDao,
 		log.setUpdateTime(LocalDateTime.now());
 		log.setReturnContent(result);
 		log.setOrderType(orderType);
+		sendLogMapper.insert(log);
 	}
 }