| Line 380... |
Line 380... |
| 380 |
return "recharge-operators";
|
380 |
return "recharge-operators";
|
| 381 |
}
|
381 |
}
|
| 382 |
|
382 |
|
| 383 |
@RequestMapping(value = "/createRechargeCommission", method = RequestMethod.GET)
|
383 |
@RequestMapping(value = "/createRechargeCommission", method = RequestMethod.GET)
|
| 384 |
public String createRechargeCommission(HttpServletRequest request,
|
384 |
public String createRechargeCommission(HttpServletRequest request,
|
| 385 |
@RequestParam(name = ProfitMandiConstants.RECHARGE_TYPE) String rechargeTypeString, Model model)
|
385 |
@RequestParam(name = ProfitMandiConstants.RECHARGE_TYPE) RechargeType rechargeType, Model model)
|
| 386 |
throws ProfitMandiBusinessException {
|
386 |
throws ProfitMandiBusinessException {
|
| 387 |
// model.addAttribute("rechargeOperators",
|
387 |
// model.addAttribute("rechargeOperators",
|
| 388 |
// rechargeOperatorRepository.selectAllByRechargeType(RechargeType.MOBILE));
|
388 |
// rechargeOperatorRepository.selectAllByRechargeType(RechargeType.MOBILE));
|
| 389 |
// model.addAttribute("rechargeTypes", RechargeType.values());
|
389 |
// model.addAttribute("rechargeTypes", RechargeType.values());
|
| 390 |
|
390 |
|
| 391 |
RechargeType rechargeType = RechargeType.valueOf(rechargeTypeString);
|
- |
|
| 392 |
List<RechargeOperator> rechargeOperators = null;
|
391 |
List<RechargeOperator> rechargeOperators = null;
|
| 393 |
if (rechargeType == RechargeType.MOBILE) {
|
392 |
if (rechargeType.equals(RechargeType.MOBILE)) {
|
| 394 |
model.addAttribute("operatorTypes", OperatorType.values());
|
393 |
model.addAttribute("operatorTypes", OperatorType.values());
|
| 395 |
rechargeOperators = rechargeOperatorRepository.selectAllByOperatorType(OperatorType.PREPAID);
|
394 |
rechargeOperators = rechargeOperatorRepository.selectAllByOperatorType(OperatorType.PREPAID);
|
| 396 |
} else {
|
395 |
} else {
|
| 397 |
rechargeOperators = rechargeOperatorRepository.selectAllByRechargeType(rechargeType);
|
396 |
rechargeOperators = rechargeOperatorRepository.selectAllByRechargeType(rechargeType);
|
| 398 |
}
|
397 |
}
|
| 399 |
List<Integer> rechargeOperatorIds = rechargeCommissionRepository.selectAllOperatorIds();
|
398 |
List<Integer> rechargeOperatorIds = rechargeCommissionRepository.selectAllOperatorIds();
|
| - |
|
399 |
LOGGER.info("rechargeOperators" + rechargeOperators);
|
| - |
|
400 |
LOGGER.info("rechargeOperatorIds" + rechargeOperatorIds);
|
| - |
|
401 |
|
| 400 |
if (!rechargeOperatorIds.isEmpty()) {
|
402 |
if (!rechargeOperatorIds.isEmpty()) {
|
| 401 |
rechargeOperators = this.filterRechargeOperators(rechargeOperators, rechargeOperatorIds);
|
403 |
rechargeOperators = this.filterRechargeOperators(rechargeOperators, rechargeOperatorIds);
|
| 402 |
if (rechargeOperators.isEmpty()) {
|
404 |
if (rechargeOperators.isEmpty()) {
|
| 403 |
throw new ProfitMandiBusinessException(ProfitMandiConstants.RECHARGE_TYPE, rechargeType, "RCHRG_1003");
|
405 |
throw new ProfitMandiBusinessException(ProfitMandiConstants.RECHARGE_TYPE, rechargeType, "RCHRG_1003");
|
| 404 |
}
|
406 |
}
|
| Line 409... |
Line 411... |
| 409 |
|
411 |
|
| 410 |
private List<RechargeOperator> filterRechargeOperators(List<RechargeOperator> rechargeOperators,
|
412 |
private List<RechargeOperator> filterRechargeOperators(List<RechargeOperator> rechargeOperators,
|
| 411 |
List<Integer> rechargeOperatorIds) {
|
413 |
List<Integer> rechargeOperatorIds) {
|
| 412 |
List<RechargeOperator> filteredRechargeOperators = new ArrayList<>();
|
414 |
List<RechargeOperator> filteredRechargeOperators = new ArrayList<>();
|
| 413 |
for (RechargeOperator rechargeOperator : rechargeOperators) {
|
415 |
for (RechargeOperator rechargeOperator : rechargeOperators) {
|
| 414 |
if (!rechargeOperatorIds.contains(rechargeOperator.getId())) {
|
416 |
if (rechargeOperatorIds.contains(rechargeOperator.getId())) {
|
| 415 |
filteredRechargeOperators.add(rechargeOperator);
|
417 |
filteredRechargeOperators.add(rechargeOperator);
|
| 416 |
}
|
418 |
}
|
| 417 |
}
|
419 |
}
|
| 418 |
return filteredRechargeOperators;
|
420 |
return filteredRechargeOperators;
|
| 419 |
}
|
421 |
}
|