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

 import com.spice.profitmandi.dao.repository.transaction.TransactionRepository;
 import com.spice.profitmandi.service.authentication.RoleManager;
 import com.spice.profitmandi.service.inventory.InventoryService;
 import com.spice.profitmandi.service.offers.OfferService;
 import com.spice.profitmandi.service.offers.PartnerCriteria;
+import com.spice.profitmandi.service.pricecircular.PriceCircularModel;
 import com.spice.profitmandi.service.pricecircular.PriceCircularService;
 import com.spice.profitmandi.service.scheme.SchemeService;
 import com.spice.profitmandi.service.user.RetailerService;
 import com.spice.profitmandi.service.wallet.WalletService;
 import com.spice.profitmandi.web.model.LoginDetails;
                 model.addAttribute("offerRequestMap", offerRequestMap);
                 model.addAttribute("inventoryItem", inventoryItem);
                 model.addAttribute("inventoryItem", inventoryItem);
+            }
+            LOGGER.info("Net Earnings {}", netEarnings);
             model.addAttribute("netEarnings", netEarnings);
             model.addAttribute("fofoId", fofoId);
             model.addAttribute("schemeMap", schemeMap);
             model.addAttribute("item", item);
             model.addAttribute("schemeInOut", schemeInOuts);
                 throw new ProfitMandiBusinessException("SchemeId", searchScheme, "SchemeId Not Found");
+            }
         } else if (searchModel > 0) {
             Item item = itemRepository.selectAllByCatalogItemId(searchModel).get(0);
             TagListing tagListing = tagListingRepository.selectByItemId(item.getId());
+            LOGGER.info("tagListing {}", tagListing);
             if (tagListing != null) {
                 model.addAttribute("dp", tagListing.getSellingPrice());
                 model.addAttribute("mop", tagListing.getMop());
+            }
             model.addAttribute("modelName", item.getItemDescriptionNoColor());
                 List<SchemeRegion> schemeRegionList = schemeRegionRepository.selectAllBySchemeIds(schemes.stream().map(x -> x.getId()).collect(Collectors.toList()));
                 Map<Integer, String> schemeRegionMap = schemeRegionList.stream().collect(Collectors.groupingBy(x -> x.getSchemeId(), Collectors.mapping(y -> regionRepository.selectById(y.getRegionId()).getName(), Collectors.joining(" ,"))));
                 model.addAttribute("schemeRegionMap", schemeRegionMap);
                 return "schemes";
             } else {
-                partnerType = partnerTypeChangeService.getTypeOnDate(loginDetails.getFofoId(), date);
-                schemes = schemeService
-                        .selectSchemeByPartnerTypeFofoId(partnerType, date, searchModel, loginDetails.getFofoId(), offset, limit).stream()
+                PriceCircularModel priceCircularModel = priceCircularService.getPriceCircularByOffer(loginDetails.getFofoId(), Arrays.asList(searchModel), date);
-                        .filter(x -> (x.getId() != 411 && x.getId() != 612) || date1.isBefore(LocalDate.of(2021, 12, 1))).collect(Collectors.toList());
-                // Remove 411 and 612
-                // this.setSchemeAmountModel(schemes);
-                int nlc = this.getNlc(item, loginDetails.getFofoId(), schemes, tagListing);
-                // For 7720(HR) remove investment
-                model.addAttribute("schemes", schemes);
-                model.addAttribute("nlc", Math.round(nlc));
-                Map<Integer, Map<Integer, Long>> offerSlabPayoutMap = new HashMap<>();
-                List<CreateOfferRequest> offers = offerService.getPublishedOffers(date, loginDetails.getFofoId(),
-                        searchModel);
-                if (offers.size() > 0) {
-                    for (CreateOfferRequest createOfferRequest : offers) {
+                priceDropController.getPriceCircularView(priceCircularModel, model);
-                        Map<Integer, Map<Integer, Long>> catalogSlabPayoutMap = offerService
-                                .getSlabPayoutMap(createOfferRequest);
-                        Map<Integer, Long> slabPayoutMap = catalogSlabPayoutMap.get(searchModel);
-                        offerSlabPayoutMap.put(createOfferRequest.getId(), slabPayoutMap);
-                    }
-                    model.addAttribute("offers", offers);
-                    model.addAttribute("offerSlabPayoutMap", offerSlabPayoutMap);
-                    LOGGER.info("offer");
-                }
-                FofoStore fs = fofoStoreRepository.selectByRetailerId(loginDetails.getFofoId());
-                model.addAttribute("partnerCode", fs.getCode());
-                model.addAttribute("fofoId", fs.getId());
-                return "schemes-partner";
+            }
         } else if (org.apache.commons.lang3.StringUtils.isNotEmpty(searchImei)) {
             LOGGER.info("searchImei" + searchImei);
                     loginDetails.getFofoId());
             Item item = itemRepository.selectById(inventoryItem.getItemId());
             Map<Integer, Scheme> schemeMap = new HashMap<>();
             double netEarnings = 0;
             if (inventoryItem != null) {
+                /*date = inventoryItem.getCreateTimestamp().toLocalDate();
+                PriceCircularModel priceCircularModel = priceCircularService.getPriceCircularByOffer(loginDetails.getFofoId(), Arrays.asList(item.getCatalogItemId()), date);
+                priceDropController.getPriceCircularView(priceCircularModel, model);*/
                 // Offer payout
                 List<OfferPayout> offerPayouts = offerPayoutRepository.selectAllBySerialNumber(loginDetails.getFofoId(),
                         searchImei);
                 Map<Integer, CreateOfferRequest> offerRequestMap = offerPayouts.stream()
                         .map(x -> offerService.getOffer(loginDetails.getFofoId(), (int) x.getOfferId()))
+                        }
+                    }
                     schemeMap = schemes.stream().collect(Collectors.toMap(x -> x.getId(), x -> x));
