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

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

@@ -119,12 +119,12 @@ public class CaseEvidenceServiceImpl implements ICaseEvidenceService {
                     caseApplication.setCaseStatus(4);
                     caseApplicationMapper.submitCaseApplication(caseApplication);
                 }
+            }
                 CaseAttach caseAttachselect = new CaseAttach();
                 caseAttachselect.setAnnexId(caseAttach.getAnnexId());
                 caseAttachselect.setAnnexName(caseAttach.getAnnexName());
                 caseAttachselect.setAnnexType(caseAttach.getAnnexType());
                 return AjaxResult.success("上传成功", caseAttachselect);
-            }
         } catch (IOException e) {
             e.printStackTrace();
         }

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

@@ -185,11 +185,20 @@ public class CasePaymentServiceImpl implements ICasePaymentService {
         CaseApplication caseApplication1 = caseApplicationMapper.selectCaseApplication(caseApplication);
         caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_PAYMENT_CONFIRM);
         //修改案件状态
-        caseApplicationMapper.submitCaseApplication(caseApplication1);
+        int i = caseApplicationMapper.submitCaseApplication(caseApplication1);
-        // 新增日志
+        if(i>0) {
-        CaseLogUtils.insertCaseLog(caseApplication.getId(),CaseApplicationConstants.PENDING_PAYMENT_CONFIRM,"");
+            // 修改支付状态
+            CasePaymentRecord paymentRecord = new CasePaymentRecord();
+            paymentRecord.setPayType(payDTO.getPayType());
+            paymentRecord.setCaseId(payDTO.getCaseId());
+            paymentRecord.setPaymentStatus(1);
+            casePaymentRecordMapper.saveRecord(paymentRecord);
+            // 新增日志
+            CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.PENDING_PAYMENT_CONFIRM, "");
 
-        return AjaxResult.success("确认缴费成功");
+            return AjaxResult.success("确认缴费成功");
+        }
+        return AjaxResult.success("确认缴费失败");
     }
 
 

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml

@@ -7,6 +7,7 @@
     <resultMap type="CaseApplication" id="CaseApplicationResult">
         <id     property="id"       column="id"      />
         <result property="caseNum"       column="case_num"      />
+        <result property="caseName"       column="case_name"      />
         <result property="caseSubjectAmount"     column="case_subject_amount"    />
         <result property="registerDate"     column="register_date"    />
         <result property="arbitratMethod"        column="arbitrat_method"        />
@@ -516,6 +517,7 @@
         CASE c.arbitrat_method when 1 then '开庭审理' when 2 then '书面审理'
         ELSE '无审理方式'
         END arbitratMethodName,
+         c.case_name,
         c.case_status ,
         CASE c.case_status when 0 then '立案申请' when 1 then '待立案审查' when 2 then '待缴费'
         when 3 then '待缴费确认' when 4 then '待案件质证' when 5 then '待组庭审核'
@@ -596,7 +598,7 @@ order by c.create_time desc limit 1
                CASE c.pay_type when 0 then '线上支付' when 0 then '线下支付' else '' end payTypeName
         from case_application c left join case_payment_record p on c.id  = p.case_id
         where c.case_status  = 3
-          AND c.id = #{id} and p.payment_status=1
+          AND c.id = #{id} and p.payment_status=1 limit 1
 
     </select>
     <select id="selectCaseNumLike" resultType="java.lang.Integer">