Subversion Repositories SmartDukaan

Rev

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

Rev 32046 Rev 32091
Line 119... Line 119...
119 
 
 119 
 
120 
 
 120 
 
121 
        if (retailerFilter.getSecondaryDays() != null) {
 121 
        if (retailerFilter.getSecondaryDays() != null) {
122 
            List<LastSaleDateModel> purchaseOrders = orderRepository.getLastOrders();
 122 
            List<LastSaleDateModel> purchaseOrders = orderRepository.getLastOrders();
123 
            for (LastSaleDateModel purchaseOrder : purchaseOrders) {
 123 
            for (LastSaleDateModel purchaseOrder : purchaseOrders) {
124 
                long daysBetween = Duration.between(purchaseOrder.getDateTime(), LocalDateTime.now()).toDays();
 124 
                long daysBetween = Duration.between(purchaseOrder.getDateTime().plusDays(1), LocalDateTime.now()).toDays();
125 
                if (daysBetween >= retailerFilter.getSecondaryDays()) {
 125 
                if (daysBetween >= retailerFilter.getSecondaryDays()) {
126 
                    lastPurchaseMap.put(purchaseOrder.getFofoId(), daysBetween);
 126 
                    lastPurchaseMap.put(purchaseOrder.getFofoId(), daysBetween);
127 
                }
 127 
                }
128 
            }
 128 
            }
129 
        }
 129 
        }
130 
 
 130 
 
131 
 
 131 
 
132 
        if (retailerFilter.getTertiaryDays() != null) {
 132 
        if (retailerFilter.getTertiaryDays() != null) {
133 
            List<LastSaleDateModel> saleOrders = fofoOrderRepository.getLastTertiaryOrders();
 133 
            List<LastSaleDateModel> saleOrders = fofoOrderRepository.getLastTertiaryOrders();
134 
            for (LastSaleDateModel saleOrder : saleOrders) {
 134 
            for (LastSaleDateModel saleOrder : saleOrders) {
135 
                long daysBetween = Duration.between(saleOrder.getDateTime(), LocalDateTime.now()).toDays();
 135 
                long daysBetween = Duration.between(saleOrder.getDateTime().plusDays(1), LocalDateTime.now()).toDays();
136 
                if (daysBetween >= retailerFilter.getTertiaryDays()) {
 136 
                if (daysBetween >= retailerFilter.getTertiaryDays()) {
137 
                    lastSaleMap.put(saleOrder.getFofoId(), daysBetween);
 137 
                    lastSaleMap.put(saleOrder.getFofoId(), daysBetween);
138 
                }
 138 
                }
139 
            }
 139 
            }
140 
        }
 140 
        }
141 
 
 141 
 
142 
 
 142 
 
143 
        if (retailerFilter.getInvestmentPct() != null) {
 143 
        if (retailerFilter.getInvestmentPct() != null) {
144 
            List<PartnerDailyInvestment> partnerDailyInvestments = partnerDailyInvestmentRepository.selectAll(LocalDate.now());
 144 
            List<PartnerDailyInvestment> partnerDailyInvestments = partnerDailyInvestmentRepository.selectAll(LocalDate.now().minusDays(1));
145 
            partnerDailyInvestmentMap = partnerDailyInvestments.stream().filter(x -> (100 - retailerFilter.getInvestmentPct()) <= x.getShortPercentage()).collect(Collectors.toMap(x -> x.getFofoId(), x -> x));
 145 
            partnerDailyInvestmentMap = partnerDailyInvestments.stream().filter(x -> (100 - retailerFilter.getInvestmentPct()) <= x.getShortPercentage()).collect(Collectors.toMap(x -> x.getFofoId(), x -> x));
146 
        }
 146 
        }
147 
 
 147 
 
148 
 
 148 
 
149 
        if (retailerFilter.getMtdsPct() != null) {
 149 
        if (retailerFilter.getMtdsPct() != null) {
Line 199... Line 199...
199 
            }
 199 
            }
200 
 
 200 
 
201 
 
 201 
 
202 
        }
 202 
        }
203 
 
 203 
 
- 
 
 204 
        LOGGER.info("tertiaryPartner {}", tertiaryPartner);
- 
 
 205 
 
- 
 
 206 
        LOGGER.info("secondaryPartner {}", secondaryPartner);
- 
 
 207 
 
- 
 
 208 
 
204 
        NumberFormat numberformat = NumberFormat.getNumberInstance(new Locale("en", "IN"));
 209 
        NumberFormat numberformat = NumberFormat.getNumberInstance(new Locale("en", "IN"));
205 
 
 210 
 
206 
 
 211 
 
207 
        for (Entry<Integer, CustomRetailer> customRetailerEntry : customRetailers.entrySet()) {
 212 
        for (Entry<Integer, CustomRetailer> customRetailerEntry : customRetailers.entrySet()) {
208 
            int fofoId = customRetailerEntry.getKey();
 213 
            int fofoId = customRetailerEntry.getKey();