Просмотр исходного кода

更改短信新增发送记录

hejinbo 2 лет назад
Родитель
Сommit
84621de905

+ 412
- 395
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
Разница между файлами не показана из-за своего большого размера
Просмотреть файл


+ 14
- 11
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java Просмотреть файл

116
                     // 1931000 尊敬的{1}用户,您的{2}仲裁案件,仲裁方式已确定为{3},请知晓,如非本人操作,请忽略本短信。
116
                     // 1931000 尊敬的{1}用户,您的{2}仲裁案件,仲裁方式已确定为{3},请知晓,如非本人操作,请忽略本短信。
117
                     String name = affiliate.getName();
117
                     String name = affiliate.getName();
118
                     request.setTemplateParamSet(new String[]{name, caseNum, arbitratMethodStr});
118
                     request.setTemplateParamSet(new String[]{name, caseNum, arbitratMethodStr});
119
-                    if (SmsUtils.sendSms(request)) {
120
-                        //保存短信发送记录
121
-                        SmsSendRecord smsSendRecord = new SmsSendRecord();
122
-                        smsSendRecord.setCaseId(caseApplication.getId());
123
-                        smsSendRecord.setCaseNum(caseApplication1.getCaseNum());
124
-                        smsSendRecord.setPhone(request.getPhone());
125
-                        smsSendRecord.setSendTime(new Date());
126
-                        String content = "尊敬的" + name + "用户,您的" + caseNum + "仲裁案件,仲裁方式已确定为" + arbitratMethodStr + ",请知晓,如非本人操作,请忽略本短信。";
127
-                        smsSendRecord.setSendContent(content);
128
-                        smsSendRecord.setCreateBy(getUsername());
119
+                    Boolean aBoolean = SmsUtils.sendSms(request);
120
+                    //保存短信发送记录
121
+                    SmsSendRecord smsSendRecord = new SmsSendRecord();
122
+                    smsSendRecord.setCaseId(caseApplication.getId());
123
+                    smsSendRecord.setCaseNum(caseApplication1.getCaseNum());
124
+                    smsSendRecord.setPhone(request.getPhone());
125
+                    smsSendRecord.setSendTime(new Date());
126
+                    String content = "尊敬的" + name + "用户,您的" + caseNum + "仲裁案件,仲裁方式已确定为" + arbitratMethodStr + ",请知晓,如非本人操作,请忽略本短信。";
127
+                    smsSendRecord.setSendContent(content);
128
+                    smsSendRecord.setCreateBy(getUsername());
129
+                    if (aBoolean){
129
                         smsSendRecord.setSendStatus(1);
130
                         smsSendRecord.setSendStatus(1);
130
-                        smsRecordMapper.saveSmsSendRecord(smsSendRecord);
131
+                    }else {
132
+                        smsSendRecord.setSendStatus(0);
131
                     }
133
                     }
134
+                    smsRecordMapper.saveSmsSendRecord(smsSendRecord);
132
                 }
135
                 }
133
             }
136
             }
134
 
137
 

+ 35
- 28
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CasePaymentServiceImpl.java Просмотреть файл

24
 
24
 
25
 import java.util.Date;
25
 import java.util.Date;
26
 import java.util.List;
26
 import java.util.List;
27
+
27
 import static com.ruoyi.common.utils.SecurityUtils.getUsername;
28
 import static com.ruoyi.common.utils.SecurityUtils.getUsername;
28
 
29
 
29
 @Service
30
 @Service
33
     private final CasePaymentRecordMapper casePaymentRecordMapper;
34
     private final CasePaymentRecordMapper casePaymentRecordMapper;
34
     private final CaseAffiliateMapper caseAffiliateMapper;
35
     private final CaseAffiliateMapper caseAffiliateMapper;
35
     @Autowired
36
     @Autowired
36
-    private  CaseAttachMapper caseAttachMapper;
37
+    private CaseAttachMapper caseAttachMapper;
37
     @Autowired
38
     @Autowired
38
     private SmsRecordMapper smsRecordMapper;
39
     private SmsRecordMapper smsRecordMapper;
39
 
40
 
118
                         // 模板id:1928003 普通短信 案件受理通知
119
                         // 模板id:1928003 普通短信 案件受理通知
