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

         } else {
             documentNumber = this.getInvoiceNumber(fofoId, fofoStoreCode);
+        }
+        CustomerAddress customerAddress = null;
+        if (customCustomer.getCustomerAddressId() != 0) {
-        CustomerAddress customerAddress = customer.getCustomerAddress().stream().filter(x -> x.getId() == customCustomer.getCustomerAddressId()).findFirst().get();
+            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());
+        FofoOrder fofoOrder = this.createAndGetFofoOrder(customer.getId(), customCustomer.getGstNumber(), fofoId, documentNumber, totalAmount, customCustomer.getCustomerAddressId());
         this.createPaymentOptions(fofoOrder, createOrderRequest.getPaymentOptions());
         int retailerAddressId = retailerRegisteredAddressRepository.selectAddressIdByRetailerId(fofoId);
         Address retailerAddress = addressRepository.selectById(retailerAddressId);
         Integer stateId = null;
-        if (customerAddress.getState().equals(retailerAddress.getState())) {
+        if (customerAddress != null && customerAddress.getState() != null && customerAddress.getState().equals(retailerAddress.getState())) {
             try {
                 State state = stateRepository.selectByName(customerAddress.getState());
                 stateId = Long.valueOf(state.getId()).intValue();
             } catch (Exception e) {
                 LOGGER.error("Unable to get state rates");
             customFofoOrderItem.setSgstAmount(sgstAmount);
             customFofoOrderItem.setHsnCode(fofoOrderItem.getHsnCode());
             customerFofoOrderItems.add(customFofoOrderItem);
+        }
         pdfModel.setOrderItems(customerFofoOrderItems);
+        String customerAddressStateCode = "";
+        LOGGER.error("pdfModel.getCustomer().getAddress().getState() {}", pdfModel.getCustomer().getAddress().getState());
+        LOGGER.error("pdfModel.getCustomer {}", pdfModel.getCustomer());
         String partnerAddressStateCode = stateRepository.selectByName(pdfModel.getRetailer().getAddress().getState()).getCode();
+        if (pdfModel.getCustomer() != null && pdfModel.getCustomer().getAddress() != null &&
+                pdfModel.getCustomer().getAddress().getState() != null &&
+                !pdfModel.getCustomer().getAddress().getState().trim().isEmpty()) {
-        String customerAddressStateCode = stateRepository.selectByName(pdfModel.getCustomer().getAddress().getState()).getCode();
+            customerAddressStateCode = stateRepository.selectByName(pdfModel.getCustomer().getAddress().getState()).getCode();
+        }
         pdfModel.setPartnerAddressStateCode(partnerAddressStateCode);
+        if (!customerAddressStateCode.equals("")) {
-        pdfModel.setCustomerAddressStateCode(customerAddressStateCode);
+            pdfModel.setCustomerAddressStateCode(customerAddressStateCode);
+        }
         pdfModel.setCancelled(fofoOrder.getCancelledTimestamp() != null);
         List<String> tncs = new ArrayList<>();
         tncs.add("I agree that goods received are in good working condition");
         tncs.add("Goods once sold cannot be exchanged or taken back");
         tncs.add("Warranty for the goods received by me is the responsibility of the manufacturer only.");
         customCustomer.setFirstName(customer.getFirstName());
         customCustomer.setLastName(customer.getLastName());
         customCustomer.setEmailId(customer.getEmailId());
         customCustomer.setMobileNumber(customer.getMobileNumber());
         customCustomer.setGstNumber(fofoOrder.getCustomerGstNumber());
+        if (fofoOrder.getCustomerAddressId() != 0) {
-        CustomerAddress customerAddress = customerAddressRepository.selectById(fofoOrder.getCustomerAddressId());
+            CustomerAddress customerAddress = customerAddressRepository.selectById(fofoOrder.getCustomerAddressId());
-        customCustomer.setAddress(this.createCustomAddress(customerAddress));
+            customCustomer.setAddress(this.createCustomAddress(customerAddress));
+        } else {
+            customCustomer.setAddress(this.createCustomAddressWithoutId(customCustomer));
+        }
         return customCustomer;
+    }
     @Override
     public InvoicePdfModel getInvoicePdfModel(int fofoId, int orderId) throws ProfitMandiBusinessException {
         FofoOrder fofoOrder = fofoOrderRepository.selectByFofoIdAndOrderId(fofoId, orderId);
     private void createPaymentOptions(FofoOrder fofoOrder, Set<CustomPaymentOption> customPaymentOptions) throws ProfitMandiBusinessException {
         for (CustomPaymentOption customPaymentOption : customPaymentOptions) {
             if (customPaymentOption.getAmount() > 0) {
                 PaymentOptionTransaction paymentOptionTransaction = new PaymentOptionTransaction();
+                LOGGER.error("error", fofoOrder.getId());
                 paymentOptionTransaction.setReferenceId(fofoOrder.getId());
                 paymentOptionTransaction.setPaymentOptionId(customPaymentOption.getPaymentOptionId());
                 paymentOptionTransaction.setReferenceType(PaymentOptionReferenceType.ORDER);
                 paymentOptionTransaction.setAmount(customPaymentOption.getAmount());
                 paymentOptionTransaction.setFofoId(fofoOrder.getFofoId());
         customAddress.setCountry(customerAddress.getCountry());
         customAddress.setPhoneNumber(customerAddress.getPhoneNumber());
         return customAddress;
+    }
+    private CustomAddress createCustomAddressWithoutId(CustomCustomer customerAddress) {
+        CustomAddress customAddress = new CustomAddress();
+        customAddress.setName(customerAddress.getFirstName());
+        customAddress.setLastName(customerAddress.getLastName());
+        customAddress.setLine1("");
+        customAddress.setLine2("");
+        customAddress.setLandmark("");
+        customAddress.setCity("");
+        customAddress.setPinCode("");
+        customAddress.setState("");
+        customAddress.setCountry("");
+        customAddress.setPhoneNumber(customerAddress.getMobileNumber());
+        return customAddress;
+    }
     private void validatePaymentOptionsAndTotalAmount(Set<CustomPaymentOption> customPaymentOptions, float totalAmount) throws ProfitMandiBusinessException {
         Set<Integer> paymentOptionIds = new HashSet<>();
         float calculatedAmount = 0;
         for (CustomPaymentOption customPaymentOption : customPaymentOptions) {
         if (!customerAddress.getState().equalsIgnoreCase(customCustomer.getAddress().getState())) {
             List<FofoOrderItem> fofoOrderItems = fofoOrderItemRepository.selectByOrderId(fofoOrder.getId());
             resetTaxation(fofoOrder.getFofoId(), customerAddress, fofoOrderItems);
+        }
         this.setCustomerAddress(customerAddress, customCustomer.getAddress());
-        customerAddressRepository.persist(customerAddress);
         fofoOrder.setCustomerGstNumber(customCustomer.getGstNumber());
+    }
     private void resetTaxation(int fofoId, CustomerAddress customerAddress, List<FofoOrderItem> fofoOrderItems) throws ProfitMandiBusinessException {
         int retailerAddressId = retailerRegisteredAddressRepository.selectAddressIdByRetailerId(fofoId);

Subversion Repositories SmartDukaan

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