From a2299a6d4a6f99e9c11132138f5d3e9ec68f03ea Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 06 六月 2025 19:19:34 +0800
Subject: [PATCH] 开发更新

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java |   54 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 53 insertions(+), 1 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
index 2edabc8..a50a208 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
@@ -18,6 +18,7 @@
 import com.doumee.dao.system.SystemUserMapper;
 import com.doumee.dao.system.model.SystemUser;
 import com.doumee.service.business.SmsEmailService;
+import com.doumee.service.business.third.EmailService;
 import com.doumee.service.business.third.EmayService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -105,10 +106,11 @@
         String code = Constants.getRandom6Num();
         SmsConfig smsConfig = smsConfigMapper.selectOne(new QueryWrapper<SmsConfig>().lambda().eq(SmsConfig::getObjType,
                 SmsConstants.inventCode).last(" limit 1 "));
+        String comName = systemDictDataBiz.queryByCode(Constants.SMS,Constants.SMS_COMNAME).getCode();
         //寮�鍚煭淇¢�氱煡
         if(Objects.nonNull(smsConfig) || Constants.equalsInteger(smsConfig.getStatus(),Constants.ZERO)){
             if(StringUtils.isNotBlank(smsConfig.getContent())){
-                String content  = smsConfig.getContent().replace("{楠岃瘉鐮亇",code);
+                String content  = comName + smsConfig.getContent().replace("{楠岃瘉鐮亇",code);
                 emayService.sendSingleSms(smsEmail.getPhone(),content);
                 smsEmail.setRemark(code);
                 smsEmail.setIsdeleted(Constants.ZERO);
@@ -579,4 +581,54 @@
         }
     }
 
+
+
+    @Override
+    public Integer sendBillSms(String content,String mobile,Integer billId) {
+        boolean result = true;
+        if(StringUtils.isBlank(mobile)){
+            result = false;
+        }
+        if(result){
+            result = emayService.sendSingleSms(mobile,content);
+        }
+        SmsEmail smsEmail = new SmsEmail();
+        smsEmail.setIsdeleted(Constants.ZERO);
+        smsEmail.setCreateDate(new Date());
+        smsEmail.setStatus(result?Constants.ONE:Constants.TWO);
+        smsEmail.setType(Constants.ZERO);
+        smsEmail.setRemark(result?"鐭俊鍙戦�佹垚鍔�":"鐭俊鍙戦�佸け璐�");
+        smsEmail.setTitle("璐﹀崟鍌垂");
+        smsEmail.setObjId(billId);
+        smsEmail.setObjType(Constants.ONE+"");
+        smsEmail.setContent(content);
+        smsEmailMapper.insert(smsEmail);
+        return smsEmail.getId();
+    }
+
+    @Autowired
+    private EmailService emailService;
+
+    @Override
+    public Integer sendEmail(String email,String content,Integer billId) {
+        boolean result = true;
+        if(StringUtils.isBlank(email)){
+            result = false;
+        }
+        if(result){
+            result=   emailService.sendEmail(email,"璐﹀崟鍌垂",content,null);
+        }
+        SmsEmail smsEmail = new SmsEmail();
+        smsEmail.setRemark(result?"閭欢鍙戦�佹垚鍔�":"閭欢鍙戦�佸け璐�");
+        smsEmail.setIsdeleted(Constants.ZERO);
+        smsEmail.setTitle("璐﹀崟鍌垂");
+        smsEmail.setCreateDate(new Date());
+        smsEmail.setStatus(result?Constants.ONE:Constants.TWO);
+        smsEmail.setType(Constants.ONE);
+        smsEmail.setObjId(billId);
+        smsEmail.setObjType(Constants.TWO+"");
+        smsEmail.setContent(content);
+        smsEmailMapper.insert(smsEmail);
+        return smsEmail.getId();
+    }
 }

--
Gitblit v1.9.3