更改短信新增发送记录

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

@@ -5,7 +5,6 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 
 
-
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
@@ -104,6 +103,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
      * 5.仲裁委（部门长）：可以查看所有的案件
      * 6.法律顾问秘书：可以属于多个机构，可以查看相关机构的所有案件
      * 7.超级管理员：可以查看所有的信息和数据
+     *
      * @param caseApplication
      * @return
      */
@@ -169,6 +169,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
         }
 
     }
+
     @Override
     public ToDoCount selectToDoCount() {
 
@@ -223,8 +224,6 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
         }
 
 
-
-
         // 根据条件查询申请人，被申请人，仲裁员，法律顾问案件
         return caseApplicationMapper.selectTodoCountByRole(caseApplication);
     }
@@ -712,7 +711,6 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
         return caseLogRecords;
 
 
-
     }
 
     private CaseLogRecord getInCasenode(Integer caseStatus) {
@@ -800,11 +798,13 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
         }
         return caseLogRecord;
     }
+
     @Override
     public List<CaseApplication> selectCaseApplicationList(CaseApplication caseApplication) {
         return caseApplicationMapper.selectAdminCaseApplicationList(caseApplication);
 
     }
+
     @Override
     @Transactional
     public int insertcaseApplication(CaseApplication caseApplication) {
@@ -883,6 +883,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
 
     /**
      * 获取自动编码
+     *
      * @return
      */
 
@@ -978,6 +979,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
 
     /**
      * 组装申请代理人信息
+     *
      * @param caseAffiliate
      */
     private String buildAgentInfo(CaseAffiliate caseAffiliate, Long roleId) {
@@ -1011,7 +1013,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
                     request.setTemplateId("1956159");
                     request.setPhone(agentUser.getPhonenumber());
                     request.setTemplateParamSet(new String[]{agentUser.getNickName()});
-                    if (SmsUtils.sendSms(request)){
+                    Boolean aBoolean = SmsUtils.sendSms(request);
                     //保存短信发送记录
                     SmsSendRecord smsSendRecord = new SmsSendRecord();
                     smsSendRecord.setCaseId(caseAffiliate.getCaseAppliId());
@@ -1024,9 +1026,12 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
                     String content = "尊敬的" + agentUser.getNickName() + ",您的代理的案件已接入仲裁系统，复制访问https://miniapp-3gpama6l759911ef-1321289474.tcloudbaseapp.com/jump-mp.html 进入小程序进行认证注册。如非本人操作，请忽略本短信";
                     smsSendRecord.setSendContent(content);
                     smsSendRecord.setCreateBy(getUsername());
+                    if (aBoolean) {
                         smsSendRecord.setSendStatus(1);
-                        smsRecordMapper.saveSmsSendRecord(smsSendRecord);
+                    } else {
+                        smsSendRecord.setSendStatus(0);
                     }
+                    smsRecordMapper.saveSmsSendRecord(smsSendRecord);
                 }
             } else if (null != agentUser.getDeptId() && !String.valueOf(agentUser.getDeptId()).equals(caseAffiliate.getApplicationOrganId())) {
 //                return "该申请代理人已在"+agentUser.getDeptName()+"申请机构下存在，请检查填写信息是否正确";
@@ -1060,6 +1065,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
 
     /**
      * 新增角色为申请人
+     *
      * @param agentUser
      * @param roleId
      */
@@ -1151,9 +1157,11 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
                     if (StrUtil.isNotEmpty(caseAffiliateselect.getName()) && deptMap.containsKey(caseAffiliateselect.getName())) {
                         caseAffiliateselect.setName(deptMap.get(caseAffiliateselect.getName()));
                     }
-                    applicantName.append(caseAffiliateselect.getName()).append(",");;
+                    applicantName.append(caseAffiliateselect.getName()).append(",");
+                    ;
                 } else if (identityType == 2) {
-                    respondentName.append(caseAffiliateselect.getName()).append(",");;
+                    respondentName.append(caseAffiliateselect.getName()).append(",");
+                    ;
                 }
             }
             caseApplicationselect.setApplicantName(applicantName.toString());
