WebSVN – SmartDukaan – Diff – /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/StoreController.java

 import com.spice.profitmandi.common.util.Utils;
 import com.spice.profitmandi.common.web.client.RestClient;
 import com.spice.profitmandi.common.web.util.ResponseSender;
 import com.spice.profitmandi.dao.entity.catalog.Item;
 import com.spice.profitmandi.dao.entity.catalog.TagListing;
-import com.spice.profitmandi.dao.entity.dtr.ScratchOffer;
-import com.spice.profitmandi.dao.entity.dtr.User;
+import com.spice.profitmandi.dao.entity.dtr.*;
-import com.spice.profitmandi.dao.entity.dtr.WebListing;
-import com.spice.profitmandi.dao.entity.dtr.WebOffer;
 import com.spice.profitmandi.dao.entity.fofo.*;
 import com.spice.profitmandi.dao.entity.inventory.State;
 import com.spice.profitmandi.dao.enumuration.cs.EscalationType;
 import com.spice.profitmandi.dao.enumuration.dtr.OtpType;
 import com.spice.profitmandi.dao.enumuration.dtr.WebListingSource;
 import com.spice.profitmandi.dao.enumuration.inventory.ScratchedGift;
 import com.spice.profitmandi.dao.enumuration.transaction.OrderStatus;
 import com.spice.profitmandi.dao.model.*;
+import com.spice.profitmandi.dao.model.pendingOrder.PendingOrderDetail;
 import com.spice.profitmandi.dao.repository.catalog.ItemRepository;
 import com.spice.profitmandi.dao.repository.catalog.TagListingRepository;
 import com.spice.profitmandi.dao.repository.cs.CsService;
 import com.spice.profitmandi.dao.repository.dtr.*;
 import com.spice.profitmandi.dao.repository.fofo.*;
     @Autowired
     private OrderService orderService;
     @Autowired
+    InsurancePolicyRepository insurancePolicyRepository;
+    @Autowired
+    PendingOrderPlanRepository pendingOrderPlanRepository;
+    @Autowired
     private ScratchOfferRepository scratchOfferRepository;
     private static final List<String> offlineOrders = Arrays.asList("EMIOD", "POD");
     List<String> filterableParams = Arrays.asList("brand");
         customer.setLastName(userModel.getLastName());
         customer.setMobileNumber(userModel.getMobile());
         return responseSender.ok(customerService.addCustomer(customer));