119
                         String name = affiliate.getName();
120
                         String name = affiliate.getName();
120
                         request.setTemplateParamSet(new String[]{name, caseName, caseNum});
121
                         request.setTemplateParamSet(new String[]{name, caseName, caseNum});
121
-                        if (SmsUtils.sendSms(request)){
122
-                            //保存短信发送记录
123
-                            SmsSendRecord smsSendRecord = new SmsSendRecord();
124
-                            smsSendRecord.setCaseId(caseApplication.getId());
125
-                            smsSendRecord.setCaseNum(caseNum);
126
-                            smsSendRecord.setPhone(request.getPhone());
127
-                            smsSendRecord.setSendTime(new Date());
128
-                            String content="尊敬的"+name+"用户,您的"+caseName+"案件"+caseNum+"已成功受理。";
129
-                            smsSendRecord.setSendContent(content);
130
-                            smsSendRecord.setCreateBy(getUsername());
122
+                        Boolean aBoolean = SmsUtils.sendSms(request);
123
+                        //保存短信发送记录
124
+                        SmsSendRecord smsSendRecord = new SmsSendRecord();
125
+                        smsSendRecord.setCaseId(caseApplication.getId());
126
+                        smsSendRecord.setCaseNum(caseNum);
127
+                        smsSendRecord.setPhone(request.getPhone());
128
+                        smsSendRecord.setSendTime(new Date());
129
+                        String content = "尊敬的" + name + "用户,您的" + caseName + "案件" + caseNum + "已成功受理。";
130
+                        smsSendRecord.setSendContent(content);
131
+                        smsSendRecord.setCreateBy(getUsername());
132
+                        if (aBoolean) {
131
                             smsSendRecord.setSendStatus(1);
133
                             smsSendRecord.setSendStatus(1);
132
-                            smsRecordMapper.saveSmsSendRecord(smsSendRecord);
134
+                        } else {
135
+                            smsSendRecord.setSendStatus(0);
133
                         }
136
                         }
137
+                        smsRecordMapper.saveSmsSendRecord(smsSendRecord);
134
                     } else {       //被申请人
138
                     } else {       //被申请人
139
+                        Boolean aBoolean = SmsUtils.sendSms(request);
135
                         request.setPhone(affiliate.getContactTelphone());
140
                         request.setPhone(affiliate.getContactTelphone());
136
                         request.setTemplateId("1952840");
141
                         request.setTemplateId("1952840");
137
                         // 1952840 尊敬的{1}用户,您的{2}案件{3}已成功受理,请点击链接:https://miniapp-3gpama6l759911ef-1321289474.tcloudbaseapp.com/jump-mp.html 选择是否应诉。如非本人操作,请忽略本短信
142
                         // 1952840 尊敬的{1}用户,您的{2}案件{3}已成功受理,请点击链接:https://miniapp-3gpama6l759911ef-1321289474.tcloudbaseapp.com/jump-mp.html 选择是否应诉。如非本人操作,请忽略本短信
138
                         String name = affiliate.getName();
143
                         String name = affiliate.getName();
139
                         request.setTemplateParamSet(new String[]{name, caseName, caseNum});
144
                         request.setTemplateParamSet(new String[]{name, caseName, caseNum});
140
-                        if (SmsUtils.sendSms(request)){
141
-                            //保存短信发送记录
142
-                            SmsSendRecord smsSendRecord = new SmsSendRecord();
143
-                            smsSendRecord.setCaseId(caseApplication.getId());
144
-                            smsSendRecord.setCaseNum(caseNum);
145
-                            smsSendRecord.setPhone(request.getPhone());
146
-                            smsSendRecord.setSendTime(new Date());
147
-                            String content="尊敬的"+name+"用户,您的"+caseName+"案件"+caseNum+"已成功受理,请点击链接:https://miniapp-3gpama6l759911ef-1321289474.tcloudbaseapp.com/jump-mp.html 选择是否应诉。如非本人操作,请忽略本短信";
148
-                            smsSendRecord.setSendContent(content);
149
-                            smsSendRecord.setCreateBy(getUsername());
145
+                        //保存短信发送记录
146
+                        SmsSendRecord smsSendRecord = new SmsSendRecord();
147
+                        smsSendRecord.setCaseId(caseApplication.getId());
148
+                        smsSendRecord.setCaseNum(caseNum);
149
+                        smsSendRecord.setPhone(request.getPhone());
150
+                        smsSendRecord.setSendTime(new Date());
151
+                        String content = "尊敬的" + name + "用户,您的" + caseName + "案件" + caseNum + "已成功受理,请点击链接:https://miniapp-3gpama6l759911ef-1321289474.tcloudbaseapp.com/jump-mp.html 选择是否应诉。如非本人操作,请忽略本短信";
152
+                        smsSendRecord.setSendContent(content);
153
+                        smsSendRecord.setCreateBy(getUsername());
154
+                        if (aBoolean){
150
                             smsSendRecord.setSendStatus(1);
155
                             smsSendRecord.setSendStatus(1);
151
-                            smsRecordMapper.saveSmsSendRecord(smsSendRecord);
156
+                        }else {
157
+                            smsSendRecord.setSendStatus(0);
152
                         }
158
                         }
159
+                        smsRecordMapper.saveSmsSendRecord(smsSendRecord);
153
                     }