@@ -1265,7 +1273,6 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
             }
 
 
-
         } else {
             throw new ServiceException("导入立案申请数据不能为空！");
         }
@@ -1275,6 +1282,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
 
     /**
      * 导入校验
+     *
      * @param caseApplication
      * @param
      */
@@ -1295,6 +1303,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
 
     /**
      * 校验被申请人代理信息
+     *
      * @param caseApplication
      * @param failureMsg
      */
@@ -1324,6 +1333,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
 
     /**
      * 校验被申请人信息
+     *
      * @param caseApplication
      * @param failureMsg
      */
@@ -1374,6 +1384,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
 
     /**
      * 校验申请人代理信息
+     *
      * @param caseApplication
      * @param failureMsg
      */
@@ -1401,8 +1412,10 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
             failureMsg.append("【申请人主体信息-代理人联系地址】字段超出指定长度，最大长度为50；");
         }
     }
+
     /**
      * 校验代理人与组织机构关系
+     *
      * @param caseApplication
      * @param failureMsg
      * @return
@@ -1429,8 +1442,10 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
 
         }
     }
+
     /**
      * 校验申请人主题信息
+     *
      * @param caseApplication
      * @param failureMsg
      */
@@ -1469,6 +1484,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
 
     /**
      * 校验基本字段
+     *
      * @param caseApplication
      * @param failureMsg
      */
@@ -1829,6 +1845,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
 
     /**
      * 给被申请人发送房间号短信
+     *
      * @param messageVO
      * @return
      */
@@ -1844,7 +1861,6 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
         caseApplication.setId(messageVO.getId());
         CaseApplication caseApplicationselect = caseApplicationMapper.selectCaseApplication(caseApplication);
         String returnResult = "短信发送成功";
-
         //发送短信通知
         SmsUtils.SendSmsRequest request = new SmsUtils.SendSmsRequest();
         request.setTemplateId("1952136");
@@ -1852,7 +1868,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
             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)){
+            Boolean aBoolean = SmsUtils.sendSms(request);
             //保存短信发送记录
             SmsSendRecord smsSendRecord = new SmsSendRecord();
             smsSendRecord.setCaseId(messageVO.getId());
@@ -1861,7 +1877,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
             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.setSendStatus(1);
+
             String userName;
             try {
                 userName = getUsername();
@@ -1869,13 +1885,14 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
                 userName = "admin";
             }
             smsSendRecord.setCreateBy(userName);
-                smsRecordMapper.saveSmsSendRecord(smsSendRecord);
+            if (aBoolean) {
+                smsSendRecord.setSendStatus(1);
             } else {
-                returnResult= "短信发送失败";
+                smsSendRecord.setSendStatus(0);
             }
+            smsRecordMapper.saveSmsSendRecord(smsSendRecord);
         }
         return returnResult;
-
     }
 
     @Override
@@ -2122,7 +2139,6 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
     }
 
 
-
     @Override
     @Transactional
     public int pendTralSure(CaseApplication caseApplication) {
@@ -2162,6 +2178,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
 
     /**
      * 发送开庭日期通知短信
+     *
      * @param caseApplication
      * @param request
      */
@@ -2189,7 +2206,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
                     // 1947342 普通短信 开庭日期通知 尊敬的{1}用户，您的{2}仲裁案件，开庭日期已确定为{3}，请知晓，如非本人操作，请忽略本短信。
                     String name = user.getNickName();
                     request.setTemplateParamSet(new String[]{name, caseNum, hearDatestr});
-                    if (SmsUtils.sendSms(request)){
+                    Boolean aBoolean = SmsUtils.sendSms(request);
                     //保存短信发送记录
                     SmsSendRecord smsSendRecord = new SmsSendRecord();
                     smsSendRecord.setCaseId(caseApplicationselect.getId());
@@ -2204,11 +2221,13 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
                         content = "尊敬的" + name + "用户，您的" + caseNum + "仲裁案件，开庭日期已改为" + hearDatestr + "，请知晓，如非本人操作，请忽略本短信。";
                     }
                     smsSendRecord.setSendContent(content);
-                        smsSendRecord.setSendStatus(1);
                     smsSendRecord.setCreateBy(getUsername());
-                        smsRecordMapper.saveSmsSendRecord(smsSendRecord);
+                    if (aBoolean) {
+                        smsSendRecord.setSendStatus(1);
+                    } else {
+                        smsSendRecord.setSendStatus(0);
                     }
-
+                    smsRecordMapper.saveSmsSendRecord(smsSendRecord);
                 }
             }
 
