|
@@ -160,6 +160,41 @@ public class TaRaiseRecordController extends BaseController {
|
160
|
160
|
return responseBean;
|
161
|
161
|
}
|
162
|
162
|
|
|
163
|
+ /**
|
|
164
|
+ * 批量作废前校验
|
|
165
|
+ *
|
|
166
|
+ * @param raiseRecord
|
|
167
|
+ * @return
|
|
168
|
+ */
|
|
169
|
+ @RequestMapping(value = "/admin/raise/checkBeforeInvalidRecord", method = RequestMethod.POST)
|
|
170
|
+ public ResponseBean checkBeforeInvalidRecord(@RequestBody TaRaiseRecord raiseRecord) {
|
|
171
|
+ ResponseBean responseBean = new ResponseBean();
|
|
172
|
+ try {
|
|
173
|
+ Integer fitNum = 0;
|
|
174
|
+ Integer notFitNum = 0;
|
|
175
|
+ Integer totalNum = raiseRecord.getTaRaiseRecords().size();
|
|
176
|
+ for (TaRaiseRecord record : raiseRecord.getTaRaiseRecords()) {
|
|
177
|
+ TaRaiseRecord r = iTaRaiseRecordService.getById(record.getRaiseRecordId());
|
|
178
|
+ if (CommConstant.STATUS_NORMAL != r.getStatus()) {
|
|
179
|
+ notFitNum++;
|
|
180
|
+ } else {
|
|
181
|
+ fitNum++;
|
|
182
|
+ }
|
|
183
|
+ }
|
|
184
|
+
|
|
185
|
+ // 组装反参
|
|
186
|
+ JSONObject resultObj = new JSONObject();
|
|
187
|
+ resultObj.put("totalNum", totalNum);
|
|
188
|
+ resultObj.put("fitNum", fitNum);
|
|
189
|
+ resultObj.put("notFitNum", notFitNum);
|
|
190
|
+ responseBean.addSuccess(resultObj);
|
|
191
|
+ } catch (Exception e) {
|
|
192
|
+ logger.error("checkBeforeInvalidRecord 异常:", e);
|
|
193
|
+ responseBean.addError(e.getMessage());
|
|
194
|
+ }
|
|
195
|
+ return responseBean;
|
|
196
|
+ }
|
|
197
|
+
|
163
|
198
|
/**
|
164
|
199
|
* 批量作废
|
165
|
200
|
*
|
|
@@ -194,7 +229,7 @@ public class TaRaiseRecordController extends BaseController {
|
194
|
229
|
iTaRaiseRecordService.updateForSubtractRaiseHeat(record.getRaiseRecordId());
|
195
|
230
|
|
196
|
231
|
//发送订阅消息
|
197
|
|
- iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(),record.getRaiseId(),"认筹通知","认筹单已作废","点击详情查看认筹单","具体原因查看详情",false);
|
|
232
|
+ iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(), record.getRaiseId(), "认筹通知", "认筹单已作废", "点击详情查看认筹单", "具体原因查看详情", false);
|
198
|
233
|
});
|
199
|
234
|
|
200
|
235
|
if (iTaRaiseRecordService.updateBatchById(raiseRecord.getTaRaiseRecords())) {
|
|
@@ -241,7 +276,7 @@ public class TaRaiseRecordController extends BaseController {
|
241
|
276
|
iTaRaiseRecordService.updateForSubtractRaiseHeat(record.getRaiseRecordId());
|
242
|
277
|
|
243
|
278
|
//发送订阅消息
|
244
|
|
- iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(),record.getRaiseId(),"认筹通知","认筹单已作废","点击详情查看认筹单","具体原因查看详情",false);
|
|
279
|
+ iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(), record.getRaiseId(), "认筹通知", "认筹单已作废", "点击详情查看认筹单", "具体原因查看详情", false);
|
245
|
280
|
});
|
246
|
281
|
|
247
|
282
|
if (iTaRaiseRecordService.updateBatchById(raiseRecord.getTaRaiseRecords())) {
|
|
@@ -256,6 +291,63 @@ public class TaRaiseRecordController extends BaseController {
|
256
|
291
|
return responseBean;
|
257
|
292
|
}
|
258
|
293
|
|
|
294
|
+ /**
|
|
295
|
+ * 批量线下缴费前校验
|
|
296
|
+ *
|
|
297
|
+ * @param raiseRecord
|
|
298
|
+ * @param request
|
|
299
|
+ * @return
|
|
300
|
+ */
|
|
301
|
+ @RequestMapping(value = "/admin/raise/checkBeforePayOfflineRecord", method = RequestMethod.POST)
|
|
302
|
+ public ResponseBean checkBeforePayOfflineRecord(@RequestBody TaRaiseRecord raiseRecord, HttpServletRequest request) {
|
|
303
|
+ ResponseBean responseBean = new ResponseBean();
|
|
304
|
+ try {
|
|
305
|
+ Integer fitNum = 0;
|
|
306
|
+ Integer notFitNum = 0;
|
|
307
|
+ Integer totalNum = raiseRecord.getTaRaiseRecords().size();
|
|
308
|
+
|
|
309
|
+ // 获取该认筹缴费方式
|
|
310
|
+ TaRaise taRaise = taRaiseService.getById(raiseRecord.getRaiseId());
|
|
311
|
+ if (taRaise == null) {
|
|
312
|
+ responseBean.addError("当前批次不存在");
|
|
313
|
+ return responseBean;
|
|
314
|
+ }
|
|
315
|
+
|
|
316
|
+ // 校验缴费方式
|
|
317
|
+ if (CommConstant.PAY_TYPE_ONLINE == taRaise.getPayType()) {
|
|
318
|
+ responseBean.addError("当前批次只支持线上缴费,请稍后再试");
|
|
319
|
+ return responseBean;
|
|
320
|
+ }
|
|
321
|
+
|
|
322
|
+ for (TaRaiseRecord record : raiseRecord.getTaRaiseRecords()) {
|
|
323
|
+ TaRaiseRecord r = iTaRaiseRecordService.getById(record.getRaiseRecordId());
|
|
324
|
+ // 校验是否作废
|
|
325
|
+ if (CommConstant.STATUS_NORMAL != r.getStatus()) {
|
|
326
|
+ notFitNum++;
|
|
327
|
+ continue;
|
|
328
|
+ }
|
|
329
|
+
|
|
330
|
+ // 校验缴费状态
|
|
331
|
+ if (CommConstant.PAY_STATUS_UNPAID != r.getPayStatus()) {
|
|
332
|
+ notFitNum++;
|
|
333
|
+ continue;
|
|
334
|
+ }
|
|
335
|
+ fitNum++;
|
|
336
|
+ }
|
|
337
|
+
|
|
338
|
+ // 组装反参
|
|
339
|
+ JSONObject resultObj = new JSONObject();
|
|
340
|
+ resultObj.put("totalNum", totalNum);
|
|
341
|
+ resultObj.put("fitNum", fitNum);
|
|
342
|
+ resultObj.put("notFitNum", notFitNum);
|
|
343
|
+ responseBean.addSuccess(resultObj);
|
|
344
|
+ } catch (Exception e) {
|
|
345
|
+ logger.error("checkBeforePayOfflineRecord 异常:", e);
|
|
346
|
+ responseBean.addError(e.getMessage());
|
|
347
|
+ }
|
|
348
|
+ return responseBean;
|
|
349
|
+ }
|
|
350
|
+
|
259
|
351
|
/**
|
260
|
352
|
* 批量线下缴费
|
261
|
353
|
*
|
|
@@ -307,7 +399,7 @@ public class TaRaiseRecordController extends BaseController {
|
307
|
399
|
record.setPayStatus(CommConstant.PAY_STATUS_PAID);
|
308
|
400
|
record.setUpdateDate(LocalDateTime.now());
|
309
|
401
|
//发送订阅消息
|
310
|
|
- iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(),record.getRaiseId(),"认筹通知","认筹已缴费","点击详情查看认筹单","您的认筹已成功缴费",false);
|
|
402
|
+ iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(), record.getRaiseId(), "认筹通知", "认筹已缴费", "点击详情查看认筹单", "您的认筹已成功缴费", false);
|
311
|
403
|
});
|
312
|
404
|
|
313
|
405
|
if (iTaRaiseRecordService.updateBatchById(raiseRecord.getTaRaiseRecords())) {
|
|
@@ -322,6 +414,43 @@ public class TaRaiseRecordController extends BaseController {
|
322
|
414
|
return responseBean;
|
323
|
415
|
}
|
324
|
416
|
|
|
417
|
+ /**
|
|
418
|
+ * 批量线下退费前校验
|
|
419
|
+ *
|
|
420
|
+ * @param raiseRecord
|
|
421
|
+ * @param request
|
|
422
|
+ * @return
|
|
423
|
+ */
|
|
424
|
+ @RequestMapping(value = "/admin/raise/checkBeforeRefundOfflineRecord", method = RequestMethod.POST)
|
|
425
|
+ public ResponseBean checkBeforeRefundOfflineRecord(@RequestBody TaRaiseRecord raiseRecord, HttpServletRequest request) {
|
|
426
|
+ ResponseBean responseBean = new ResponseBean();
|
|
427
|
+ try {
|
|
428
|
+ Integer fitNum = 0;
|
|
429
|
+ Integer notFitNum = 0;
|
|
430
|
+ Integer totalNum = raiseRecord.getTaRaiseRecords().size();
|
|
431
|
+ for (TaRaiseRecord record : raiseRecord.getTaRaiseRecords()) {
|
|
432
|
+ TaRaiseRecord r = iTaRaiseRecordService.getById(record.getRaiseRecordId());
|
|
433
|
+ // 校验缴费状态
|
|
434
|
+ if (CommConstant.PAY_STATUS_PAID == r.getPayStatus()) {
|
|
435
|
+ fitNum++;
|
|
436
|
+ continue;
|
|
437
|
+ }
|
|
438
|
+ notFitNum++;
|
|
439
|
+ }
|
|
440
|
+
|
|
441
|
+ // 组装反参
|
|
442
|
+ JSONObject resultObj = new JSONObject();
|
|
443
|
+ resultObj.put("totalNum", totalNum);
|
|
444
|
+ resultObj.put("fitNum", fitNum);
|
|
445
|
+ resultObj.put("notFitNum", notFitNum);
|
|
446
|
+ responseBean.addSuccess(resultObj);
|
|
447
|
+ } catch (Exception e) {
|
|
448
|
+ logger.error("checkBeforeRefundOfflineRecord 异常:", e);
|
|
449
|
+ responseBean.addError(e.getMessage());
|
|
450
|
+ }
|
|
451
|
+ return responseBean;
|
|
452
|
+ }
|
|
453
|
+
|
325
|
454
|
/**
|
326
|
455
|
* 批量线下退费
|
327
|
456
|
*
|
|
@@ -379,7 +508,7 @@ public class TaRaiseRecordController extends BaseController {
|
379
|
508
|
record.setRefundReason(raiseRecord.getRefundReason());
|
380
|
509
|
record.setUpdateDate(LocalDateTime.now());
|
381
|
510
|
//发送订阅消息
|
382
|
|
- iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(),record.getRaiseId(),"认筹通知","认筹已退费","点击详情查看认筹单","您的认筹已成功退费",false);
|
|
511
|
+ iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(), record.getRaiseId(), "认筹通知", "认筹已退费", "点击详情查看认筹单", "您的认筹已成功退费", false);
|
383
|
512
|
});
|
384
|
513
|
|
385
|
514
|
if (iTaRaiseRecordService.updateBatchById(raiseRecord.getTaRaiseRecords())) {
|
|
@@ -650,7 +779,6 @@ public class TaRaiseRecordController extends BaseController {
|
650
|
779
|
|
651
|
780
|
/**
|
652
|
781
|
* 微信端客户选择线下缴费就需要把此人的认筹单的缴费状态改为线下缴费
|
653
|
|
- *
|
654
|
782
|
*/
|
655
|
783
|
@RequestMapping(value = "/wx/taRaiseRecord/{raiseRecordId}", method = RequestMethod.PUT)
|
656
|
784
|
public ResponseBean taRaiseRecordUpdate(@PathVariable Integer raiseRecordId,
|