Merge branch 'wq' of SH-Arbitrate/Arbitrate-Backend into dev

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java

@@ -1823,33 +1823,47 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
      */
     @Override
     public String sendRoomNoMessage(SendRoomNoMessageVO messageVO) {
-        CaseAffiliate caseAffiliate = caseAffiliateMapper.selectCaseAffiliateByIdentityType(messageVO.getId(), 2);
-        if(null==caseAffiliate){
-            return "被申请人不存在";
+        CaseAffiliate caseAffiliateSelect=new CaseAffiliate();
+        caseAffiliateSelect.setCaseAppliId(messageVO.getId());
+        List<CaseAffiliate> caseAffiliates= caseAffiliateMapper.selectCaseAffiliate(caseAffiliateSelect);
+        if(CollectionUtil.isEmpty(caseAffiliates)){
+            return "申请人、被申请人不存在";
         }
         CaseApplication caseApplication = new CaseApplication();
         caseApplication.setId(messageVO.getId());
         CaseApplication caseApplicationselect = caseApplicationMapper.selectCaseApplication(caseApplication);
+        String returnResult="短信发送成功";
 
         //发送短信通知
         SmsUtils.SendSmsRequest request = new SmsUtils.SendSmsRequest();
         request.setTemplateId("1952136");
-        // 1948332 普通短信 尊敬的{1}用户，您的{2}仲裁案件，开庭审理房间号为{3}，请在微信内打开https://miniapp-3gpama6l759911ef-1321289474.tcloudbaseapp.com/jump-mp.html 请知晓，如非本人操作，请忽略本短信。
-        request.setPhone(caseAffiliate.getContactTelphone());
-        request.setTemplateParamSet(new String[]{caseAffiliate.getName(), caseApplicationselect.getCaseNum(), messageVO.getRoomNo()});
-        if (SmsUtils.sendSms(request)){
-            //保存短信发送记录
-            SmsSendRecord smsSendRecord = new SmsSendRecord();
-            smsSendRecord.setCaseId(messageVO.getId());
-            smsSendRecord.setCaseNum(caseApplicationselect.getCaseNum());
-            smsSendRecord.setPhone(request.getPhone());
-            smsSendRecord.setSendTime(new Date());
-            String content="尊敬的"+caseAffiliate.getName()+"用户，您的"+ caseApplicationselect.getCaseNum()+"仲裁案件，开庭审理房间号为"+ messageVO.getRoomNo()+"，请在微信内打开https://miniapp-3gpama6l759911ef-1321289474.tcloudbaseapp.com/jump-mp.html 请知晓，如非本人操作，请忽略本短信。";
-            smsSendRecord.setSendContent(content);
-            smsSendRecord.setCreateBy(getUsername());
-            smsRecordMapper.saveSmsSendRecord(smsSendRecord);
-        }
-        return "短信发送成功";
+        for (CaseAffiliate caseAffiliate : caseAffiliates) {
+            request.setPhone(caseAffiliate.getContactTelphone());
+            request.setTemplateParamSet(new String[]{caseAffiliate.getName(), caseApplicationselect.getCaseNum(), messageVO.getRoomNo()});
+            // 1948332 普通短信 尊敬的{1}用户，您的{2}仲裁案件，开庭审理房间号为{3}，请在微信内打开https://miniapp-3gpama6l759911ef-1321289474.tcloudbaseapp.com/jump-mp.html 请知晓，如非本人操作，请忽略本短信。
+            if (SmsUtils.sendSms(request)){
+                //保存短信发送记录
+                SmsSendRecord smsSendRecord = new SmsSendRecord();
+                smsSendRecord.setCaseId(messageVO.getId());
+                smsSendRecord.setCaseNum(caseApplicationselect.getCaseNum());
+                smsSendRecord.setPhone(request.getPhone());
+                smsSendRecord.setSendTime(new Date());
+                String content="尊敬的"+caseAffiliate.getName()+"用户，您的"+ caseApplicationselect.getCaseNum()+"仲裁案件，开庭审理房间号为"+ messageVO.getRoomNo()+"，请在微信内打开https://miniapp-3gpama6l759911ef-1321289474.tcloudbaseapp.com/jump-mp.html 请知晓，如非本人操作，请忽略本短信。";
+                smsSendRecord.setSendContent(content);
+                String userName;
+                try {
+                    userName= getUsername();
+                } catch (Exception e) {
+                    userName="admin";
+                }
+                smsSendRecord.setCreateBy(userName);
+                smsRecordMapper.saveSmsSendRecord(smsSendRecord);
+            }else {
+                returnResult= "短信发送失败";
+            }
+        }
+        return returnResult;
+
     }
 
     @Override