Subversion Repositories SmartDukaan

Rev

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

Rev 32968 Rev 33025
Line 379... Line 379...
379
        try {
379
        try {
380
            dtrUserByEmail = userRepository.selectByEmailId(updateRetailerRequest.getUserEmailId());
380
            dtrUserByEmail = userRepository.selectByEmailId(updateRetailerRequest.getUserEmailId());
381
        } catch (ProfitMandiBusinessException e) {
381
        } catch (ProfitMandiBusinessException e) {
382
            //ignore the exception
382
            //ignore the exception
383
        }
383
        }
384
        if (user!=null && dtrUserByEmail != null && user.getId() != dtrUserByEmail.getId())
384
        if (user != null && dtrUserByEmail != null && user.getId() != dtrUserByEmail.getId())
385
            throw new ProfitMandiBusinessException("Email already exist", updateRetailerRequest.getUserEmailId(), "");
385
            throw new ProfitMandiBusinessException("Email already exist", updateRetailerRequest.getUserEmailId(), "");
386
 
386
 
387
 
387
 
388
        if (user == null) {
388
        if (user == null) {
389
            user = new User();
389
            user = new User();
Line 1229... Line 1229...
1229
    public String getPartnerCriteriaString(PartnerCriteria partnerCriteria) {
1229
    public String getPartnerCriteriaString(PartnerCriteria partnerCriteria) {
1230
 
1230
 
1231
        StringBuilder sb = new StringBuilder();
1231
        StringBuilder sb = new StringBuilder();
1232
        if (partnerCriteria.getFofoIds().size() > 0) {
1232
        if (partnerCriteria.getFofoIds().size() > 0) {
1233
            List<Integer> fofoIds = partnerCriteria.getFofoIds();
1233
            List<Integer> fofoIds = partnerCriteria.getFofoIds();
1234
            Map<Integer, CustomRetailer> customRetailers = this.getFofoRetailerUserId(fofoIds);
-
 
1235
            List<String> businessNames = customRetailers.values().stream().map(x -> x.getBusinessName()).collect(Collectors.toList());
-
 
1236
            sb.append(String.join(", ", businessNames));
1234
            appendPartnerCodes(fofoIds, sb);
1237
 
1235
 
1238
        } else {
1236
        } else {
1239
            sb.append("All");
1237
            sb.append("All");
1240
            if (partnerCriteria.getPartnerTypes().size() > 0) {
1238
            if (partnerCriteria.getPartnerTypes().size() > 0) {
1241
                sb.append(" ").append(String.join(", ", partnerCriteria.getPartnerTypes().stream().map(x -> x.getValue()).collect(Collectors.toList())));
1239
                sb.append(" ").append(String.join(", ", partnerCriteria.getPartnerTypes().stream().map(x -> x.getValue()).collect(Collectors.toList())));
Line 1245... Line 1243...
1245
                sb.append("from ");
1243
                sb.append("from ");
1246
                sb.append(String.join(", ", partnerCriteria.getRegionIds().stream().map(x -> ProfitMandiConstants.WAREHOUSE_MAP.get(x)).collect(Collectors.toList())));
1244
                sb.append(String.join(", ", partnerCriteria.getRegionIds().stream().map(x -> ProfitMandiConstants.WAREHOUSE_MAP.get(x)).collect(Collectors.toList())));
1247
            }
1245
            }
1248
            if (partnerCriteria.getExcludeFofoIds() != null && partnerCriteria.getExcludeFofoIds().size() > 0) {
1246
            if (partnerCriteria.getExcludeFofoIds() != null && partnerCriteria.getExcludeFofoIds().size() > 0) {
1249
                sb.append("excluding ");
1247
                sb.append("excluding ");
1250
                Map<Integer, CustomRetailer> customRetailers = this.getFofoRetailerUserId(partnerCriteria.getExcludeFofoIds());
1248
                appendPartnerCodes(partnerCriteria.getExcludeFofoIds(), sb);
1251
                List<String> businessNames = customRetailers.values().stream().map(x -> x.getBusinessName()).collect(Collectors.toList());
-
 
1252
                sb.append(String.join(", ", businessNames));
-
 
1253
            }
1249
            }
1254
        }
1250
        }
1255
        return sb.toString();
1251
        return sb.toString();
1256
    }
1252
    }
1257
 
1253
 
-
 
1254
    private void appendPartnerCodes(List<Integer> fofoIds, StringBuilder sb) {
-
 
1255
        Map<Integer, CustomRetailer> customRetailersMap = this.getAllFofoRetailers();
-
 
1256
        List<String> businessNames = fofoIds.stream().map(x -> customRetailersMap.get(x)).filter(x -> x != null).map(x -> x.getCode()).collect(Collectors.toList());
-
 
1257
        sb.append(String.join(", ", businessNames));
-
 
1258
    }
-
 
1259
 
1258
    @Override
1260
    @Override
1259
    public User getEmail() {
1261
    public User getEmail() {
1260
        return null;
1262
        return null;
1261
    }
1263
    }
1262
 
1264