@@ -2231,7 +2250,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
                 // 1947342 普通短信 开庭日期通知 尊敬的{1}用户，您的{2}仲裁案件，开庭日期已确定为{3}，请知晓，如非本人操作，请忽略本短信。
                 String name = caseAffiliateselect.getName();
                 request.setTemplateParamSet(new String[]{name, caseNum, hearDatestr});
-                if (SmsUtils.sendSms(request)){
+                Boolean aBoolean = SmsUtils.sendSms(request);
                 //保存短信发送记录
                 SmsSendRecord smsSendRecord = new SmsSendRecord();
                 smsSendRecord.setCaseId(caseApplication.getId());
@@ -2241,9 +2260,12 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
                 String content = "尊敬的" + name + "用户，您的" + caseNum + "仲裁案件，开庭日期已确定为" + hearDatestr + "，请知晓，如非本人操作，请忽略本短信。";
                 smsSendRecord.setSendContent(content);
                 smsSendRecord.setCreateBy(getUsername());
+                if (aBoolean) {
                     smsSendRecord.setSendStatus(1);
-                    smsRecordMapper.saveSmsSendRecord(smsSendRecord);
+                } else {
+                    smsSendRecord.setSendStatus(0);
                 }
+                smsRecordMapper.saveSmsSendRecord(smsSendRecord);
             }
         }
     }
@@ -2280,7 +2302,6 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
     }
 
 
