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

 import com.spice.profitmandi.common.model.CustomInsurancePolicy;
 import com.spice.profitmandi.common.model.CustomOrderItem;
 import com.spice.profitmandi.common.model.CustomPaymentOption;
 import com.spice.profitmandi.common.model.CustomRetailer;
 import com.spice.profitmandi.common.model.FoiBadReturnRequest;
-import com.spice.profitmandi.common.model.GadgetCopsInsuranceModel;
 import com.spice.profitmandi.common.model.GstRate;
 import com.spice.profitmandi.common.model.InsuranceModel;
 import com.spice.profitmandi.common.model.ItemIdQuantityAvailability;
 import com.spice.profitmandi.common.model.PdfModel;
 import com.spice.profitmandi.common.model.PriceModel;
 import com.spice.profitmandi.common.util.Utils;
 import com.spice.profitmandi.dao.entity.catalog.Item;
 import com.spice.profitmandi.dao.entity.catalog.TagListing;
 import com.spice.profitmandi.dao.entity.dtr.InsurancePolicy;
 import com.spice.profitmandi.dao.entity.dtr.PaymentOptionTransaction;
-import com.spice.profitmandi.dao.entity.dtr.PolicyNumberGenerationSequence;
 import com.spice.profitmandi.dao.entity.dtr.Retailer;
 import com.spice.profitmandi.dao.entity.dtr.User;
 import com.spice.profitmandi.dao.entity.fofo.CurrentInventorySnapshot;
 import com.spice.profitmandi.dao.entity.fofo.Customer;
 import com.spice.profitmandi.dao.entity.fofo.CustomerAddress;
 import com.spice.profitmandi.dao.enumuration.dtr.PaymentOptionReferenceType;
 import com.spice.profitmandi.dao.enumuration.fofo.ReturnType;
 import com.spice.profitmandi.dao.enumuration.fofo.ScanType;
 import com.spice.profitmandi.dao.enumuration.fofo.SettlementType;
 import com.spice.profitmandi.dao.repository.catalog.ItemRepository;
+import com.spice.profitmandi.dao.repository.catalog.StateGstRateRepository;
 import com.spice.profitmandi.dao.repository.catalog.TagListingRepository;
 import com.spice.profitmandi.dao.repository.dtr.FofoStoreRepository;
 import com.spice.profitmandi.dao.repository.dtr.InsurancePolicyRepository;
 import com.spice.profitmandi.dao.repository.dtr.InsuranceProviderRepository;
 import com.spice.profitmandi.dao.repository.dtr.PaymentOptionTransactionRepository;
 	private static final Logger LOGGER = LogManager.getLogger(OrderServiceImpl.class);
 	@Autowired
 	@Qualifier("fofoInventoryItemRepository")
 	private InventoryItemRepository inventoryItemRepository;
