|
@@ -12,11 +12,8 @@ import com.huiju.estateagents.bo.request.RaiseRecordRequestBO;
|
12
|
12
|
import com.huiju.estateagents.center.taUser.entity.TaUser;
|
13
|
13
|
import com.huiju.estateagents.center.taUser.service.ITaUserService;
|
14
|
14
|
import com.huiju.estateagents.common.CommConstant;
|
15
|
|
-import com.huiju.estateagents.drainage.entity.TaDrainageRecord;
|
16
|
15
|
import com.huiju.estateagents.entity.*;
|
17
|
|
-import com.huiju.estateagents.po.BuildingImgPO;
|
18
|
16
|
import com.huiju.estateagents.service.*;
|
19
|
|
-import jodd.util.StringUtil;
|
20
|
17
|
import org.apache.commons.collections.CollectionUtils;
|
21
|
18
|
import org.apache.commons.lang3.StringUtils;
|
22
|
19
|
import org.slf4j.Logger;
|
|
@@ -305,20 +302,17 @@ public class TaRaiseRecordController extends BaseController {
|
305
|
302
|
Integer fitNum = 0;
|
306
|
303
|
Integer notFitNum = 0;
|
307
|
304
|
Integer totalNum = raiseRecord.getTaRaiseRecords().size();
|
308
|
|
-
|
309
|
305
|
// 获取该认筹缴费方式
|
310
|
306
|
TaRaise taRaise = taRaiseService.getById(raiseRecord.getRaiseId());
|
311
|
307
|
if (taRaise == null) {
|
312
|
308
|
responseBean.addError("当前批次不存在");
|
313
|
309
|
return responseBean;
|
314
|
310
|
}
|
315
|
|
-
|
316
|
311
|
// 校验缴费方式
|
317
|
312
|
if (CommConstant.PAY_TYPE_ONLINE == taRaise.getPayType()) {
|
318
|
313
|
responseBean.addError("当前批次只支持线上缴费,请稍后再试");
|
319
|
314
|
return responseBean;
|
320
|
315
|
}
|
321
|
|
-
|
322
|
316
|
for (TaRaiseRecord record : raiseRecord.getTaRaiseRecords()) {
|
323
|
317
|
TaRaiseRecord r = iTaRaiseRecordService.getById(record.getRaiseRecordId());
|
324
|
318
|
// 校验是否作废
|
|
@@ -326,7 +320,6 @@ public class TaRaiseRecordController extends BaseController {
|
326
|
320
|
notFitNum++;
|
327
|
321
|
continue;
|
328
|
322
|
}
|
329
|
|
-
|
330
|
323
|
// 校验缴费状态
|
331
|
324
|
if (CommConstant.PAY_STATUS_UNPAID != r.getPayStatus()) {
|
332
|
325
|
notFitNum++;
|
|
@@ -334,7 +327,6 @@ public class TaRaiseRecordController extends BaseController {
|
334
|
327
|
}
|
335
|
328
|
fitNum++;
|
336
|
329
|
}
|
337
|
|
-
|
338
|
330
|
// 组装反参
|
339
|
331
|
JSONObject resultObj = new JSONObject();
|
340
|
332
|
resultObj.put("totalNum", totalNum);
|
|
@@ -418,11 +410,10 @@ public class TaRaiseRecordController extends BaseController {
|
418
|
410
|
* 批量线下退费前校验
|
419
|
411
|
*
|
420
|
412
|
* @param raiseRecord
|
421
|
|
- * @param request
|
422
|
413
|
* @return
|
423
|
414
|
*/
|
424
|
415
|
@RequestMapping(value = "/admin/raise/checkBeforeRefundOfflineRecord", method = RequestMethod.POST)
|
425
|
|
- public ResponseBean checkBeforeRefundOfflineRecord(@RequestBody TaRaiseRecord raiseRecord, HttpServletRequest request) {
|
|
416
|
+ public ResponseBean checkBeforeRefundOfflineRecord(@RequestBody TaRaiseRecord raiseRecord) {
|
426
|
417
|
ResponseBean responseBean = new ResponseBean();
|
427
|
418
|
try {
|
428
|
419
|
Integer fitNum = 0;
|