WebSVN – SmartDukaan – Diff – /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java

 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 import com.spice.profitmandi.common.enumuration.ItemType;
 import com.spice.profitmandi.common.exception.ProfitMandiBusinessException;
-import com.spice.profitmandi.common.model.CreateSchemeRequest;
 import com.spice.profitmandi.common.model.ProfitMandiConstants;
 import com.spice.profitmandi.common.model.SchemeModel;
 import com.spice.profitmandi.common.util.StringUtils;
 import com.spice.profitmandi.dao.entity.catalog.Item;
 import com.spice.profitmandi.dao.entity.catalog.RetailerScheme;
 import com.spice.profitmandi.dao.entity.catalog.Scheme;
 import com.spice.profitmandi.dao.entity.fofo.FofoOrder;
 import com.spice.profitmandi.dao.entity.fofo.InventoryItem;
+import com.spice.profitmandi.dao.entity.fofo.PartnerType;
 import com.spice.profitmandi.dao.entity.fofo.Purchase;
 import com.spice.profitmandi.dao.entity.fofo.ScanRecord;
 import com.spice.profitmandi.dao.entity.fofo.SchemeInOut;
 import com.spice.profitmandi.dao.entity.fofo.SchemeItem;
 import com.spice.profitmandi.dao.enumuration.catalog.AmountType;
 import com.spice.profitmandi.dao.enumuration.catalog.SchemeType;
 import com.spice.profitmandi.dao.enumuration.fofo.ScanType;
+import com.spice.profitmandi.dao.model.CreateSchemeRequest;
 import com.spice.profitmandi.dao.repository.catalog.ItemRepository;
-import com.spice.profitmandi.dao.repository.catalog.RetailerSchemeRepository;
 import com.spice.profitmandi.dao.repository.catalog.SchemeRepository;
 import com.spice.profitmandi.dao.repository.catalog.TagListingRepository;
 import com.spice.profitmandi.dao.repository.dtr.RetailerRepository;
 import com.spice.profitmandi.dao.repository.fofo.FofoLineItemRepository;
 import com.spice.profitmandi.dao.repository.fofo.FofoOrderItemRepository;
 import com.spice.profitmandi.dao.repository.fofo.FofoOrderRepository;
 import com.spice.profitmandi.dao.repository.fofo.InventoryItemRepository;
+import com.spice.profitmandi.dao.repository.fofo.PartnerTypeChangeService;
 import com.spice.profitmandi.dao.repository.fofo.PurchaseRepository;
 import com.spice.profitmandi.dao.repository.fofo.ScanRecordRepository;
 import com.spice.profitmandi.dao.repository.fofo.SchemeInOutRepository;
 import com.spice.profitmandi.dao.repository.fofo.SchemeItemRepository;
 import com.spice.profitmandi.service.authentication.RoleManager;
 	@Autowired
 	@Qualifier("fofoInventoryItemRepository")
 	private InventoryItemRepository inventoryItemRepository;
 	@Autowired
+	private PartnerTypeChangeService partnerTypeChangeService;
+	@Autowired
 	private ScanRecordRepository scanRecordRepository;
 	@Autowired
 	private SchemeRepository schemeRepository;
 	@Autowired
 	private TagListingRepository tagListingRepository;
 	@Autowired
-	private RetailerSchemeRepository retailerSchemeRepository;
-	@Autowired
 	private SchemeInOutRepository schemeInOutRepository;
 	@Autowired
 	@Qualifier("catalogItemRepository")
 	private ItemRepository itemRepository;
 					scheme.getStartDateTime() + ", " + scheme.getEndDateTime(), "SCHM_VE_1005");
+		}
 		this.validateItemIds(createSchemeRequest);
 		schemeRepository.persist(scheme);