+	@Autowired
+	private StateGstRateRepository stateGstRateRepository;
 	@Autowired
 	private LiveDemoBillingRespository liveDemoBillingRespository;
 	@Autowired
 	public int createOrder(CreateOrderRequest createOrderRequest, int fofoId, boolean accessoriesDeals)
 			throws ProfitMandiBusinessException {
 		LOGGER.info("fofoId -- {} Order Request -- {}", fofoId, createOrderRequest);
 		CustomCustomer customCustomer = createOrderRequest.getCustomer();
-		if (!StringUtils.isValidEmailAddress(customCustomer.getEmailId())) {
-			LOGGER.error("invalid customer emailId {} ", customCustomer.getEmailId());
-			throw new ProfitMandiBusinessException(ProfitMandiConstants.EMAIL_ID, customCustomer.getEmailId(),
-					"VE_1016");
-		}
-		if (!StringUtils.isValidMobile(customCustomer.getMobileNumber())) {
-			LOGGER.error("invalid customer mobileNumber {} ", customCustomer.getMobileNumber());
-			throw new ProfitMandiBusinessException(ProfitMandiConstants.MOBILE_NUMBER, customCustomer.getMobileNumber(),
-					"VE_1071");
-		}
 		if (!StringUtils.isValidGstNumber(customCustomer.getGstNumber())) {
 			LOGGER.error("invalid customer gstNumber {} ", customCustomer.getGstNumber());
 			throw new ProfitMandiBusinessException(ProfitMandiConstants.CUSTOMER_GST_NUMBER,
 					customCustomer.getGstNumber(), "VE_1072");
+		}
 		} else {
 			documentNumber = this.getInvoiceNumber(fofoId, fofoStoreCode);
+		}
-		Customer customer = this.createAndGetCustomer(customCustomer);
+		Customer customer = customerRepository.selectById(customCustomer.getCustomerId());
-		CustomerAddress customerAddress = this.createCustomerAddress(customCustomer.getAddress(), customer.getId());
+		CustomerAddress customerAddress = customer.getCustomerAddress().stream().filter(x->x.getId()==customCustomer.getCustomerAddressId())
+				.findFirst().get();
 		FofoOrder fofoOrder = this.createAndGetFofoOrder(customer.getId(), customCustomer.getGstNumber(), fofoId,
 				documentNumber, totalAmount, customerAddress.getId());
 		this.createPaymentOptions(fofoOrder, createOrderRequest.getPaymentOptions());
 	private String getFofoStoreCode(int fofoId) throws ProfitMandiBusinessException {
 		FofoStore fofoStore = fofoStoreRepository.selectByRetailerId(fofoId);
 		return fofoStore.getCode();
+	}
-	private CustomerAddress createCustomerAddress(CustomAddress customAddress, int customerId) {
-		CustomerAddress customerAddress = null;
-		try {
-			// CustomAddress customAddress = customCustomer.getAddress();
-			customerAddress = customerAddressRepository.selectByParams(customAddress.getName(),
-					customAddress.getLine1(), customAddress.getLine2(), customAddress.getLandmark(),
-					customAddress.getCity(), customAddress.getPinCode(), customAddress.getState(),
-					customAddress.getPhoneNumber(), customAddress.getCountry(), customerId);
-		} catch (ProfitMandiBusinessException profitMandiBusinessException) {
-			LOGGER.warn("Customer address not found with [{}]", customAddress);
-			customerAddress = new CustomerAddress();
-			this.setCustomerAddress(customerAddress, customAddress);
-			customerAddress.setCustomerId(customerId);
-			customerAddressRepository.persist(customerAddress);
-		}
-		return customerAddress;
-	}
 	private String getValidName(String name) {
 		return name != null ? name : "";
+	}
 	private Set<String> toSerialNumbers(Set<FofoLineItem> fofoLineItems) {
 		Item item = itemMap.get(customFofoOrderItem.getItemId());
 		Map<Integer, GstRate> itemIdStateTaxRateMap = null;
 		Map<Integer, Float> itemIdIgstTaxRateMap = null;
 		if (stateId != null) {
-			itemIdStateTaxRateMap = Utils.getStateTaxRate(new ArrayList<>(itemMap.keySet()), stateId);
+			itemIdStateTaxRateMap = stateGstRateRepository.getStateTaxRate(new ArrayList<>(itemMap.keySet()), stateId);
 		} else {
-			itemIdIgstTaxRateMap = Utils.getIgstTaxRate(new ArrayList<>(itemMap.keySet()));
+			itemIdIgstTaxRateMap = stateGstRateRepository.getIgstTaxRate(new ArrayList<>(itemMap.keySet()));
+		}
 		for (InventoryItem inventoryItem : inventoryItems) {
 			if (stateId == null) {
 				fofoOrderItem.setIgstRate(itemIdIgstTaxRateMap.get(inventoryItem.getItemId()));
 			} else {
 		fofoOrder.setCustomerAddressId(customerAddressId);
 		fofoOrderRepository.persist(fofoOrder);
 		return fofoOrder;
+	}
-	private Customer createAndGetCustomer(CustomCustomer customCustomer) throws ProfitMandiBusinessException {
-		List<Customer> customers = customerRepository.selectAllByMobileNumber(customCustomer.getMobileNumber());
-		List<Customer> filtered = customers.stream()
-				.filter(x -> x.getEmailId().equals(customCustomer.getEmailId())
-						&& x.getFirstName().equals(customCustomer.getFirstName())
-						&& x.getLastName().equals(customCustomer.getLastName()))
-				.collect(Collectors.toList());
-		if (filtered.size() > 0) {
-			return filtered.get(0);
-		}
-		Customer customer = new Customer();
-		customer.setFirstName(customCustomer.getFirstName());
-		customer.setLastName(customCustomer.getLastName());
-		customer.setEmailId(customCustomer.getEmailId());
-		customer.setMobileNumber(customCustomer.getMobileNumber());
-		customerRepository.persist(customer);
-		return customer;
-	}
 	private void validateItemsSerializedNonSerialized(List<Item> items,
 			Map<Integer, CustomFofoOrderItem> customFofoOrderItemMap) throws ProfitMandiBusinessException {
 		List<Integer> invalidItemIdSerialNumbers = new ArrayList<Integer>();
 		List<Integer> itemIdNonSerializedSerialNumbers = new ArrayList<Integer>();
 		for (Item i : items) {
+	}
 	private CustomAddress createCustomAddress(CustomerAddress customerAddress) {
 		CustomAddress customAddress = new CustomAddress();
 		customAddress.setName(customerAddress.getName());
+		customAddress.setLastName(customerAddress.getLastName());
 		customAddress.setLine1(customerAddress.getLine1());
 		customAddress.setLine2(customerAddress.getLine2());
 		customAddress.setLandmark(customerAddress.getLandmark());
 		customAddress.setCity(customerAddress.getCity());
 		customAddress.setPinCode(customerAddress.getPinCode());
+			}
+		}
 		List<Integer> itemIds = fofoOrderItems.stream().map(x -> x.getItemId()).collect(Collectors.toList());
 		final Map<Integer, GstRate> gstRates;
 		if (stateId != null) {
-			gstRates = Utils.getStateTaxRate(itemIds, stateId);
+			gstRates = stateGstRateRepository.getStateTaxRate(itemIds, stateId);
 		} else {
 			gstRates = new HashMap<>();
-			Utils.getIgstTaxRate(itemIds).entrySet().forEach(x -> {
+			stateGstRateRepository.getIgstTaxRate(itemIds).entrySet().forEach(x -> {
 				GstRate gstRate = new GstRate();
 				gstRate.setIgstRate(x.getValue());
 				gstRate.setCgstRate(0f);
 				gstRate.setSgstRate(0f);
 				gstRates.put(x.getKey(), gstRate);

Subversion Repositories SmartDukaan

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