Subversion Repositories SmartDukaan

Rev

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

Rev 36354 Rev 36355
Line 10... Line 10...
10
import org.springframework.beans.factory.annotation.Autowired;
10
import org.springframework.beans.factory.annotation.Autowired;
11
import org.springframework.stereotype.Service;
11
import org.springframework.stereotype.Service;
12
 
12
 
13
import java.util.LinkedHashMap;
13
import java.util.LinkedHashMap;
14
import java.util.List;
14
import java.util.List;
-
 
15
import java.util.stream.Collectors;
15
import java.util.Set;
16
import java.util.Set;
16
import java.util.concurrent.ConcurrentHashMap;
17
import java.util.concurrent.ConcurrentHashMap;
17
import java.util.concurrent.ExecutorService;
18
import java.util.concurrent.ExecutorService;
18
import java.util.concurrent.Executors;
19
import java.util.concurrent.Executors;
19
 
20
 
Line 110... Line 111...
110
        if (partnerPayouts.isEmpty()) {
111
        if (partnerPayouts.isEmpty()) {
111
            LOGGER.info("No eligible partners for activation offer {}", offerId);
112
            LOGGER.info("No eligible partners for activation offer {}", offerId);
112
            return;
113
            return;
113
        }
114
        }
114
 
115
 
-
 
116
        int beforeFilter = partnerPayouts.size();
-
 
117
        partnerPayouts = partnerPayouts.stream()
-
 
118
                .filter(offerProcessingHelper::hasRemainingOfferPayout)
-
 
119
                .collect(Collectors.toList());
-
 
120
        if (partnerPayouts.isEmpty()) {
-
 
121
            LOGGER.info("Activation offer {}: all {} eligible partners already fully paid, skipping batch", offerId, beforeFilter);
-
 
122
            return;
-
 
123
        }
-
 
124
        if (partnerPayouts.size() < beforeFilter) {
-
 
125
            LOGGER.info("Activation offer {}: filtered {} already-paid partners, {} remain", offerId, beforeFilter - partnerPayouts.size(), partnerPayouts.size());
-
 
126
        }
-
 
127
 
115
        LinkedHashMap<Integer, String> fofoIdPartnerNameMap = new LinkedHashMap<>();
128
        LinkedHashMap<Integer, String> fofoIdPartnerNameMap = new LinkedHashMap<>();
116
        for (OfferPartnerPayoutData data : partnerPayouts) {
129
        for (OfferPartnerPayoutData data : partnerPayouts) {
117
            fofoIdPartnerNameMap.put(data.getFofoId(), "fofo-" + data.getFofoId());
130
            fofoIdPartnerNameMap.put(data.getFofoId(), "fofo-" + data.getFofoId());
118
        }
131
        }
119
 
132
 
Line 147... Line 160...
147
        if (partnerPayouts.isEmpty()) {
160
        if (partnerPayouts.isEmpty()) {
148
            LOGGER.info("No eligible partners for sellin offer {}", offerId);
161
            LOGGER.info("No eligible partners for sellin offer {}", offerId);
149
            return;
162
            return;
150
        }
163
        }
151
 
164
 
-
 
165
        int beforeFilter = partnerPayouts.size();
-
 
166
        partnerPayouts = partnerPayouts.stream()
-
 
167
                .filter(offerProcessingHelper::hasRemainingSellinPayout)
-
 
168
                .collect(Collectors.toList());
-
 
169
        if (partnerPayouts.isEmpty()) {
-
 
170
            LOGGER.info("Sellin offer {}: all {} eligible partners already fully paid, skipping batch", offerId, beforeFilter);
-
 
171
            return;
-
 
172
        }
-
 
173
        if (partnerPayouts.size() < beforeFilter) {
-
 
174
            LOGGER.info("Sellin offer {}: filtered {} already-paid partners, {} remain", offerId, beforeFilter - partnerPayouts.size(), partnerPayouts.size());
-
 
175
        }
-
 
176
 
152
        LinkedHashMap<Integer, String> fofoIdPartnerNameMap = new LinkedHashMap<>();
177
        LinkedHashMap<Integer, String> fofoIdPartnerNameMap = new LinkedHashMap<>();
153
        for (SellinPartnerPayoutData data : partnerPayouts) {
178
        for (SellinPartnerPayoutData data : partnerPayouts) {
154
            fofoIdPartnerNameMap.put(data.getFofoId(), "fofo-" + data.getFofoId());
179
            fofoIdPartnerNameMap.put(data.getFofoId(), "fofo-" + data.getFofoId());
155
        }
180
        }
156
 
181