160
                     }
154
                 }
161
                 }
155
                 //更改记录表里的支付状态和支付时间
162
                 //更改记录表里的支付状态和支付时间
159
                 casePaymentRecord.setUpdateTime(new Date());
166
                 casePaymentRecord.setUpdateTime(new Date());
160
                 casePaymentRecordMapper.update(casePaymentRecord);
167
                 casePaymentRecordMapper.update(casePaymentRecord);
161
                 // 新增日志
168
                 // 新增日志
162
-                CaseLogUtils.insertCaseLog(caseApplication.getId(),CaseApplicationConstants.CASE_CROSSEXAMI,"");
169
+                CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.CASE_CROSSEXAMI, "");
163
 
170
 
164
                 return AjaxResult.success();
171
                 return AjaxResult.success();
165
             }
172
             }
166
         }
173
         }
167
         return AjaxResult.error("暂无需要确认的缴费清单");
174
         return AjaxResult.error("暂无需要确认的缴费清单");
168
     }
175
     }
176
+
169
     @Transactional
177
     @Transactional
170
     @Override
178
     @Override
171
     public AjaxResult confirmPay(CaseConfirmPayDTO payDTO) {
179
     public AjaxResult confirmPay(CaseConfirmPayDTO payDTO) {
172
-        if(payDTO.getCaseId()!=null&&payDTO.getPayType()!=null){
180
+        if (payDTO.getCaseId() != null && payDTO.getPayType() != null) {
173
             // 修改支付方式
181
             // 修改支付方式
174
 
182
 
175
             caseApplicationMapper.updatePayType(payDTO);
183
             caseApplicationMapper.updatePayType(payDTO);
176
         }
184
         }
177
-        if(CollectionUtil.isNotEmpty(payDTO.getPayOrderList())){
185
+        if (CollectionUtil.isNotEmpty(payDTO.getPayOrderList())) {
178
             for (CaseAttach caseAttach : payDTO.getPayOrderList()) {
186
             for (CaseAttach caseAttach : payDTO.getPayOrderList()) {
179
                 caseAttach.setCaseAppliId(payDTO.getCaseId());
187
                 caseAttach.setCaseAppliId(payDTO.getCaseId());
180
                 caseAttachMapper.updateCaseAttach(caseAttach);
188
                 caseAttachMapper.updateCaseAttach(caseAttach);
188
         caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_PAYMENT_CONFIRM);
196
         caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_PAYMENT_CONFIRM);
189
         //修改案件状态
197
         //修改案件状态
190
         int i = caseApplicationMapper.submitCaseApplication(caseApplication1);
198
         int i = caseApplicationMapper.submitCaseApplication(caseApplication1);
191
-        if(i>0) {
199
+        if (i > 0) {
192
             // 修改支付状态
200
             // 修改支付状态
193
             CasePaymentRecord paymentRecord = new CasePaymentRecord();
201
             CasePaymentRecord paymentRecord = new CasePaymentRecord();
194
             paymentRecord.setPayType(payDTO.getPayType());
202
             paymentRecord.setPayType(payDTO.getPayType());
204
     }
212
     }
205
 
213
 
206
 
214
 
207
-
208
 }
215
 }