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



 
        CustomerAddress customerAddress = null;
        if (customCustomer.getCustomerAddressId() != 0) {
            customerAddress = customer.getCustomerAddress().stream().filter(x -> x.getId() == customCustomer.getCustomerAddressId()).findFirst().get();
        }
        FofoOrder fofoOrder = this.createAndGetFofoOrder(customer.getId(), customCustomer.getGstNumber(), fofoId, documentNumber, totalAmount, customCustomer.getCustomerAddressId(), createOrderRequest.getPoId());
 
        this.createPaymentOptions(fofoOrder, createOrderRequest.getPaymentOptions());
 
        int retailerAddressId = retailerRegisteredAddressRepository.selectAddressIdByRetailerId(fofoId);
 

                PendingOrderItem poi = pendingOrderItemRepository.selectById(cfoi.getPoiId());
                poi.setStatus(OrderStatus.BILLED);
                poi.setBilledTimestamp(LocalDateTime.now());
            }
            po.setStatus(OrderStatus.BILLED);
 
        }
        //Process scratch
        this.processScratchOffer(fofoOrder);
 
//        persist the data of upgrade offer table

            ProfitMandiBusinessException {
        FofoOrderItem fofoOrderItem = new FofoOrderItem();
        fofoOrderItem.setItemId(customFofoOrderItem.getItemId());
        fofoOrderItem.setQuantity(customFofoOrderItem.getQuantity());
        fofoOrderItem.setSellingPrice(customFofoOrderItem.getSellingPrice());
        fofoOrderItem.setPendingOrderItemId(customFofoOrderItem.getPoiId());
        fofoOrderItem.setOrderId(fofoOrderId);
        TagListing tl = tagListingRepository.selectByItemId(customFofoOrderItem.getItemId());
        // In case listing gets removed rebill it using the selling price
        if (tl != null) {
            fofoOrderItem.setDp(tl.getSellingPrice());

            }
        }
    }
 
    private FofoOrder createAndGetFofoOrder(int customerId, String customerGstNumber, int fofoId, String
            documentNumber, float totalAmount, int customerAddressId, int poId) {
        FofoOrder fofoOrder = new FofoOrder();
        fofoOrder.setCustomerGstNumber(customerGstNumber);
        fofoOrder.setCustomerId(customerId);
        fofoOrder.setFofoId(fofoId);
        fofoOrder.setPendingOrderId(poId);
        fofoOrder.setInvoiceNumber(documentNumber);
        fofoOrder.setTotalAmount(totalAmount);
        fofoOrder.setCustomerAddressId(customerAddressId);
        fofoOrderRepository.persist(fofoOrder);
        return fofoOrder;

Subversion Repositories SmartDukaan

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

Rev 34207		Rev 34287
Line 612...		Line 612...
612		612
613	`CustomerAddress customerAddress = null;`	613	`CustomerAddress customerAddress = null;`
614	`if (customCustomer.getCustomerAddressId() != 0) {`	614	`if (customCustomer.getCustomerAddressId() != 0) {`
615	`customerAddress = customer.getCustomerAddress().stream().filter(x -> x.getId() == customCustomer.getCustomerAddressId()).findFirst().get();`	615	`customerAddress = customer.getCustomerAddress().stream().filter(x -> x.getId() == customCustomer.getCustomerAddressId()).findFirst().get();`
616	`}`	616	`}`
617	`FofoOrder fofoOrder = this.createAndGetFofoOrder(customer.getId(), customCustomer.getGstNumber(), fofoId, documentNumber, totalAmount, customCustomer.getCustomerAddressId());`	617	`FofoOrder fofoOrder = this.createAndGetFofoOrder(customer.getId(), customCustomer.getGstNumber(), fofoId, documentNumber, totalAmount, customCustomer.getCustomerAddressId(), createOrderRequest.getPoId());`
618		618
619	`this.createPaymentOptions(fofoOrder, createOrderRequest.getPaymentOptions());`	619	`this.createPaymentOptions(fofoOrder, createOrderRequest.getPaymentOptions());`
620		620
621	`int retailerAddressId = retailerRegisteredAddressRepository.selectAddressIdByRetailerId(fofoId);`	621	`int retailerAddressId = retailerRegisteredAddressRepository.selectAddressIdByRetailerId(fofoId);`
622		622
Line 697...		Line 697...
697	`PendingOrderItem poi = pendingOrderItemRepository.selectById(cfoi.getPoiId());`	697	`PendingOrderItem poi = pendingOrderItemRepository.selectById(cfoi.getPoiId());`
698	`poi.setStatus(OrderStatus.BILLED);`	698	`poi.setStatus(OrderStatus.BILLED);`
699	`poi.setBilledTimestamp(LocalDateTime.now());`	699	`poi.setBilledTimestamp(LocalDateTime.now());`
700	`}`	700	`}`
701	`po.setStatus(OrderStatus.BILLED);`	701	`po.setStatus(OrderStatus.BILLED);`
702		-
703	`}`	702	`}`
704	`//Process scratch`	703	`//Process scratch`
705	`this.processScratchOffer(fofoOrder);`	704	`this.processScratchOffer(fofoOrder);`
706		705
707	`// persist the data of upgrade offer table`	706	`// persist the data of upgrade offer table`
Line 1723...		Line 1722...
1723	`ProfitMandiBusinessException {`	1722	`ProfitMandiBusinessException {`
1724	`FofoOrderItem fofoOrderItem = new FofoOrderItem();`	1723	`FofoOrderItem fofoOrderItem = new FofoOrderItem();`
1725	`fofoOrderItem.setItemId(customFofoOrderItem.getItemId());`	1724	`fofoOrderItem.setItemId(customFofoOrderItem.getItemId());`
1726	`fofoOrderItem.setQuantity(customFofoOrderItem.getQuantity());`	1725	`fofoOrderItem.setQuantity(customFofoOrderItem.getQuantity());`
1727	`fofoOrderItem.setSellingPrice(customFofoOrderItem.getSellingPrice());`	1726	`fofoOrderItem.setSellingPrice(customFofoOrderItem.getSellingPrice());`
-		1727	`fofoOrderItem.setPendingOrderItemId(customFofoOrderItem.getPoiId());`
1728	`fofoOrderItem.setOrderId(fofoOrderId);`	1728	`fofoOrderItem.setOrderId(fofoOrderId);`
1729	`TagListing tl = tagListingRepository.selectByItemId(customFofoOrderItem.getItemId());`	1729	`TagListing tl = tagListingRepository.selectByItemId(customFofoOrderItem.getItemId());`
1730	`// In case listing gets removed rebill it using the selling price`	1730	`// In case listing gets removed rebill it using the selling price`
1731	`if (tl != null) {`	1731	`if (tl != null) {`
1732	`fofoOrderItem.setDp(tl.getSellingPrice());`	1732	`fofoOrderItem.setDp(tl.getSellingPrice());`
Line 1830...		Line 1830...
1830	`}`	1830	`}`
1831	`}`	1831	`}`
1832	`}`	1832	`}`
1833		1833
1834	`private FofoOrder createAndGetFofoOrder(int customerId, String customerGstNumber, int fofoId, String`	1834	`private FofoOrder createAndGetFofoOrder(int customerId, String customerGstNumber, int fofoId, String`
1835	`documentNumber, float totalAmount, int customerAddressId) {`	1835	`documentNumber, float totalAmount, int customerAddressId, int poId) {`
1836	`FofoOrder fofoOrder = new FofoOrder();`	1836	`FofoOrder fofoOrder = new FofoOrder();`
1837	`fofoOrder.setCustomerGstNumber(customerGstNumber);`	1837	`fofoOrder.setCustomerGstNumber(customerGstNumber);`
1838	`fofoOrder.setCustomerId(customerId);`	1838	`fofoOrder.setCustomerId(customerId);`
1839	`fofoOrder.setFofoId(fofoId);`	1839	`fofoOrder.setFofoId(fofoId);`
-		1840	`fofoOrder.setPendingOrderId(poId);`
1840	`fofoOrder.setInvoiceNumber(documentNumber);`	1841	`fofoOrder.setInvoiceNumber(documentNumber);`
1841	`fofoOrder.setTotalAmount(totalAmount);`	1842	`fofoOrder.setTotalAmount(totalAmount);`
1842	`fofoOrder.setCustomerAddressId(customerAddressId);`	1843	`fofoOrder.setCustomerAddressId(customerAddressId);`
1843	`fofoOrderRepository.persist(fofoOrder);`	1844	`fofoOrderRepository.persist(fofoOrder);`
1844	`return fofoOrder;`	1845	`return fofoOrder;`