-
     private void assignmentCaseAffiliates(CaseApplication caseApplication, List<CaseAffiliate> caseAffiliatesnew,
                                           Map<String, Long> deptMap, Long roleId) {
         // 申请人信息
@@ -2337,6 +2358,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
 
     /**
      * 设置申请人的组织机构
+     *
      * @param caseAffiliate
      * @param caseApplication
      */
@@ -2344,7 +2366,6 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
     private void setApplicantOrganization(CaseAffiliate caseAffiliate, CaseApplication caseApplication, Map<String, Long> deptMap) {
 
 
-
         // 将组织机构id设为申请人名称
         if (deptMap.containsKey(caseApplication.getName())) {
             caseAffiliate.setApplicationOrganId(String.valueOf(deptMap.get(caseApplication.getName())));
@@ -2371,6 +2392,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
 
     /**
      * 组装被申请人信息
+     *
      * @param caseApplication
      * @return
      */
@@ -2481,12 +2503,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
 //        }
 
 
-
 //    }
 
 
-
-
-
-
 }

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

@@ -116,7 +116,7 @@ public class CaseArbitrateServiceImpl implements ICaseArbitrateService {
                     // 1931000 尊敬的{1}用户，您的{2}仲裁案件，仲裁方式已确定为{3}，请知晓，如非本人操作，请忽略本短信。
                     String name = affiliate.getName();
                     request.setTemplateParamSet(new String[]{name, caseNum, arbitratMethodStr});
-                    if (SmsUtils.sendSms(request)) {
+                    Boolean aBoolean = SmsUtils.sendSms(request);
                     //保存短信发送记录
                     SmsSendRecord smsSendRecord = new SmsSendRecord();
                     smsSendRecord.setCaseId(caseApplication.getId());
@@ -126,9 +126,12 @@ public class CaseArbitrateServiceImpl implements ICaseArbitrateService {
                     String content = "尊敬的" + name + "用户，您的" + caseNum + "仲裁案件，仲裁方式已确定为" + arbitratMethodStr + "，请知晓，如非本人操作，请忽略本短信。";
                     smsSendRecord.setSendContent(content);
                     smsSendRecord.setCreateBy(getUsername());
+                    if (aBoolean){
                         smsSendRecord.setSendStatus(1);
-                        smsRecordMapper.saveSmsSendRecord(smsSendRecord);
+                    }else {
+                        smsSendRecord.setSendStatus(0);
                     }
+                    smsRecordMapper.saveSmsSendRecord(smsSendRecord);
                 }
             }
 

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

@@ -24,6 +24,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
 import java.util.List;
+
 import static com.ruoyi.common.utils.SecurityUtils.getUsername;
 
 @Service
@@ -118,7 +119,7 @@ public class CasePaymentServiceImpl implements ICasePaymentService {
                         // 模板id：1928003 普通短信 案件受理通知
                         String name = affiliate.getName();
                         request.setTemplateParamSet(new String[]{name, caseName, caseNum});
-                        if (SmsUtils.sendSms(request)){
+                        Boolean aBoolean = SmsUtils.sendSms(request);
                         //保存短信发送记录
                         SmsSendRecord smsSendRecord = new SmsSendRecord();
                         smsSendRecord.setCaseId(caseApplication.getId());
@@ -128,16 +129,19 @@ public class CasePaymentServiceImpl implements ICasePaymentService {
                         String content = "尊敬的" + name + "用户，您的" + caseName + "案件" + caseNum + "已成功受理。";
                         smsSendRecord.setSendContent(content);
                         smsSendRecord.setCreateBy(getUsername());
+                        if (aBoolean) {
                             smsSendRecord.setSendStatus(1);
-                            smsRecordMapper.saveSmsSendRecord(smsSendRecord);
+                        } else {
+                            smsSendRecord.setSendStatus(0);
                         }
+                        smsRecordMapper.saveSmsSendRecord(smsSendRecord);
                     } else {       //被申请人
+                        Boolean aBoolean = SmsUtils.sendSms(request);
                         request.setPhone(affiliate.getContactTelphone());
                         request.setTemplateId("1952840");
                         // 1952840 尊敬的{1}用户，您的{2}案件{3}已成功受理，请点击链接：https://miniapp-3gpama6l759911ef-1321289474.tcloudbaseapp.com/jump-mp.html 选择是否应诉。如非本人操作，请忽略本短信
                         String name = affiliate.getName();
                         request.setTemplateParamSet(new String[]{name, caseName, caseNum});
-                        if (SmsUtils.sendSms(request)){
                         //保存短信发送记录
                         SmsSendRecord smsSendRecord = new SmsSendRecord();
                         smsSendRecord.setCaseId(caseApplication.getId());
@@ -147,9 +151,12 @@ public class CasePaymentServiceImpl implements ICasePaymentService {
                         String content = "尊敬的" + name + "用户，您的" + caseName + "案件" + caseNum + "已成功受理，请点击链接：https://miniapp-3gpama6l759911ef-1321289474.tcloudbaseapp.com/jump-mp.html 选择是否应诉。如非本人操作，请忽略本短信";
                         smsSendRecord.setSendContent(content);
                         smsSendRecord.setCreateBy(getUsername());
+                        if (aBoolean){
                             smsSendRecord.setSendStatus(1);
-                            smsRecordMapper.saveSmsSendRecord(smsSendRecord);
+                        }else {
+                            smsSendRecord.setSendStatus(0);
                         }
+                        smsRecordMapper.saveSmsSendRecord(smsSendRecord);
                     }
                 }
                 //更改记录表里的支付状态和支付时间
@@ -166,6 +173,7 @@ public class CasePaymentServiceImpl implements ICasePaymentService {
         }
         return AjaxResult.error("暂无需要确认的缴费清单");
     }
+
     @Transactional
     @Override
     public AjaxResult confirmPay(CaseConfirmPayDTO payDTO) {
@@ -204,5 +212,4 @@ public class CasePaymentServiceImpl implements ICasePaymentService {
     }
 
 
-
 }