+    }
-    @RequestMapping(value = "/checkplans", method = RequestMethod.GET)
+        @RequestMapping(value = "/store/checkplans", method = RequestMethod.GET)
-    public String getInsurancePrices(HttpServletRequest request, @RequestParam float price, Model model,
+    public ResponseEntity<?> getInsurancePrices(HttpServletRequest request, @RequestParam float price, Model model,
                                      @RequestParam int itemId) throws ProfitMandiBusinessException {
         logger.info("Request received at url : {}", request.getRequestURI());
         try {
-            String response = String.valueOf(responseSender.ok(this.getPlans(price, itemId)));
+            Map<String, List<MobileInsurancePlan>> response = this.getPlans(price, itemId);
+            List<MobileInsurancePlan> combinedPlans = new ArrayList<>();
+            for (List<MobileInsurancePlan> plans : response.values()) {
+                combinedPlans.addAll(plans);
+            }
-            return response;
+            return responseSender.ok(combinedPlans);
         } catch (Exception e) {
             logger.info(e.getMessage(), e);
             throw new ProfitMandiBusinessException("Plans", "Plans API", "Error formatting insurance plans");
+        }
+    }
     @Autowired
     InsuranceService insuranceService;
     private Map<String, List<MobileInsurancePlan>> getPlans(float sellingPrice, int itemId)
             throws ProfitMandiBusinessException {
         try {
-            Map<String, List<MobileInsurancePlan>> productDurationPlans = insuranceService.getAllPlans(itemId,
+            Map<String, List<MobileInsurancePlan>> productDurationPlans = insuranceService.getAllPlans(itemId, sellingPrice,true);
-                    sellingPrice);
             return productDurationPlans;
         } catch (Exception e) {
             logger.info(e, e);
             throw new ProfitMandiBusinessException("Fetch Insurance Plans", "Insurance",
                     "Could not fetch insurance Plans");
         pendingOrderItems.stream().forEach(x -> {
             CartItem ci = new CartItem();
             ci.setItemId(x.getItemId());
             ci.setQuantity(x.getQuantity());
             ci.setSellingPrice(x.getSellingPrice());
-            ci.setExtendedWarrantyPrice(x.getExtendedWarrantyPrice());
+            ci.setPendingOrderItemPolicyPlan(x.getPendingOrderItemPolicyPlan());
             cartItems.add(ci);
         });
         logger.info("cartItems {}",cartItems);
         CartResponse cr = this.validateCart(storeId, cartItems);
         if (cr.getCartMessageChanged() > 0 || cr.getTotalAmount() != createPendingOrderRequest.getTotalAmount()) {
         logger.info("customerRetailers" + customerRetailers);
         return responseSender.ok(customerRetailers);
+    }
     @RequestMapping(value = "/store/order", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity<?> getOrderDetail(HttpServletRequest request, @RequestParam(value = "id") int id, @RequestParam(name = "offset") int offset, @RequestParam(name = "limit") int limit) throws Exception {
-        List<CustomerOrderDetail> customerOrderDetails = new ArrayList<>();
+        List<PendingOrderDetail> pendingOrderDetails = new ArrayList<>();
         List<Integer> catalogIds = new ArrayList<>();
         List<PendingOrder> pendingOrders = pendingOrderRepository.selectByCustomerId(id, offset, limit);
         if (!pendingOrders.isEmpty()) {
             for (PendingOrder po : pendingOrders) {
                 Map<Integer, JSONObject> contentMap = commonSolrService.getContentByCatalogIds(catalogIds);
                 for (PendingOrderItem poi : pois) {
-                    CustomerOrderDetail customerOrderDetail = new CustomerOrderDetail();
+                    PendingOrderDetail pendingOrderDetail = new PendingOrderDetail();
                     Item item = itemRepository.selectById(poi.getItemId());
                     JSONObject jsonObj = contentMap.get(item.getCatalogItemId());
-                    customerOrderDetail.setImageUrl(jsonObj.getString("imageUrl_s"));
+                    pendingOrderDetail.setImageUrl(jsonObj.getString("imageUrl_s"));
-                    customerOrderDetail.setBrand(item.getBrand());
+                    pendingOrderDetail.setBrand(item.getBrand());
-                    customerOrderDetail.setColor(item.getColor());
+                    pendingOrderDetail.setColor(item.getColor());
-                    customerOrderDetail.setPendingOrderItemId(poi.getId());
+                    pendingOrderDetail.setPendingOrderItemId(poi.getId());
-                    customerOrderDetail.setId(poi.getOrderId());
+                    pendingOrderDetail.setId(poi.getOrderId());
-                    customerOrderDetail.setItemId(poi.getItemId());
+                    pendingOrderDetail.setItemId(poi.getItemId());
-                    customerOrderDetail.setModelName(item.getModelName());
+                    pendingOrderDetail.setModelName(item.getModelName());
-                    customerOrderDetail.setModelNumber(item.getModelNumber());
+                    pendingOrderDetail.setModelNumber(item.getModelNumber());
-                    customerOrderDetail.setQuantity(poi.getQuantity());
+                    pendingOrderDetail.setQuantity(poi.getQuantity());
-                    customerOrderDetail.setBilledTimestamp(poi.getBilledTimestamp());
+                    pendingOrderDetail.setBilledTimestamp(poi.getBilledTimestamp());
-                    customerOrderDetail.setStatus(poi.getStatus());
+                    pendingOrderDetail.setStatus(poi.getStatus());
-                    customerOrderDetail.setTotalPrice(poi.getSellingPrice());
+                    pendingOrderDetail.setTotalPrice(poi.getSellingPrice());
-                    customerOrderDetail.setPayMethod(po.getPayMethod());
+                    pendingOrderDetail.setPayMethod(po.getPayMethod());
-                    customerOrderDetail.setCreatedTimeStamp(po.getCreateTimestamp());
+                    pendingOrderDetail.setCreatedTimeStamp(po.getCreateTimestamp());
+                    pendingOrderDetail.setPendingOrderPlan(pendingOrderPlanRepository.selectByPoid(poi.getId()));
-                    customerOrderDetails.add(customerOrderDetail);
+                    pendingOrderDetails.add(pendingOrderDetail);
+                }
+            }
+        }
-        return responseSender.ok(customerOrderDetails);
+        return responseSender.ok(pendingOrderDetails);
+    }
     @RequestMapping(value = "/store/invoiceOrder", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity<?> getOrderInvoiceDetail(HttpServletRequest request, @RequestParam(value = "id") int id, @RequestParam(name = "offset") int offset, @RequestParam(name = "limit") int limit) throws Exception {
-        List<CustomerOrderDetail> customerOrderDetails = new ArrayList<>();
+        List<CustomerOrderAndInsuranceDetails> customerOrderAndInsuranceDetails = new ArrayList<>();
         List<Integer> catalogIds = new ArrayList<>();
         List<FofoOrder> fofoOrders = fofoOrderRepository.selectOrderByCustomerId(id, offset, limit);
         if (!fofoOrders.isEmpty()) {
             for (FofoOrder fo : fofoOrders) {
                     catalogIds.add(item.getCatalogItemId());
+                }
                 Map<Integer, JSONObject> contentMap = commonSolrService.getContentByCatalogIds(catalogIds);
                 for (FofoOrderItem foi : fofoOrderItems) {
-                    CustomerOrderDetail customerOrderDetail = new CustomerOrderDetail();
+                    CustomerOrderAndInsuranceDetails customerOrderDetail = new CustomerOrderAndInsuranceDetails();
                     Item item = itemRepository.selectById(foi.getItemId());
                     JSONObject jsonObj = contentMap.get(item.getCatalogItemId());
                     customerOrderDetail.setImageUrl(jsonObj.getString("imageUrl_s"));
                     customerOrderDetail.setBrand(item.getBrand());
                     customerOrderDetail.setColor(item.getColor());
                     customerOrderDetail.setQuantity(foi.getQuantity());
                     customerOrderDetail.setTotalPrice(foi.getSellingPrice());
                     customerOrderDetail.setCreatedTimeStamp(foi.getCreateTimestamp());
                     customerOrderDetail.setInvoiceNumber(fo.getInvoiceNumber());
                     customerOrderDetail.setCancelledTimestamp(fo.getCancelledTimestamp());
+                    customerOrderDetail.setInsurancePolicies(insurancePolicyRepository.selectByRetailerIdInvoiceNumber(fo.getInvoiceNumber()));
-                    customerOrderDetails.add(customerOrderDetail);
+                    customerOrderAndInsuranceDetails.add(customerOrderDetail);
+                }
+            }
+        }
-        return responseSender.ok(customerOrderDetails);
+        return responseSender.ok(customerOrderAndInsuranceDetails);
+    }
     @RequestMapping(value = "/store/generateInvoice", method = RequestMethod.GET)
     public ResponseEntity<?> generateInvoice(HttpServletRequest request, @RequestParam(name = ProfitMandiConstants.ORDER_ID) int orderId) throws ProfitMandiBusinessException {
         InvoicePdfModel pdfModel = null;
         return responseSender.ok(vc);
+    }
     // Validate Cart for B2C Customers
     private CartResponse validateCart(int storeId, List<CartItem> cartItems) throws Exception {
+        logger.info("cartItems {}",cartItems);
         cartItems = cartItems.stream().filter(x -> x.getQuantity() > 0).collect(Collectors.toList());
         List<Integer> itemIds = cartItems.stream().map(x -> x.getItemId()).collect(Collectors.toList());
         Map<Integer, AvailabilityModel> inventoryItemAvailabilityMap = inventoryService.getStoreAndOurStock(storeId, itemIds);
         CartResponse cartResponse = new CartResponse();
         List<CartItemResponseModel> cartItemResponseModels = new ArrayList<>();
                     .get(itemsMap.get(cartItem.getItemId()).getCatalogItemId());
             cashback = cashback == null ? 0 : cashback;
             float itemSellingPrice = tagListing.getMop() - cashback;
             CartItemResponseModel cartItemResponseModel = new CartItemResponseModel();
             cartItemResponseModel.setSellingPrice(cartItem.getSellingPrice());
-            cartItemResponseModel.setExtendedWarrantyPrice(cartItem.getExtendedWarrantyPrice());
+            cartItemResponseModel.setPendingOrderItemPolicyPlan(cartItem.getPendingOrderItemPolicyPlan());
             if (itemSellingPrice != cartItem.getSellingPrice()) {
                 cartItemResponseModel.setSellingPrice(itemSellingPrice);
                 cartMessageChanged++;
+            }
             int estimate = -2;
             if (estimate >= 0 && LocalTime.now().isAfter(CUTOFF_TIME)) {
                 estimate = estimate + 1;
                 promiseDeliveryTime = promiseDeliveryTime.plusDays(3);
+            }
             totalQty += qtyRequired;
+            if(cartItem.getPendingOrderItemPolicyPlan() != null){
-            totalAmount += qtyRequired * itemSellingPrice + cartItem.getExtendedWarrantyPrice() ;
+                totalAmount += qtyRequired * itemSellingPrice + qtyRequired*cartItem.getPendingOrderItemPolicyPlan().getPrice() ;
+            }else{
+                totalAmount += qtyRequired * itemSellingPrice;
+            }
             cartItemResponseModel.setEstimate(estimate);
             cartItemResponseModel.setTitle(item.getItemDescriptionNoColor());
             cartItemResponseModel.setItemId(cartItem.getItemId());
             cartItemResponseModel.setMinBuyQuantity(1);
             cartItemResponseModel.setQuantity(qtyRequired);

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/StoreController.java – Rev 33399 → 33436