+                }
+                netEarnings += offerPayouts.stream().collect(Collectors.summingDouble(x -> x.getAmount()));
                 List<PriceDropIMEI> priceDropImeis = priceDropIMEIRepository
                         .selectByFofoIdImei(loginDetails.getFofoId(), searchImei);
                 if (priceDropImeis.size() > 0) {
                     for (PriceDropIMEI priceDropIMEI : priceDropImeis) {
                         PriceDrop pd = priceDropRepository.selectById(priceDropId);
                         priceDropIMEI.setPriceDrop(pd);
+                    }
                     model.addAttribute("priceDropImeis", priceDropImeis);
+                }
-                netEarnings += offerPayouts.stream().collect(Collectors.summingDouble(x -> x.getAmount()));
                 model.addAttribute("offerPayouts", offerPayouts);
                 model.addAttribute("offerRequestMap", offerRequestMap);
                 model.addAttribute("inventoryItem", inventoryItem);
-                model.addAttribute("inventoryItem", inventoryItem);
+            }
-            model.addAttribute("fofoId", loginDetails.getFofoId());
+            model.addAttribute("netEarnings", netEarnings);
             model.addAttribute("schemeMap", schemeMap);
             model.addAttribute("item", item);
             model.addAttribute("schemeInOut", schemeInOuts);
-            return "schemes-partner";
+        }
         if (isAdmin) {
             schemes = schemeRepository.selectAll(0, 100);
             this.setSchemeAmountModel(schemes);
             model.addAttribute("schemes", schemes);
             model.addAttribute("schemeRegionMap", schemeRegionMap);
             return "schemes";
         } else {
-            if (org.apache.commons.lang3.StringUtils.isNotEmpty(searchImei)) {
-                InventoryItem inventoryItem = inventoryItemRepository.selectBySerialNumberFofoId(searchImei,
-                        loginDetails.getFofoId());
-                List<PriceDropIMEI> priceDropImeis = priceDropIMEIRepository
-                        .selectByFofoIdImei(loginDetails.getFofoId(), searchImei);
-                if (priceDropImeis.size() > 0) {
-                    for (PriceDropIMEI priceDropIMEI : priceDropImeis) {
-                        int priceDropId = priceDropIMEI.getPriceDropId();
-                        PriceDrop pd = priceDropRepository.selectById(priceDropId);
-                        priceDropIMEI.setPriceDrop(pd);
-                    }
-                    model.addAttribute("priceDropImeis", priceDropImeis);
-                }
-            }
             FofoStore fs = fofoStoreRepository.selectByRetailerId(loginDetails.getFofoId());
             model.addAttribute("partnerCode", fs.getCode());
             model.addAttribute("fofoId", fs.getId());
             return "schemes-partner";
+        }

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java – Rev 32299 → 32331