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



						offer.getStartDateTime().toLocalDate());
				if (offer.getPartnerType().equals(partnerType)) {
					LOGGER.info("partnerType" + partnerType);
					LOGGER.info("fofoId" + fofoId);
 
 
					OfferPartner op = new OfferPartner();
					op.setFofoId(fofoId);
					op.setOfferId(offer.getId());
					offerPartnerRepository.persist(op);
				}

				.collect(Collectors.toList());
		Map<Integer, CustomRetailer> customRetailersMap = retailerService.getFofoRetailers(fofoIds);
		List<OfferPartner> offerPartners = offerPartnerRepository.selectByOfferId(offerId);
 
		LOGGER.info("offerId" + offer.getId());
 
		Map<Integer, Double> value = offerRepository.selectSumOfferByRetailer(offer.getStartDateTime(),
				offer.getEndDateTime(), 0, offer, true);
 
		LOGGER.info("value" + value);
		List<Offermargin> offerMargin = offerMarginRepository.selectByOfferId(offerId);
		Map<Integer, Double> partnerValueMap = new HashMap<>();
		Map<Integer, List<Double>> partnerMarginMap = new HashMap<Integer, List<Double>>();
		Map<Integer, Integer> shortageAmount = new HashMap<>();
 
		for (OfferPartner op : offerPartners) {
 
			LOGGER.info("offerPartneer" + op.getFofoId());

				value.put(op.getFofoId(), 0d);
 
				partnerValueMap.put(op.getFofoId(), 0d);
 
			}
			List<Double> valSetOne = new ArrayList<Double>();
 
			for (Offermargin om : offerMargin) {
 
				if (value.get(op.getFofoId()) <= om.getValue()) {
					LOGGER.info("om1" + om.getMargin());

Subversion Repositories SmartDukaan

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

Rev 26674		Rev 26675
Line 602...		Line 602...
602	`offer.getStartDateTime().toLocalDate());`	602	`offer.getStartDateTime().toLocalDate());`
603	`if (offer.getPartnerType().equals(partnerType)) {`	603	`if (offer.getPartnerType().equals(partnerType)) {`
604	`LOGGER.info("partnerType" + partnerType);`	604	`LOGGER.info("partnerType" + partnerType);`
605	`LOGGER.info("fofoId" + fofoId);`	605	`LOGGER.info("fofoId" + fofoId);`
606		606
607		-
608	`OfferPartner op = new OfferPartner();`	607	`OfferPartner op = new OfferPartner();`
609	`op.setFofoId(fofoId);`	608	`op.setFofoId(fofoId);`
610	`op.setOfferId(offer.getId());`	609	`op.setOfferId(offer.getId());`
611	`offerPartnerRepository.persist(op);`	610	`offerPartnerRepository.persist(op);`
612	`}`	611	`}`
Line 675...		Line 674...
675	`.collect(Collectors.toList());`	674	`.collect(Collectors.toList());`
676	`Map<Integer, CustomRetailer> customRetailersMap = retailerService.getFofoRetailers(fofoIds);`	675	`Map<Integer, CustomRetailer> customRetailersMap = retailerService.getFofoRetailers(fofoIds);`
677	`List<OfferPartner> offerPartners = offerPartnerRepository.selectByOfferId(offerId);`	676	`List<OfferPartner> offerPartners = offerPartnerRepository.selectByOfferId(offerId);`
678		677
679	`LOGGER.info("offerId" + offer.getId());`	678	`LOGGER.info("offerId" + offer.getId());`
680		679
681	`Map<Integer, Double> value = offerRepository.selectSumOfferByRetailer(offer.getStartDateTime(),`	680	`Map<Integer, Double> value = offerRepository.selectSumOfferByRetailer(offer.getStartDateTime(),`
682	`offer.getEndDateTime(), 0, offer, true);`	681	`offer.getEndDateTime(), 0, offer, true);`
683		682
684	`LOGGER.info("value" + value);`	683	`LOGGER.info("value" + value);`
685	`List<Offermargin> offerMargin = offerMarginRepository.selectByOfferId(offerId);`	684	`List<Offermargin> offerMargin = offerMarginRepository.selectByOfferId(offerId);`
686	`Map<Integer, Double> partnerValueMap = new HashMap<>();`	685	`Map<Integer, Double> partnerValueMap = new HashMap<>();`
687	`Map<Integer, List<Integer>> partnerMarginMap = new HashMap<Integer, List<Integer>>();`	686	`Map<Integer, List<Double>> partnerMarginMap = new HashMap<Integer, List<Double>>();`
688	`Map<Integer, Integer> shortageAmount = new HashMap<>();`	687	`Map<Integer, Integer> shortageAmount = new HashMap<>();`
689		688
690	`for (OfferPartner op : offerPartners) {`	689	`for (OfferPartner op : offerPartners) {`
691		690
692	`LOGGER.info("offerPartneer" + op.getFofoId());`	691	`LOGGER.info("offerPartneer" + op.getFofoId());`
Line 697...		Line 696...
697	`value.put(op.getFofoId(), 0d);`	696	`value.put(op.getFofoId(), 0d);`
698		697
699	`partnerValueMap.put(op.getFofoId(), 0d);`	698	`partnerValueMap.put(op.getFofoId(), 0d);`
700		699
701	`}`	700	`}`
702	`List<Integer> valSetOne = new ArrayList<Integer>();`	701	`List<Double> valSetOne = new ArrayList<Double>();`
703		702
704	`for (Offermargin om : offerMargin) {`	703	`for (Offermargin om : offerMargin) {`
705		704
706	`if (value.get(op.getFofoId()) <= om.getValue()) {`	705	`if (value.get(op.getFofoId()) <= om.getValue()) {`
707	`LOGGER.info("om1" + om.getMargin());`	706	`LOGGER.info("om1" + om.getMargin());`