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

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

@@ -582,7 +582,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
             for (CaseAttach caseAttach : caseAttachList) {
                 if (caseAttach.getAnnexType() == 3) {
                     String annexName = caseAttach.getAnnexName();
-                    String prefix = "/profile/upload";
+                    String prefix = "/profile/upload/";
                     int startIndex = prefix.length();
                     String path = caseAttach.getAnnexPath() + annexName.substring(startIndex);
                     file = new File(path);

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

@@ -116,19 +116,22 @@ public class CaseArbitrateServiceImpl implements ICaseArbitrateService {
                     // 1931000 尊敬的{1}用户，您的{2}仲裁案件，仲裁方式已确定为{3}，请知晓，如非本人操作，请忽略本短信。
                     String name = affiliate.getName();
                     request.setTemplateParamSet(new String[]{name, caseNum, arbitratMethodStr});
-                    if (SmsUtils.sendSms(request)) {
-                        //保存短信发送记录
-                        SmsSendRecord smsSendRecord = new SmsSendRecord();
-                        smsSendRecord.setCaseId(caseApplication.getId());
-                        smsSendRecord.setCaseNum(caseApplication1.getCaseNum());
-                        smsSendRecord.setPhone(request.getPhone());
-                        smsSendRecord.setSendTime(new Date());
-                        String content = "尊敬的" + name + "用户，您的" + caseNum + "仲裁案件，仲裁方式已确定为" + arbitratMethodStr + "，请知晓，如非本人操作，请忽略本短信。";
-                        smsSendRecord.setSendContent(content);
-                        smsSendRecord.setCreateBy(getUsername());
+                    Boolean aBoolean = SmsUtils.sendSms(request);
+                    //保存短信发送记录
+                    SmsSendRecord smsSendRecord = new SmsSendRecord();
+                    smsSendRecord.setCaseId(caseApplication.getId());
+                    smsSendRecord.setCaseNum(caseApplication1.getCaseNum());
+                    smsSendRecord.setPhone(request.getPhone());
+                    smsSendRecord.setSendTime(new Date());
+                    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
@@ -33,7 +34,7 @@ public class CasePaymentServiceImpl implements ICasePaymentService {
     private final CasePaymentRecordMapper casePaymentRecordMapper;
     private final CaseAffiliateMapper caseAffiliateMapper;
     @Autowired
-    private  CaseAttachMapper caseAttachMapper;
+    private CaseAttachMapper caseAttachMapper;
     @Autowired
     private SmsRecordMapper smsRecordMapper;
 
@@ -118,38 +119,44 @@ public class CasePaymentServiceImpl implements ICasePaymentService {
                         // 模板id：1928003 普通短信 案件受理通知
                         String name = affiliate.getName();
                         request.setTemplateParamSet(new String[]{name, caseName, caseNum});
-                        if (SmsUtils.sendSms(request)){
-                            //保存短信发送记录
-                            SmsSendRecord smsSendRecord = new SmsSendRecord();
-                            smsSendRecord.setCaseId(caseApplication.getId());
-                            smsSendRecord.setCaseNum(caseNum);
-                            smsSendRecord.setPhone(request.getPhone());
-                            smsSendRecord.setSendTime(new Date());
-                            String content="尊敬的"+name+"用户，您的"+caseName+"案件"+caseNum+"已成功受理。";
-                            smsSendRecord.setSendContent(content);
-                            smsSendRecord.setCreateBy(getUsername());
+                        Boolean aBoolean = SmsUtils.sendSms(request);
+                        //保存短信发送记录
+                        SmsSendRecord smsSendRecord = new SmsSendRecord();
+                        smsSendRecord.setCaseId(caseApplication.getId());
+                        smsSendRecord.setCaseNum(caseNum);
+                        smsSendRecord.setPhone(request.getPhone());
+                        smsSendRecord.setSendTime(new Date());
+                        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());
-                            smsSendRecord.setCaseNum(caseNum);
-                            smsSendRecord.setPhone(request.getPhone());
-                            smsSendRecord.setSendTime(new Date());
-                            String content="尊敬的"+name+"用户，您的"+caseName+"案件"+caseNum+"已成功受理，请点击链接：https://miniapp-3gpama6l759911ef-1321289474.tcloudbaseapp.com/jump-mp.html 选择是否应诉。如非本人操作，请忽略本短信";
-                            smsSendRecord.setSendContent(content);
-                            smsSendRecord.setCreateBy(getUsername());
+                        //保存短信发送记录
+                        SmsSendRecord smsSendRecord = new SmsSendRecord();
+                        smsSendRecord.setCaseId(caseApplication.getId());
+                        smsSendRecord.setCaseNum(caseNum);
+                        smsSendRecord.setPhone(request.getPhone());
+                        smsSendRecord.setSendTime(new Date());
+                        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);
                     }
                 }
                 //更改记录表里的支付状态和支付时间
@@ -159,22 +166,23 @@ public class CasePaymentServiceImpl implements ICasePaymentService {
                 casePaymentRecord.setUpdateTime(new Date());
                 casePaymentRecordMapper.update(casePaymentRecord);
                 // 新增日志
-                CaseLogUtils.insertCaseLog(caseApplication.getId(),CaseApplicationConstants.CASE_CROSSEXAMI,"");
+                CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.CASE_CROSSEXAMI, "");
 
                 return AjaxResult.success();
             }
         }
         return AjaxResult.error("暂无需要确认的缴费清单");
     }
