Subversion Repositories SmartDukaan

Rev

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

Rev 30126 Rev 30134
Line 28... Line 28...
28
import com.spice.profitmandi.dao.repository.catalog.ItemRepository;
28
import com.spice.profitmandi.dao.repository.catalog.ItemRepository;
29
import com.spice.profitmandi.dao.repository.catalog.TagListingRepository;
29
import com.spice.profitmandi.dao.repository.catalog.TagListingRepository;
30
import com.spice.profitmandi.dao.repository.dtr.FofoStoreRepository;
30
import com.spice.profitmandi.dao.repository.dtr.FofoStoreRepository;
31
import com.spice.profitmandi.dao.repository.dtr.Mongo;
31
import com.spice.profitmandi.dao.repository.dtr.Mongo;
32
import com.spice.profitmandi.dao.repository.dtr.UserAccountRepository;
32
import com.spice.profitmandi.dao.repository.dtr.UserAccountRepository;
33
import com.spice.profitmandi.dao.repository.fofo.CurrentInventorySnapshotRepository;
-
 
34
import com.spice.profitmandi.dao.repository.fofo.SuggestedPoDetailRepository;
33
import com.spice.profitmandi.dao.repository.fofo.SuggestedPoDetailRepository;
35
import com.spice.profitmandi.dao.repository.fofo.SuggestedPoRepository;
34
import com.spice.profitmandi.dao.repository.fofo.SuggestedPoRepository;
36
import com.spice.profitmandi.service.authentication.RoleManager;
35
import com.spice.profitmandi.service.authentication.RoleManager;
37
import com.spice.profitmandi.service.inventory.*;
36
import com.spice.profitmandi.service.inventory.*;
38
import com.spice.profitmandi.service.pricecircular.PriceCircularItemModel;
37
import com.spice.profitmandi.service.pricecircular.PriceCircularItemModel;
Line 99... Line 98...
99
 
98
 
100
	@Autowired
99
	@Autowired
101
	private PricingService pricingService;
100
	private PricingService pricingService;
102
 
101
 
103
	@Autowired
102
	@Autowired
104
	private CurrentInventorySnapshotRepository currentInventorySnapshotRepository;
-
 
105
 
-
 
106
	@Autowired
-
 
107
	private CategoryRepository categoryRepository;
103
	private CategoryRepository categoryRepository;
108
 
104
 
109
	@Autowired
105
	@Autowired
110
	private SchemeService schemeService;
106
	private SchemeService schemeService;
111
 
107
 
Line 549... Line 545...
549
		PriceCircularModel priceCircularModel = priceCircularService.getPriceCircularByOffer(fofoId, catalogIds);
545
		PriceCircularModel priceCircularModel = priceCircularService.getPriceCircularByOffer(fofoId, catalogIds);
550
 
546
 
551
		List<PriceCircularItemModel> priceCircularItemModels = priceCircularModel.getPriceCircularItemModels();
547
		List<PriceCircularItemModel> priceCircularItemModels = priceCircularModel.getPriceCircularItemModels();
552
		Map<Integer, PriceCircularItemModel> priceCircularItemModelMap = new HashMap<>();
548
		Map<Integer, PriceCircularItemModel> priceCircularItemModelMap = new HashMap<>();
553
		if (priceCircularItemModels != null) {
549
		if (priceCircularItemModels != null) {
554
			priceCircularItemModels.stream().collect(Collectors.toMap(x -> x.getCatalogId(), x -> x));
550
			priceCircularItemModelMap = priceCircularItemModels.stream().collect(Collectors.toMap(x -> x.getCatalogId(), x -> x));
555
		}
551
		}
556
		for (int i = 0; i < docs.length(); i++) {
552
		for (int i = 0; i < docs.length(); i++) {
557
			Map<Integer, FofoAvailabilityInfo> fofoAvailabilityInfoMap = new HashMap<>();
553
			Map<Integer, FofoAvailabilityInfo> fofoAvailabilityInfoMap = new HashMap<>();
558
			JSONObject doc = docs.getJSONObject(i);
554
			JSONObject doc = docs.getJSONObject(i);
559
			FofoCatalogResponse ffdr = new FofoCatalogResponse();
555
			FofoCatalogResponse ffdr = new FofoCatalogResponse();
Line 577... Line 573...
577
					float sellingPrice = (float) childItem.getDouble("sellingPrice_f");
573
					float sellingPrice = (float) childItem.getDouble("sellingPrice_f");
578
					if (fofoAvailabilityInfoMap.containsKey(itemId)) {
574
					if (fofoAvailabilityInfoMap.containsKey(itemId)) {
579
						if (fofoAvailabilityInfoMap.get(itemId).getSellingPrice() > sellingPrice) {
575
						if (fofoAvailabilityInfoMap.get(itemId).getSellingPrice() > sellingPrice) {
580
							fofoAvailabilityInfoMap.get(itemId).setSellingPrice(sellingPrice);
576
							fofoAvailabilityInfoMap.get(itemId).setSellingPrice(sellingPrice);
581
							fofoAvailabilityInfoMap.get(itemId).setMop((float) childItem.getDouble("mop_f"));
577
							fofoAvailabilityInfoMap.get(itemId).setMop((float) childItem.getDouble("mop_f"));
582
							PriceCircularItemModel priceCircularItemModel = priceCircularItemModels.get(ffdr.getCatalogId());
578
							PriceCircularItemModel priceCircularItemModel = priceCircularItemModelMap.get(ffdr.getCatalogId());
583
							fofoAvailabilityInfoMap.get(itemId).setNlc(priceCircularItemModel == null ? 0 : priceCircularItemModel.getNetPrice2());
579
							fofoAvailabilityInfoMap.get(itemId).setNlc(priceCircularItemModel == null ? 0 : priceCircularItemModel.getNetPrice2());
584
						}
580
						}
585
					} else {
581
					} else {
586
						FofoAvailabilityInfo fdi = new FofoAvailabilityInfo();
582
						FofoAvailabilityInfo fdi = new FofoAvailabilityInfo();
587
						List<SaholicCIS> currentAvailability = itemAvailabilityMap.get(itemId);
583
						List<SaholicCIS> currentAvailability = itemAvailabilityMap.get(itemId);