Subversion Repositories SmartDukaan

Rev

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

Rev 34196 Rev 34239
Line 409... Line 409...
409 
            ci.setPendingOrderItemPolicyPlan(x.getPendingOrderItemPolicyPlan());
 409 
            ci.setPendingOrderItemPolicyPlan(x.getPendingOrderItemPolicyPlan());
410 
            cartItems.add(ci);
 410 
            cartItems.add(ci);
411 
        });
 411 
        });
412 
        logger.info("cartItems {}", cartItems);
 412 
        logger.info("cartItems {}", cartItems);
413 
        CartResponse cr = this.validateCart(storeId, cartItems);
 413 
        CartResponse cr = this.validateCart(storeId, cartItems);
- 
 
 414 
        logger.info("CartResponse cr {}", cr);
414 
        if (cr.getCartMessageChanged() > 0 || cr.getTotalAmount() != createPendingOrderRequest.getTotalAmount()) {
 415 
        if (cr.getCartMessageChanged() > 0 || cr.getTotalAmount() != createPendingOrderRequest.getTotalAmount()) {
415 
            return responseSender.badRequest(cr.getCartMessages());
 416 
            return responseSender.badRequest(cr.getCartMessages());
416 
        }
 417 
        }
417 
 
 418 
 
418 
        Map<String, String> returnMap = this.pendingOrderService.createPendingOrder(createPendingOrderRequest, cr);
 419 
        Map<String, String> returnMap = this.pendingOrderService.createPendingOrder(createPendingOrderRequest, cr);
Line 867... Line 868...
867 
            cashback = cashback == null ? 0 : cashback;
 868 
            cashback = cashback == null ? 0 : cashback;
868 
            float itemSellingPrice = tagListing.getMop() - cashback;
 869 
            float itemSellingPrice = tagListing.getMop() - cashback;
869 
            CartItemResponseModel cartItemResponseModel = new CartItemResponseModel();
 870 
            CartItemResponseModel cartItemResponseModel = new CartItemResponseModel();
870 
            cartItemResponseModel.setSellingPrice(cartItem.getSellingPrice());
 871 
            cartItemResponseModel.setSellingPrice(cartItem.getSellingPrice());
871 
            cartItemResponseModel.setPendingOrderItemPolicyPlan(cartItem.getPendingOrderItemPolicyPlan());
 872 
            cartItemResponseModel.setPendingOrderItemPolicyPlan(cartItem.getPendingOrderItemPolicyPlan());
- 
 
 873 
            logger.info("itemSellingPrice: {}",itemSellingPrice);
- 
 
 874 
            logger.info("cartItem: {}",cartItem.getSellingPrice());
- 
 
 875 
            logger.info("cashback: {}",cashback);
