| Line 520... |
Line 520... |
| 520 |
//Filter scheme types ACTIVATION/SPECIAL SUPPORT/SELLOUT from extending
|
520 |
//Filter scheme types ACTIVATION/SPECIAL SUPPORT/SELLOUT from extending
|
| 521 |
schemes = schemes.stream().filter(x -> !EXCLUDE_EXTEND_SCHEMES.contains(x.getType())).collect(Collectors.toList());
|
521 |
schemes = schemes.stream().filter(x -> !EXCLUDE_EXTEND_SCHEMES.contains(x.getType())).collect(Collectors.toList());
|
| 522 |
if (schemes.size() > 0) {
|
522 |
if (schemes.size() > 0) {
|
| 523 |
for (Scheme scheme : schemes) {
|
523 |
for (Scheme scheme : schemes) {
|
| 524 |
if (scheme.getExpireTimestamp() == null) {
|
524 |
if (scheme.getExpireTimestamp() == null) {
|
| - |
|
525 |
if (extendDatetime.isBefore(scheme.getStartDateTime())) {
|
| - |
|
526 |
throw new ProfitMandiBusinessException(ProfitMandiConstants.END_DATE,
|
| - |
|
527 |
extendDatetime.toString(), "End date cannot be before start date");
|
| - |
|
528 |
}
|
| 525 |
scheme.setEndDateTime(extendDatetime);
|
529 |
scheme.setEndDateTime(extendDatetime);
|
| 526 |
schemeRepository.persist(scheme);
|
530 |
schemeRepository.persist(scheme);
|
| 527 |
}
|
531 |
}
|
| 528 |
}
|
532 |
}
|
| 529 |
model.addAttribute("response1", mvcResponseSender.createResponseString(true));
|
533 |
model.addAttribute("response1", mvcResponseSender.createResponseString(true));
|
| Line 591... |
Line 595... |
| 591 |
|
595 |
|
| 592 |
@RequestParam(name = ProfitMandiConstants.SCHEME_ID) int schemeId,
|
596 |
@RequestParam(name = ProfitMandiConstants.SCHEME_ID) int schemeId,
|
| 593 |
@RequestBody LocalDateTime extendDatetime, Model model) throws Exception {
|
597 |
@RequestBody LocalDateTime extendDatetime, Model model) throws Exception {
|
| 594 |
Scheme scheme = schemeRepository.selectById(schemeId);
|
598 |
Scheme scheme = schemeRepository.selectById(schemeId);
|
| 595 |
if ((!(scheme.getActiveTimestamp() == null)) && scheme.getExpireTimestamp() == null) {
|
599 |
if ((!(scheme.getActiveTimestamp() == null)) && scheme.getExpireTimestamp() == null) {
|
| - |
|
600 |
if (extendDatetime.isBefore(scheme.getStartDateTime())) {
|
| - |
|
601 |
throw new ProfitMandiBusinessException(ProfitMandiConstants.END_DATE,
|
| - |
|
602 |
extendDatetime.toString(), "End date cannot be before start date");
|
| - |
|
603 |
}
|
| 596 |
scheme.setEndDateTime(extendDatetime);
|
604 |
scheme.setEndDateTime(extendDatetime);
|
| 597 |
schemeRepository.persist(scheme);
|
605 |
schemeRepository.persist(scheme);
|
| 598 |
model.addAttribute("response1", mvcResponseSender.createResponseString(true));
|
606 |
model.addAttribute("response1", mvcResponseSender.createResponseString(true));
|
| 599 |
return "response";
|
607 |
return "response";
|
| 600 |
}
|
608 |
}
|