Subversion Repositories SmartDukaan

Rev

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

Rev 27521 Rev 27522
Line 241... Line 241...
241
	private PaymentOptionTransactionRepository paymentOptionTransactionRepository;
241
	private PaymentOptionTransactionRepository paymentOptionTransactionRepository;
242
 
242
 
243
	@Autowired
243
	@Autowired
244
	private SchemeService schemeService;
244
	private SchemeService schemeService;
245
 
245
 
-
 
246
	private static final List<Integer> orderIdsConsumed = new ArrayList<>();
-
 
247
	
246
	@Autowired
248
	@Autowired
247
	@Qualifier("fofoInventoryService")
249
	@Qualifier("fofoInventoryService")
248
	private InventoryService inventoryService;
250
	private InventoryService inventoryService;
249
 
251
 
250
	@Autowired
252
	@Autowired
Line 616... Line 618...
616
								.selectByInventoryItemId(inventoryItem.getId());
618
								.selectByInventoryItemId(inventoryItem.getId());
617
						Optional<ScanRecord> scanRecord = scanRecords.stream().filter(x -> x.getOrderId() != 0)
619
						Optional<ScanRecord> scanRecord = scanRecords.stream().filter(x -> x.getOrderId() != 0)
618
								.findFirst();
620
								.findFirst();
619
						if (scanRecord.isPresent()) {
621
						if (scanRecord.isPresent()) {
620
							FofoOrder fofoOrder = fofoOrderRepository.selectByOrderId(scanRecord.get().getOrderId());
622
							FofoOrder fofoOrder = fofoOrderRepository.selectByOrderId(scanRecord.get().getOrderId());
-
 
623
							orderIdsConsumed.add(fofoOrder.getId());
621
							return this.getInvoicePdfModel(fofoOrder);
624
							return this.getInvoicePdfModel(fofoOrder);
622
						} else {
625
						} else {
623
							throw new ProfitMandiBusinessException("Serial Number", serialNumber,
626
							throw new ProfitMandiBusinessException("Serial Number", serialNumber,
624
									"Serial Number returned by partner, but in transit");
627
									"Serial Number returned by partner, but in transit");
625
						}
628
						}
Line 632... Line 635...
632
					int randomDays = random.ints(2, 15).findFirst().getAsInt();
635
					int randomDays = random.ints(2, 15).findFirst().getAsInt();
633
					LocalDateTime saleDate = grnDate.plusDays(randomDays);
636
					LocalDateTime saleDate = grnDate.plusDays(randomDays);
634
					if(saleDate.isAfter(LocalDate.now().atStartOfDay())) {
637
					if(saleDate.isAfter(LocalDate.now().atStartOfDay())) {
635
						saleDate = LocalDateTime.now().minusDays(2);
638
						saleDate = LocalDateTime.now().minusDays(2);
636
					}
639
					}
-
 
640
					Random offsetRandom = new Random();
-
 
641
					int offset = offsetRandom.ints(2, 100).findFirst().getAsInt();
637
					FofoOrder fofoOrder = fofoOrderRepository.selectFirstOrderAfterDate(saleDate);
642
					FofoOrder fofoOrder = fofoOrderRepository.selectFirstOrderAfterDate(saleDate, offset);
-
 
643
					while (orderIdsConsumed.contains(fofoOrder.getId())) {
-
 
644
						Random offsetRandom2 = new Random();
-
 
645
						int offset2 = offsetRandom2.ints(2, 100).findFirst().getAsInt();
-
 
646
						FofoOrder fofoOrder2 = fofoOrderRepository.selectFirstOrderAfterDate(saleDate, offset2);
-
 
647
						if(fofoOrder2 != null) {
-
 
648
							fofoOrder = fofoOrder2;
-
 
649
						}
-
 
650
					}
638
					PdfModel pdfModel = this.getInvoicePdfModel(fofoOrder.getId());
651
					PdfModel pdfModel = this.getInvoicePdfModel(fofoOrder.getId());
639
					this.modifyDummyModel(fofoOrder, pdfModel, itemId, serialNumber);
652
					this.modifyDummyModel(fofoOrder, pdfModel, itemId, serialNumber);
640
					return pdfModel;
653
					return pdfModel;
641
 
654
 
642
				}
655
				}