-		if (!createSchemeRequest.isRetailerAll()) {
-			this.validateRetailerIds(createSchemeRequest);
-			for (int retailerId : createSchemeRequest.getRetailerIds()) {
-				RetailerScheme retailerScheme = new RetailerScheme();
-				retailerScheme.setRetailerId(retailerId);
-				retailerScheme.setSchemeId(scheme.getId());
-				retailerSchemeRepository.persist(retailerScheme);
-			}
-		}
 		for (int itemId : createSchemeRequest.getItemIds()) {
 			SchemeItem schemeItem = new SchemeItem();
 			schemeItem.setSchemeId(scheme.getId());
 			schemeItem.setItemId(itemId);
 			schemeItemRepository.persist(schemeItem);
 		if (createSchemeRequest.getAmount() <= 0) {
 			throw new ProfitMandiBusinessException(ProfitMandiConstants.AMOUNT, createSchemeRequest.getAmount(),
 					"SCHM_VE_1001");
+		}
-		if (AmountType.valueOf(createSchemeRequest.getAmountType()) == AmountType.PERCENTAGE
+		if (createSchemeRequest.getAmountType().equals(AmountType.PERCENTAGE)
 				&& createSchemeRequest.getAmount() > 100) {
 			throw new ProfitMandiBusinessException(ProfitMandiConstants.AMOUNT, createSchemeRequest.getAmount(),
 					"SCHM_VE_1002");
+		}
 	private Scheme toScheme(int creatorId, CreateSchemeRequest createSchemeRequest) {
 		Scheme scheme = new Scheme();
 		scheme.setName(createSchemeRequest.getName());
 		scheme.setDescription(createSchemeRequest.getDescription());
-		scheme.setType(SchemeType.valueOf(createSchemeRequest.getType()));
+		scheme.setType(createSchemeRequest.getType());
-		scheme.setAmountType(AmountType.valueOf(createSchemeRequest.getAmountType()));
+		scheme.setAmountType(createSchemeRequest.getAmountType());
+		scheme.setPartnerType(createSchemeRequest.getPartnerType());
 		scheme.setAmount(createSchemeRequest.getAmount());
-		scheme.setStartDateTime(createSchemeRequest.getStartDate());
+		scheme.setPartnerType(createSchemeRequest.getPartnerType());
 		scheme.setEndDateTime(createSchemeRequest.getEndDate());
 		scheme.setCreatedBy(creatorId);
-		scheme.setRetailerAll(createSchemeRequest.isRetailerAll());
 		return scheme;
+	}
-	private void validateRetailerIds(CreateSchemeRequest createSchemeRequest) throws ProfitMandiBusinessException {
-		if (createSchemeRequest.getRetailerIds() == null || createSchemeRequest.getRetailerIds().isEmpty()) {
-			throw new ProfitMandiBusinessException(ProfitMandiConstants.RETAILER_ID,
-					createSchemeRequest.getRetailerIds(), "SCHM_1001");
-		}
-		List<Integer> foundRetailerIds = retailerRepository.selectIdsByIds(createSchemeRequest.getRetailerIds());
-		if (foundRetailerIds.size() != createSchemeRequest.getRetailerIds().size()) {
-			createSchemeRequest.getRetailerIds().removeAll(foundRetailerIds);
-			throw new ProfitMandiBusinessException(ProfitMandiConstants.RETAILER_ID,
-					createSchemeRequest.getRetailerIds(), "SCHM_1002");
-		}
-	}
 	private void validateItemIds(CreateSchemeRequest createSchemeRequest) throws ProfitMandiBusinessException {
 		if (createSchemeRequest.getItemIds() == null || createSchemeRequest.getItemIds().isEmpty()) {
 			throw new ProfitMandiBusinessException(ProfitMandiConstants.ITEM_ID, createSchemeRequest.getItemIds(),
 					"SCHM_1003");
+		}
+	}
 	@Override
 	public Scheme getSchemeById(int schemeId) throws ProfitMandiBusinessException {
 		Scheme scheme = schemeRepository.selectById(schemeId);
-		if (!scheme.isRetailerAll()) {
-			List<Integer> retailerIds = retailerSchemeRepository.selectRetailerIdsBySchemeId(scheme.getId());
-			scheme.getRetailerIds().addAll(retailerIds);
-		}
 		List<Integer> itemIds = schemeItemRepository.selectItemIdsBySchemeId(scheme.getId());
 		if (itemIds.size() > 0) {
 			List<Item> items = itemRepository.selectByIds(new HashSet<>(itemIds));
 			scheme.setItemStringMap(this.toItemStringMap(items));
+		}
 		List<SchemeItem> schemeItems = schemeItemRepository.selectBySchemeIds(schemeIdSchemeMap.keySet());
 		Set<Integer> itemIds = this.schemeItemsToItemIds(schemeItems);
 		List<Item> items = itemRepository.selectByIds(itemIds);
 		Map<Integer, String> itemStringMap = this.toItemStringMap(items);
 		this.addItemIdsToSchemes(schemeItems, schemeIdSchemeMap, itemStringMap);
-		List<RetailerScheme> retailerSchemes = retailerSchemeRepository.selectBySchemeIds(schemeIdSchemeMap.keySet());
-		this.addRetailerIdsToSchemes(retailerSchemes, schemeIdSchemeMap);
 		return this.toSchemeModels(schemeIdSchemeMap);
+	}
 	private void addItemIdsToSchemes(List<SchemeItem> schemeItems, Map<Integer, Scheme> schemeIdSchemeMap,
 			Map<Integer, String> itemStringMap) {
 	@Override
 	public void processSchemeIn(int purchaseId, int retailerId) throws ProfitMandiBusinessException {
 		LOGGER.info("Trying to process SchemeIn with purchaseId [{}] and retailerId [{}]", purchaseId, retailerId);
 		Purchase purchase = purchaseRepository.selectByIdAndFofoId(purchaseId, retailerId);
+		PartnerType partnerType = partnerTypeChangeService.getTypeOnDate(retailerId,
+				purchase.getCreateTimestamp().toLocalDate());
 		LOGGER.info("purchase is completed = {}", (purchase.getCompleteTimestamp() != null));
 		if (purchase.getCompleteTimestamp() != null) {
 			List<Scheme> schemes = schemeRepository.selectActiveAll(SchemeType.IN, purchase.getCompleteTimestamp());
 			float totalCashback = 0;
 			if (schemes.isEmpty()) {
+			}
 			Map<InventoryItem, Set<Scheme>> allInventoryItemSchemesMap = new HashMap<>();
 			Set<Integer> itemIds = new HashSet<>();
 			for (Map.Entry<InventoryItem, Set<Scheme>> inventoryItemSchemesEntry : inventoryItemSchemesMap.entrySet()) {
-				Set<Scheme> notAllSchemes = new HashSet<>();
 				Set<Scheme> allSchemes = new HashSet<>();
 				for (Scheme scheme : inventoryItemSchemesEntry.getValue()) {
-					if (!scheme.isRetailerAll()) {
-						notAllSchemes.add(scheme);
-					} else {
-						allSchemes.add(scheme);
+					allSchemes.add(scheme);
-					}
+				}
 				allInventoryItemSchemesMap.put(inventoryItemSchemesEntry.getKey(), allSchemes);
 				itemIds.add(inventoryItemSchemesEntry.getKey().getItemId());
+			}

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java – Rev 25487 → 25503