Subversion Repositories SmartDukaan

Rev

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

Rev 33147 Rev 33310
Line 364... Line 364...
364
                List<LineItem> shippedOrderIds = openOrders.stream().filter(x -> x.getStatus().equals(SHIPPED_FROM_WH)).map(x -> x.getLineItem()).collect(Collectors.toList());
364
                List<LineItem> shippedOrderIds = openOrders.stream().filter(x -> x.getStatus().equals(SHIPPED_FROM_WH)).map(x -> x.getLineItem()).collect(Collectors.toList());
365
                List<LineItem> grnPendingLineItemIds = openOrders.stream().filter(x -> x.getStatus().equals(DELIVERY_SUCCESS)).map(x -> x.getLineItem()).collect(Collectors.toList());
365
                List<LineItem> grnPendingLineItemIds = openOrders.stream().filter(x -> x.getStatus().equals(DELIVERY_SUCCESS)).map(x -> x.getLineItem()).collect(Collectors.toList());
366
 
366
 
367
                long imeiActivationPendingCount = 0;
367
                long imeiActivationPendingCount = 0;
368
                long imeiActivationPendingValue = 0;
368
                long imeiActivationPendingValue = 0;
-
 
369
                //Only delivered orders should be visible
369
                List<Integer> grnPendingOrderIds = openOrders.stream().filter(x -> x.getStatus().equals(SHIPPED_FROM_WH) || x.getStatus().equals(DELIVERY_SUCCESS)).map(x -> x.getId()).collect(Collectors.toList());
370
                List<Integer> grnPendingOrderIds = openOrders.stream().filter(x-> x.getStatus().equals(DELIVERY_SUCCESS)).map(x -> x.getId()).collect(Collectors.toList());
370
                if (grnPendingOrderIds.size() > 0) {
371
                if (grnPendingOrderIds.size() > 0) {
371
                    List<ImeiActivationTimestampModel> imeiActivationTimestampModels = activatedImeiRepository.selectActivatedImeisByOrders(grnPendingOrderIds);
372
                    List<ImeiActivationTimestampModel> imeiActivationTimestampModels = activatedImeiRepository.selectActivatedImeisByOrders(grnPendingOrderIds);
372
                    imeiActivationPendingCount = imeiActivationTimestampModels.size();
373
                    imeiActivationPendingCount = imeiActivationTimestampModels.size();
373
                    imeiActivationPendingValue = imeiActivationTimestampModels.stream().collect(Collectors.summingDouble(x -> x.getSellingPrice())).longValue();
374
                    imeiActivationPendingValue = imeiActivationTimestampModels.stream().collect(Collectors.summingDouble(x -> x.getSellingPrice())).longValue();
374
                }
375
                }