Subversion Repositories SmartDukaan

Rev

Rev 28737 | Rev 28969 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 28737 Rev 28749
Line 342... Line 342...
342
		if (scheme.getExpireTimestamp() != null) {
342
		if (scheme.getExpireTimestamp() != null) {
343
			throw new ProfitMandiBusinessException(ProfitMandiConstants.EXPIRE_TIMESTAMP, scheme.getExpireTimestamp(),
343
			throw new ProfitMandiBusinessException(ProfitMandiConstants.EXPIRE_TIMESTAMP, scheme.getExpireTimestamp(),
344
					"SCHM_1008");
344
					"SCHM_1008");
345
		}
345
		}
346
		scheme.setExpireTimestamp(LocalDateTime.now());
346
		scheme.setExpireTimestamp(LocalDateTime.now());
-
 
347
		if(expiryTime.isAfter(scheme.getEndDateTime())) {
-
 
348
			throw new ProfitMandiBusinessException(ProfitMandiConstants.EXPIRE_TIMESTAMP, scheme.getExpireTimestamp(),
-
 
349
					"End Date cant be extended during expiry");
-
 
350
		}
347
		scheme.setEndDateTime(expiryTime);
351
		scheme.setEndDateTime(expiryTime);
348
		schemeRepository.persist(scheme);
352
		schemeRepository.persist(scheme);
349
	}
353
	}
350
 
354
 
351
	private Map<Integer, Scheme> toSchemeIdSchemeMap(List<Scheme> schemes) {
355
	private Map<Integer, Scheme> toSchemeIdSchemeMap(List<Scheme> schemes) {
Line 491... Line 495...
491
				return 0;
495
				return 0;
492
			} else {
496
			} else {
493
				schemeInOut.setStatus(SchemePayoutStatus.CREDITED);
497
				schemeInOut.setStatus(SchemePayoutStatus.CREDITED);
494
				if (scheme.getType().equals(SchemeType.IN)) {
498
				if (scheme.getType().equals(SchemeType.IN)) {
495
					schemeInOut.setStatusDescription("Credited for GRN of IMEI#" + inventoryItem.getSerialNumber());
499
					schemeInOut.setStatusDescription("Credited for GRN of IMEI#" + inventoryItem.getSerialNumber());
496
				} else if(scheme.getType().equals(SchemeType.OUT)){
500
				} else if(scheme.getType().equals(SchemeType.OUT) || scheme.getType().equals(SchemeType.CATEGORY)){
497
					schemeInOut.setStatusDescription("Credited for sale of IMEI#" + inventoryItem.getSerialNumber());
501
					schemeInOut.setStatusDescription("Credited for sale of IMEI#" + inventoryItem.getSerialNumber());
498
				}
502
				}
499
				schemeInOut.setCreditTimestamp(LocalDateTime.now());
503
				schemeInOut.setCreditTimestamp(LocalDateTime.now());
500
			}
504
			}
501
		}
505
		}
Line 578... Line 582...
578
				fofoOrder.getCreateTimestamp(), false);
582
				fofoOrder.getCreateTimestamp(), false);
579
		allActiveSchemes.addAll(schemeRepository.selectActiveAll(SchemeType.ACTIVATION, partnerType,
583
		allActiveSchemes.addAll(schemeRepository.selectActiveAll(SchemeType.ACTIVATION, partnerType,
580
				fofoOrder.getCreateTimestamp(), false));
584
				fofoOrder.getCreateTimestamp(), false));
581
		allActiveSchemes.addAll(schemeRepository.selectActiveAll(SchemeType.INVESTMENT, partnerType,
585
		allActiveSchemes.addAll(schemeRepository.selectActiveAll(SchemeType.INVESTMENT, partnerType,
582
				fofoOrder.getCreateTimestamp(), false));
586
				fofoOrder.getCreateTimestamp(), false));
-
 
587
		allActiveSchemes.addAll(schemeRepository.selectActiveAll(SchemeType.CATEGORY, partnerType,
-
 
588
				fofoOrder.getCreateTimestamp(), false));
583
 
589
 
584
		for (InventoryItem inventoryItem : inventoryItems) {
590
		for (InventoryItem inventoryItem : inventoryItems) {
585
			float itemCashback = 0;
591
			float itemCashback = 0;
586
			Set<Integer> schemeIds = new HashSet<>(
592
			Set<Integer> schemeIds = new HashSet<>(
587
					schemeItemRepository.selectSchemeIdByItemId(inventoryItem.getItemId()));
593
					schemeItemRepository.selectSchemeIdByItemId(inventoryItem.getItemId()));
Line 769... Line 775...
769
				}
775
				}
770
			}
776
			}
771
 
777
 
772
		}
778
		}
773
		int fofoId = inventoryItems.get(0).getFofoId();
779
		int fofoId = inventoryItems.get(0).getFofoId();
774
		WalletReferenceType walletReferenceType = schemeType.equals(SchemeType.OUT) ? WalletReferenceType.SCHEME_OUT
780
		WalletReferenceType walletReferenceType = schemeType.equals(SchemeType.OUT) || schemeType.equals(SchemeType.CATEGORY) ? WalletReferenceType.SCHEME_OUT
775
				: schemeType.equals(SchemeType.INVESTMENT) ? WalletReferenceType.INVESTMENT_PAYOUT
781
				: schemeType.equals(SchemeType.INVESTMENT) ? WalletReferenceType.INVESTMENT_PAYOUT
776
						: WalletReferenceType.ACTIVATION_SCHEME;
782
						: WalletReferenceType.ACTIVATION_SCHEME;
777
		if (amountToRollback > 0) {
783
		if (amountToRollback > 0) {
778
			// TODO//
784
			// TODO//
779
			walletService.rollbackAmountFromWallet(fofoId, amountToRollback, reversalReference, walletReferenceType,
785
			walletService.rollbackAmountFromWallet(fofoId, amountToRollback, reversalReference, walletReferenceType,