872 
            if (itemSellingPrice != cartItem.getSellingPrice()) {
 876 
            if (itemSellingPrice != cartItem.getSellingPrice()) {
873 
                itemMsg.setType("price");
 877 
                itemMsg.setType("price");
874 
                itemMsg.setMessageText("Price has changed to "+itemSellingPrice);
 878 
                itemMsg.setMessageText("Price has changed to "+itemSellingPrice);
875 
                cartItemResponseModel.setSellingPrice(itemSellingPrice);
 879 
                cartItemResponseModel.setSellingPrice(itemSellingPrice);
876 
                cartMessageChanged++;
 880 
                cartMessageChanged++;
Line 879... Line 883...
879 
            LocalDateTime promiseDeliveryTime = LocalDateTime.now();
 883 
            LocalDateTime promiseDeliveryTime = LocalDateTime.now();
880 
            int qtyRequired = (int) cartItem.getQuantity();
 884 
            int qtyRequired = (int) cartItem.getQuantity();
881 
            AvailabilityModel availabilityModel = inventoryItemAvailabilityMap.get(cartItem.getItemId());
 885 
            AvailabilityModel availabilityModel = inventoryItemAvailabilityMap.get(cartItem.getItemId());
882 
            cartItemResponseModel.setMaxQuantity(availabilityModel.getMaxAvailability());
 886 
            cartItemResponseModel.setMaxQuantity(availabilityModel.getMaxAvailability());
883 
            if (availabilityModel.getStoreAvailability() >= qtyRequired) {
 887 
            if (availabilityModel.getStoreAvailability() >= qtyRequired) {
884 
                itemMsg.setType("estimate");
 888 
                itemMsg.setType("estimate0");
885 
                itemMsg.setMessageText("Store availability is "+ availabilityModel.getStoreAvailability());
 889 
                itemMsg.setMessageText("Store availability is "+ availabilityModel.getStoreAvailability());
886 
                estimate = 0;
 890 
                estimate = 0;
887 
            } else if (availabilityModel.getWarehouseAvailability() >= qtyRequired) {
 891 
            } else if (availabilityModel.getWarehouseAvailability() >= qtyRequired) {
888 
                itemMsg.setType("estimate");
 892 
                itemMsg.setType("estimate2");
889 
                itemMsg.setMessageText("Store availability is "+ availabilityModel.getWarehouseAvailability());
 893 
                itemMsg.setMessageText("Store availability is "+ availabilityModel.getWarehouseAvailability());
890 
                estimate = 2;
 894 
                estimate = 2;
891 
            } else if (availabilityModel.getStoreAvailability() > 0) {
 895 
            } else if (availabilityModel.getStoreAvailability() > 0) {
892 
                estimate = 0;
 896 
                estimate = 0;
893 
                qtyRequired = availabilityModel.getStoreAvailability();
 897 
                qtyRequired = availabilityModel.getStoreAvailability();
Line 990... Line 994...
990 
            JSONObject doc = docs.getJSONObject(i);
 994 
            JSONObject doc = docs.getJSONObject(i);
991 
            FofoCatalogResponse ffdr = new FofoCatalogResponse();
 995 
            FofoCatalogResponse ffdr = new FofoCatalogResponse();
992 
            ffdr.setCatalogId(doc.getInt("catalogId_i"));
 996 
            ffdr.setCatalogId(doc.getInt("catalogId_i"));
993 
            ffdr.setImageUrl(doc.getString("imageUrl_s"));
 997 
            ffdr.setImageUrl(doc.getString("imageUrl_s"));
994 
            ffdr.setTitle(doc.getString("title_s"));
 998 
            ffdr.setTitle(doc.getString("title_s"));
- 
 
 999 
            ffdr.setSuperCatalogTitle(doc.getString("superCatalog_s"));
- 
 
 1000 
            ffdr.setSuperCatalogId(doc.getInt("superCatalog_i"));
- 
 
 1001 
            ffdr.setSuperCatalogVariants(doc.getString("superCatalogVariants_s"));
995 
            List<WebOffer> webOffers = webOfferRepository.selectAllActiveOffers().get(ffdr.getCatalogId());
 1002 
            List<WebOffer> webOffers = webOfferRepository.selectAllActiveOffers().get(ffdr.getCatalogId());
996 
            if (webOffers != null && webOffers.size() > 0) {
 1003 
            if (webOffers != null && webOffers.size() > 0) {
997 
                ffdr.setOffers(webOffers.stream().map(x -> x.getTitle()).collect(Collectors.toList()));
 1004 
                ffdr.setOffers(webOffers.stream().map(x -> x.getTitle()).collect(Collectors.toList()));
998 
            }
 1005 
            }
999 
            try {
 1006 
            try {
Line 1031... Line 1038...
1031 
                        fdi.setMinBuyQuantity(1);
 1038 
                        fdi.setMinBuyQuantity(1);
1032 
                        int partnerAvailability = partnerStockAvailabilityMap.get(itemId) == null ? 0 : partnerStockAvailabilityMap.get(itemId);
 1039 
                        int partnerAvailability = partnerStockAvailabilityMap.get(itemId) == null ? 0 : partnerStockAvailabilityMap.get(itemId);
1033 
                        int ourStockAvailability = ourItemAvailabilityMap.get(itemId) == null ? 0 : Math.max(0, ourItemAvailabilityMap.get(itemId));
 1040 
                        int ourStockAvailability = ourItemAvailabilityMap.get(itemId) == null ? 0 : Math.max(0, ourItemAvailabilityMap.get(itemId));
1034 
                        fdi.setActive(partnerAvailability > 0);
 1041 
                        fdi.setActive(partnerAvailability > 0);
1035 
                        // fdi.setActive(true);
 1042 
                        // fdi.setActive(true);
- 
 
 1043 
                        fdi.setPartnerAvailability(partnerAvailability);
1036 
                        fdi.setAvailability(Math.min(5, ourStockAvailability + partnerAvailability));
 1044 
                        fdi.setAvailability(Math.min(5, ourStockAvailability + partnerAvailability));
1037 
                        fdi.setQuantityStep(1);
 1045 
                        fdi.setQuantityStep(1);
1038 
                        fdi.setMaxQuantity(fdi.getAvailability());
 1046 
                        fdi.setMaxQuantity(fdi.getAvailability());
1039 
                        fofoAvailabilityInfoMap.put(itemId, fdi);
 1047 
                        fofoAvailabilityInfoMap.put(itemId, fdi);
1040 
                    }
 1048 
                    }