WebSVN – SmartDukaan – Diff – /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java

 		Map<Integer, CustomFofoOrderItem> itemIdCustomFofoOrderItemMap = new HashMap<>();
 		Map<Integer, Float> lineItemPrice = new HashMap<>(); // this is for pricing error
 		float totalAmount = 0;
+		boolean noGST = false;
 		for (CustomFofoOrderItem customFofoOrderItem : createOrderRequest.getFofoOrderItems()) {
 			// itemIds.add(customFofoOrderItem.getItemId());
 			Set<String> serialNumbers = this
 					.serialNumberDetailsToSerialNumbers(customFofoOrderItem.getSerialNumberDetails());
 			if (!serialNumbers.isEmpty() && customFofoOrderItem.getQuantity() != serialNumbers.size()) {
 		Map<String, Float> insuranceSerialNumberSaleAmount = new HashMap<>();
 		Map<String, String> serialNumberModelName = new HashMap<>();
 		Map<String, String> serialNumberBrand = new HashMap<>();
 		for (CustomFofoOrderItem customFofoOrderItem : createOrderRequest.getFofoOrderItems()) {
 			Item item = itemMap.get(customFofoOrderItem.getItemId());
+			noGST = item.getHsnCode().equals("NOGST");
 			if (item.getType().equals(ItemType.SERIALIZED)) {
 				for (SerialNumberDetail serialNumberDetail : customFofoOrderItem.getSerialNumberDetails()) {
 					serialNumbers.add(serialNumberDetail.getSerialNumber());
 					if (serialNumberDetail.isInsurance()) {
 						insuranceSerialNumberItemPrice.put(serialNumberDetail.getSerialNumber(),
 		} else {
 			this.validateMopPrice(itemIdMopPriceMap, itemIdCustomFofoOrderItemMap);
+		}
 		String fofoStoreCode = this.getFofoStoreCode(fofoId);
-		InvoiceNumberGenerationSequence invoiceNumberGenerationSequence = this
+		InvoiceNumberGenerationSequence invoiceNumberGenerationSequence = null;
+		String documentNumber = null;
+		if(noGST) {
-				.createAndGetInvoiceNumberGenerationSequence(fofoId, fofoStoreCode);
+			documentNumber = this.getSecurityDepositNumber(fofoId, fofoStoreCode);
+		} else {
+			documentNumber = this.getInvoiceNumber(fofoId, fofoStoreCode);
+		}
 		Customer customer = this.createAndGetCustomer(customCustomer);
 		CustomerAddress customerAddress = this.createCustomerAddress(customCustomer.getAddress(), customer.getId());
 		FofoOrder fofoOrder = this.createAndGetFofoOrder(customer.getId(), customCustomer.getGstNumber(), fofoId,
-				invoiceNumberGenerationSequence, totalAmount, customerAddress.getId());
+				documentNumber, totalAmount, customerAddress.getId());
 		this.createPaymentOptions(fofoOrder, createOrderRequest.getPaymentOptions());
 		int retailerAddressId = retailerRegisteredAddressRepository.selectAddressIdByRetailerId(fofoId);
 		schemeService.processSchemeOut(fofoOrder.getId(), fofoId);
 		return fofoOrder.getId();
+	}
+	private String getSecurityDepositNumber(int fofoId,
+			String fofoStoreCode) {
+		InvoiceNumberGenerationSequence invoiceNumberGenerationSequence = null;
+		try {
+			invoiceNumberGenerationSequence = invoiceNumberGenerationSequenceRepository.selectByFofoId(fofoId);
+			invoiceNumberGenerationSequence.setChallanNumberSequence(invoiceNumberGenerationSequence.getChallanNumberSequence()+ 1);
+		} catch (ProfitMandiBusinessException profitMandiBusinessException) {
+			invoiceNumberGenerationSequence = new InvoiceNumberGenerationSequence();
+			invoiceNumberGenerationSequence.setFofoId(fofoId);
+			invoiceNumberGenerationSequence.setPrefix(fofoStoreCode);
+			invoiceNumberGenerationSequence.setChallanNumberSequence(1);
+		}
+		invoiceNumberGenerationSequenceRepository.persist(invoiceNumberGenerationSequence);
+		return invoiceNumberGenerationSequence.getPrefix() + "/SEC" + invoiceNumberGenerationSequence.getChallanNumberSequence();
+	}
 	private Set<String> serialNumberDetailsToSerialNumbers(Set<SerialNumberDetail> serialNumberDetails) {
 		Set<String> serialNumbers = new HashSet<>();
 		for (SerialNumberDetail serialNumberDetail : serialNumberDetails) {
 			if (serialNumberDetail.getSerialNumber() != null && !serialNumberDetail.getSerialNumber().isEmpty()) {
 				serialNumbers.add(serialNumberDetail.getSerialNumber());
+			}
+		}
+	}
 	private FofoOrder createAndGetFofoOrder(int customerId, String customerGstNumber, int fofoId,
-			InvoiceNumberGenerationSequence invoiceNumberGenerationSequence, float totalAmount, int customerAddressId) {
+			String documentNumber, float totalAmount, int customerAddressId) {
 		FofoOrder fofoOrder = new FofoOrder();
 		fofoOrder.setCustomerGstNumber(customerGstNumber);
 		fofoOrder.setCustomerId(customerId);
 		fofoOrder.setFofoId(fofoId);
-		fofoOrder.setInvoiceNumber(
+		fofoOrder.setInvoiceNumber(documentNumber);
-				invoiceNumberGenerationSequence.getPrefix() + "/" + invoiceNumberGenerationSequence.getSequence());
 		fofoOrder.setTotalAmount(totalAmount);
 		fofoOrder.setCustomerAddressId(customerAddressId);
 		fofoOrderRepository.persist(fofoOrder);
 		return fofoOrder;
+	}
 		customer.setMobileNumber(customCustomer.getMobileNumber());
 		customerRepository.persist(customer);
 		return customer;
+	}
-	private InvoiceNumberGenerationSequence createAndGetInvoiceNumberGenerationSequence(int fofoId,
+	private String getInvoiceNumber(int fofoId,
 			String fofoStoreCode) {
 		InvoiceNumberGenerationSequence invoiceNumberGenerationSequence = null;
 		try {
 			invoiceNumberGenerationSequence = invoiceNumberGenerationSequenceRepository.selectByFofoId(fofoId);
 			invoiceNumberGenerationSequence.setSequence(invoiceNumberGenerationSequence.getSequence() + 1);
 			invoiceNumberGenerationSequence.setFofoId(fofoId);
 			invoiceNumberGenerationSequence.setPrefix(fofoStoreCode);
 			invoiceNumberGenerationSequence.setSequence(1);
+		}
 		invoiceNumberGenerationSequenceRepository.persist(invoiceNumberGenerationSequence);
-		return invoiceNumberGenerationSequence;
+		return invoiceNumberGenerationSequence.getPrefix() + "/SEC" + invoiceNumberGenerationSequence.getChallanNumberSequence();
+	}
 	private void validateItemsSerializedNonSerialized(List<Item> items,
 			Map<Integer, CustomFofoOrderItem> customFofoOrderItemMap) throws ProfitMandiBusinessException {
 		List<Integer> invalidItemIdSerialNumbers = new ArrayList<Integer>();

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java – Rev 24215 → 24226