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

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/SmsSendRecord.java

@@ -20,6 +20,10 @@ public class SmsSendRecord extends BaseEntity {
      * 案件申请id
      */
     private Long caseId;
+    /**
+     * 案件编号
+     */
+    private String caseNum;
     /**
      * 手机号
      */

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

@@ -975,6 +975,10 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
                         //保存短信发送记录
                         SmsSendRecord smsSendRecord = new SmsSendRecord();
                         smsSendRecord.setCaseId(caseAffiliate.getCaseAppliId());
+                        CaseApplication caseApplication = new CaseApplication();
+                        caseApplication.setId(caseAffiliate.getCaseAppliId());
+                        caseApplication = caseApplicationMapper.selectCaseApplication(caseApplication);
+                        smsSendRecord.setCaseNum(caseApplication.getCaseNum());
                         smsSendRecord.setPhone(request.getPhone());
                         smsSendRecord.setSendTime(new Date());
                         String content="尊敬的"+agentUser.getNickName()+",您的代理的案件已接入仲裁系统，复制访问https://miniapp-3gpama6l759911ef-1321289474.tcloudbaseapp.com/jump-mp.html 进入小程序进行认证注册。如非本人操作，请忽略本短信";
@@ -1765,6 +1769,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
             //保存短信发送记录
             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 请知晓，如非本人操作，请忽略本短信。";
@@ -2055,7 +2060,8 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
                     if (SmsUtils.sendSms(request)){
                         //保存短信发送记录
                         SmsSendRecord smsSendRecord = new SmsSendRecord();
-                        smsSendRecord.setCaseId(caseApplication.getId());
+                        smsSendRecord.setCaseId(caseApplicationselect.getId());
+                        smsSendRecord.setCaseNum(caseApplicationselect.getCaseNum());
                         smsSendRecord.setPhone(request.getPhone());
                         smsSendRecord.setSendTime(new Date());
                         String content="尊敬的"+name+"用户，您的"+caseNum+"仲裁案件，开庭日期已确定为"+hearDatestr+"，请知晓，如非本人操作，请忽略本短信。";
@@ -2090,6 +2096,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
                     //保存短信发送记录
                     SmsSendRecord smsSendRecord = new SmsSendRecord();
                     smsSendRecord.setCaseId(caseApplication.getId());
+                    smsSendRecord.setCaseNum(caseApplicationselect.getCaseNum());
                     smsSendRecord.setPhone(request.getPhone());
                     smsSendRecord.setSendTime(new Date());
                     String content="尊敬的"+name+"用户，您的"+caseNum+"仲裁案件，开庭日期已确定为"+hearDatestr+"，请知晓，如非本人操作，请忽略本短信。";

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

@@ -110,6 +110,7 @@ public class CaseArbitrateServiceImpl implements ICaseArbitrateService {
                         //保存短信发送记录
                         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 + "，请知晓，如非本人操作，请忽略本短信。";

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

@@ -122,6 +122,7 @@ public class CasePaymentServiceImpl implements ICasePaymentService {
                             //保存短信发送记录
                             SmsSendRecord smsSendRecord = new SmsSendRecord();
                             smsSendRecord.setCaseId(caseApplication.getId());
+                            smsSendRecord.setCaseNum(caseNum);
                             smsSendRecord.setPhone(request.getPhone());
                             smsSendRecord.setSendTime(new Date());
                             String content="尊敬的"+name+"用户，您的"+caseName+"案件"+caseNum+"已成功受理。";
@@ -139,6 +140,7 @@ public class CasePaymentServiceImpl implements ICasePaymentService {
                             //保存短信发送记录
                             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 选择是否应诉。如非本人操作，请忽略本短信";

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

@@ -7,6 +7,7 @@
     <resultMap type="SmsSendRecord" id="SmsSendRecordResult">
         <id     property="id"       column="id"      />
         <result property="caseId"       column="case_appli_id"      />
+        <result property="caseNum"       column="case_num"      />
         <result property="phone"     column="phone"    />
         <result property="sendTime"     column="send_time"    />
         <result property="sendContent"        column="send_content"        />
@@ -19,6 +20,7 @@
 
         insert into sms_send_record(
         <if test="caseId != null ">case_appli_id,</if>
+        <if test="caseNum != null ">case_num,</if>
         <if test="phone != null and phone != ''">phone,</if>
         <if test="sendTime != null ">send_time,</if>
         <if test="sendContent != null ">send_content,</if>
@@ -26,6 +28,7 @@
         create_time
         )values(
         <if test="caseId != null ">#{caseId},</if>
+        <if test="caseNum != null ">#{caseNum},</if>
         <if test="phone != null and phone != ''">#{phone},</if>
         <if test="sendTime != null ">#{sendTime},</if>
         <if test="sendContent != null ">#{sendContent},</if>
@@ -36,11 +39,11 @@
 
     <select id="getSmsSendRecord" parameterType="SmsSendRecord" resultMap="SmsSendRecordResult">
 
-        select id ,case_appli_id ,phone ,send_time ,send_content
+        select id ,case_appli_id ,case_num ,phone ,send_time ,send_content
         from sms_send_record
         <where>
-            <if test="caseId != null ">
-                AND case_appli_id = #{caseId}
+            <if test="caseNum != null and caseNum != ''">
+                AND case_num = #{caseNum}
             </if>
         </where>
         order by send_time desc