From 30a8692a3aa23118d7c7c33c6d84327e5e199612 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期六, 22 六月 2024 17:28:45 +0800
Subject: [PATCH] 发送短信开关

---
 project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java |   41 +++++++++++++++++++++++++----------------
 1 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
index c470d09..adf2027 100644
--- a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
+++ b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
@@ -8,13 +8,15 @@
 import com.project.common.core.domain.entity.SysUser;
 import com.project.common.enums.OrderPre;
 import com.project.common.exception.base.BaseException;
-import com.project.common.sms.YPSmsApi;
 import com.project.common.utils.DateUtils;
 import com.project.common.utils.JsonUtils;
 import com.project.common.utils.SecurityUtils;
 import com.project.common.utils.StringUtils;
 import com.project.enforce.domain.*;
-import com.project.enforce.domain.bo.editBo.*;
+import com.project.enforce.domain.bo.editBo.EnforceComplaintLogBo;
+import com.project.enforce.domain.bo.editBo.EnforceOrderBo;
+import com.project.enforce.domain.bo.editBo.OrderComplaintBo;
+import com.project.enforce.domain.bo.editBo.OrderResultBo;
 import com.project.enforce.domain.bo.queryBo.EnforceOrderQueryBo;
 import com.project.enforce.domain.bo.queryBo.OrderCheckedQueryBo;
 import com.project.enforce.domain.vo.EnforceEvaluateVo;
@@ -27,7 +29,6 @@
 import com.project.system.service.ISysUserService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -51,6 +52,24 @@
     private final IEnforceCheckLogService checkLogService;
     private final IEnforceComplaintLogService complaintLogService;
     private final IEnforceEvaluateLogService evaluateLogService;
+    private final YPSmsService smsService;
+
+    @Override//閫氱敤鍒楄〃
+    public List<EnforceOrderVo> queryCommonList(EnforceOrderQueryBo bo)
+    {
+        QueryWrapper<EnforceOrder> qw = getQw(bo);
+        List<EnforceOrder> list = this.list(qw);
+        return Convert.toList(EnforceOrderVo.class , list);
+    }
+
+    @Override//浼佷笟鍒楄〃
+    public List<EnforceOrderVo> queryCompanyList(EnforceOrderQueryBo bo)
+    {
+        QueryWrapper<EnforceOrder> qw = getQw(bo);
+        qw.ge("order_status",2);
+        List<EnforceOrder> list = this.list(qw);
+        return Convert.toList(EnforceOrderVo.class , list);
+    }
 
     @Override//鍒楄〃鏌ヨ
     @DataScope(deptAlias = "apply_dept_id", userAlias = "apply_id")
@@ -156,7 +175,7 @@
         }
         boolean savePeers = peerService.saveOrUpdateBatch(bo.getPeers());
         if (savePeers && StringUtils.isNotEmpty(phones)) {
-            sendApplyMsg(phones, add.getApplyUser());
+            smsService.sendApplyMsg(phones, add.getApplyUser());
         }
         return savePeers;
     }
@@ -301,20 +320,10 @@
     }
 
 
+
+
 //-------------------------------------------------------------------------------------
 
-
-    /**
-     * 鍙戦�佸鎵圭煭淇�
-     * @param phones    鎵嬫満鍙�
-     * @param applyUser 鐢宠浜�
-     */
-    @Async
-    public void sendApplyMsg(List<String> phones, String applyUser)
-    {
-        String applyMsg = StringUtils.format(StringUtils.format(YPSmsApi.APPLY_TMP, applyUser));
-        phones.forEach(phone-> YPSmsApi.sendSms(phone, applyMsg));
-    }
 
     //淇濆瓨鍓嶆牎楠�
     private void validEntityBeforeSave(EnforceOrder entity)

--
Gitblit v1.9.1