+
     @Transactional
     @Override
     public AjaxResult confirmPay(CaseConfirmPayDTO payDTO) {
-        if(payDTO.getCaseId()!=null&&payDTO.getPayType()!=null){
+        if (payDTO.getCaseId() != null && payDTO.getPayType() != null) {
             // 修改支付方式
 
             caseApplicationMapper.updatePayType(payDTO);
         }
-        if(CollectionUtil.isNotEmpty(payDTO.getPayOrderList())){
+        if (CollectionUtil.isNotEmpty(payDTO.getPayOrderList())) {
             for (CaseAttach caseAttach : payDTO.getPayOrderList()) {
                 caseAttach.setCaseAppliId(payDTO.getCaseId());
                 caseAttachMapper.updateCaseAttach(caseAttach);
@@ -188,7 +196,7 @@ public class CasePaymentServiceImpl implements ICasePaymentService {
         caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_PAYMENT_CONFIRM);
         //修改案件状态
         int i = caseApplicationMapper.submitCaseApplication(caseApplication1);
-        if(i>0) {
+        if (i > 0) {
             // 修改支付状态
             CasePaymentRecord paymentRecord = new CasePaymentRecord();
             paymentRecord.setPayType(payDTO.getPayType());
@@ -204,5 +212,4 @@ public class CasePaymentServiceImpl implements ICasePaymentService {
     }
 
 
-
 }

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/FixSelectFlowDetailUtils.java

@@ -43,7 +43,7 @@ public class FixSelectFlowDetailUtils {
         Gson gson = new Gson();
 
         SealSignRecord sealSignRecordselect = new SealSignRecord();
-//        sealSignRecordselect.setSignFlowStatus(1);
+        // sealSignRecordselect.setSignFlowStatus(1);
         List<SealSignRecord> sealSignRecords = sealSignRecordMapper.selectSealSignRecordbyStat(sealSignRecordselect);
 
         try {
@@ -118,7 +118,7 @@ public class FixSelectFlowDetailUtils {
                                     caseApplication.setFilearbitraUrl(filearbitraUrl);
                                     caseApplicationMapper.submitCaseApplication(caseApplication);
 
-                                    LocalDate now = LocalDate.now();
+                     /*               LocalDate now = LocalDate.now();
                                     String year = Integer.toString(now.getYear());
                                     String month = String.format("%02d", now.getMonthValue());
                                     String day = String.format("%02d", now.getDayOfMonth());
@@ -137,7 +137,7 @@ public class FixSelectFlowDetailUtils {
                                        caseAttach.setAnnexPath(savePath);
                                        caseAttach.setAnnexName(saveName);
                                        caseAttachMapper.updateCaseAttachBycaseid(caseAttach);
-                                   }
+                                   }*/
 
                                 }
                             }
@@ -147,9 +147,6 @@ public class FixSelectFlowDetailUtils {
                 }
 
             }
-
-
-
         } catch (EsignDemoException e) {
             e.printStackTrace();
         }
@@ -198,9 +195,4 @@ public class FixSelectFlowDetailUtils {
 
     }
 
-
-
-
-
-
 }