Subversion Repositories SmartDukaan

Rev

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

Rev 23427 Rev 23433
Line 421... Line 421...
421
		
421
		
422
		Customer customer = this.createAndGetCustomer(customCustomer);
422
		Customer customer = this.createAndGetCustomer(customCustomer);
423
		
423
		
424
		CustomerAddress customerAddress = this.createCustomerAddress(customCustomer.getAddress(), customer.getId());
424
		CustomerAddress customerAddress = this.createCustomerAddress(customCustomer.getAddress(), customer.getId());
425
		
425
		
426
		FofoOrder fofoOrder = this.createAndGetFofoOrder(customer.getId(), customCustomer.getGstNumber(), fofoId, invoiceNumberGenerationSequence, totalAmount - prebookingOrdersTotalAmount, customerAddress.getId());
426
		FofoOrder fofoOrder = this.createAndGetFofoOrder(customer.getId(), customCustomer.getGstNumber(), fofoId, invoiceNumberGenerationSequence, totalAmount, customerAddress.getId());
427
		
427
		
428
		this.createPaymentOptions(fofoOrder.getId(), createOrderRequest.getPaymentOptions());
428
		this.createPaymentOptions(fofoOrder.getId(), createOrderRequest.getPaymentOptions());
429
		
429
		
430
		this.processPrebookingOrders(fofoOrder.getId(), prebookingOrders, prebookingOrderItemIdQuantityMap, itemIdPrebookingListingMap);
430
		this.processPrebookingOrders(fofoId, fofoOrder.getId(), prebookingOrders, prebookingOrderItemIdQuantityMap, itemIdPrebookingListingMap);
431
		
431
		
432
		int retailerAddressId = retailerRegisteredAddressRepository.selectAddressIdByRetailerId(fofoId);
432
		int retailerAddressId = retailerRegisteredAddressRepository.selectAddressIdByRetailerId(fofoId);
433
		
433
		
434
		Address retailerAddress = addressRepository.selectById(retailerAddressId);
434
		Address retailerAddress = addressRepository.selectById(retailerAddressId);
435
		
435
		
Line 512... Line 512...
512
			}
512
			}
513
		}
513
		}
514
		return totalAmount;
514
		return totalAmount;
515
	}
515
	}
516
	
516
	
517
	private void processPrebookingOrders(int orderId, List<PrebookingOrder> prebookingOrders, Map<Integer, Integer> prebookingOrderItemIdQuantityMap, Map<Integer, PrebookingListing> itemIdPrebookingListingMap) {
517
	private void processPrebookingOrders(int fofoId, int orderId, List<PrebookingOrder> prebookingOrders, Map<Integer, Integer> prebookingOrderItemIdQuantityMap, Map<Integer, PrebookingListing> itemIdPrebookingListingMap) 
-
 
518
	throws ProfitMandiBusinessException{
518
		//Map<Integer, PrebookingOrder> prebookingOrderIdPrebookingOrderMap = this.prebookingOrdersToPrebookingOrderIdPrebookingOrderMap(prebookingOrders);
519
		//Map<Integer, PrebookingOrder> prebookingOrderIdPrebookingOrderMap = this.prebookingOrdersToPrebookingOrderIdPrebookingOrderMap(prebookingOrders);
519
		
520
		
520
		for(PrebookingOrder prebookingOrder : prebookingOrders) {
521
		for(PrebookingOrder prebookingOrder : prebookingOrders) {
521
			if(prebookingOrder.getCompleteTimestamp() == null) {
522
			if(prebookingOrder.getCompleteTimestamp() == null) {
522
				int requestedQuantity = prebookingOrderItemIdQuantityMap.get(prebookingOrder.getItemId());
523
				int requestedQuantity = prebookingOrderItemIdQuantityMap.get(prebookingOrder.getItemId());
Line 538... Line 539...
538
				prebookingOrderItem.setItemId(prebookingOrder.getItemId());
539
				prebookingOrderItem.setItemId(prebookingOrder.getItemId());
539
				PrebookingListing prebookingListing = itemIdPrebookingListingMap.get(prebookingOrder.getItemId());
540
				PrebookingListing prebookingListing = itemIdPrebookingListingMap.get(prebookingOrder.getItemId());
540
				prebookingOrderItem.setAdvanceAmount(prebookingListing.getAdvanceAmount());
541
				prebookingOrderItem.setAdvanceAmount(prebookingListing.getAdvanceAmount());
541
				
542
				
542
				prebookingOrderItemRepository.persist(prebookingOrderItem);
543
				prebookingOrderItemRepository.persist(prebookingOrderItem);
-
 
544
				
-
 
545
				walletService.addAmountToWallet(fofoId, prebookingOrder.getId(), WalletReferenceType.PREBOOKING_ORDER, "Advance Amount credited for Prebooking Order", prebookingListing.getAdvanceAmount());
543
			}
546
			}
544
			
547
			
545
		}
548
		}
546
	}
549
	}
547
	
550