Subversion Repositories SmartDukaan

Rev

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

Rev 30749 Rev 31180
Line 910... Line 910...
910
			customRetailer.setBusinessName(address.getName());
910
			customRetailer.setBusinessName(address.getName());
911
			customRetailer.setMobileNumber(address.getPhoneNumber());
911
			customRetailer.setMobileNumber(address.getPhoneNumber());
912
			try {
912
			try {
913
				FofoStore fs = fofoStoreRepository.selectByRetailerId(address.getRetaierId());
913
				FofoStore fs = fofoStoreRepository.selectByRetailerId(address.getRetaierId());
914
				customRetailer.setCode(fs.getCode());
914
				customRetailer.setCode(fs.getCode());
-
 
915
				customRetailer.setCounterSize(fs.getCounterSize());
-
 
916
 
915
				customRetailer.setWarehouseId(fs.getWarehouseId());
917
				customRetailer.setWarehouseId(fs.getWarehouseId());
916
				customRetailer.setPartnerId(fs.getId());
918
				customRetailer.setPartnerId(fs.getId());
917
				customRetailer.setFofoType(fs.getFofoType());
919
				customRetailer.setFofoType(fs.getFofoType());
918
			} catch (Exception e) {
920
			} catch (Exception e) {
919
				continue;
921
				continue;
Line 1256... Line 1258...
1256
				sb.append(String.join(", ", partnerCriteria.getRegionIds().stream()
1258
				sb.append(String.join(", ", partnerCriteria.getRegionIds().stream()
1257
						.map(x -> ProfitMandiConstants.WAREHOUSE_MAP.get(x)).collect(Collectors.toList())));
1259
						.map(x -> ProfitMandiConstants.WAREHOUSE_MAP.get(x)).collect(Collectors.toList())));
1258
			}
1260
			}
1259
			if (partnerCriteria.getExcludeFofoIds() != null && partnerCriteria.getExcludeFofoIds().size() > 0) {
1261
			if (partnerCriteria.getExcludeFofoIds() != null && partnerCriteria.getExcludeFofoIds().size() > 0) {
1260
				sb.append("excluding ");
1262
				sb.append("excluding ");
-
 
1263
				Map<Integer, CustomRetailer> customRetailers = this
1261
				Map<Integer, CustomRetailer> customRetailers = this.getFofoRetailerUserId(partnerCriteria.getExcludeFofoIds());
1264
						.getFofoRetailerUserId(partnerCriteria.getExcludeFofoIds());
1262
				List<String> businessNames = customRetailers.values().stream().map(x -> x.getBusinessName())
1265
				List<String> businessNames = customRetailers.values().stream().map(x -> x.getBusinessName())
1263
						.collect(Collectors.toList());
1266
						.collect(Collectors.toList());
1264
				sb.append(String.join(", ", businessNames));
1267
				sb.append(String.join(", ", businessNames));
1265
			}
1268
			}
1266
		}
1269
		}