Subversion Repositories SmartDukaan

Rev

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

Rev 35232 Rev 35236
Line 35... Line 35...
35
import com.spice.profitmandi.dao.repository.transaction.OrderRepository;
35
import com.spice.profitmandi.dao.repository.transaction.OrderRepository;
36
import com.spice.profitmandi.dao.repository.user.AddressRepository;
36
import com.spice.profitmandi.dao.repository.user.AddressRepository;
37
import com.spice.profitmandi.dao.repository.user.CounterRepository;
37
import com.spice.profitmandi.dao.repository.user.CounterRepository;
38
import com.spice.profitmandi.dao.repository.user.PrivateDealUserRepository;
38
import com.spice.profitmandi.dao.repository.user.PrivateDealUserRepository;
39
import com.spice.profitmandi.dao.repository.warehouse.WarehouseInventoryItemRepository;
39
import com.spice.profitmandi.dao.repository.warehouse.WarehouseInventoryItemRepository;
-
 
40
import com.spice.profitmandi.service.catalog.BrandsService;
40
import com.spice.profitmandi.service.integrations.bharti.model.PlanVariant;
41
import com.spice.profitmandi.service.integrations.bharti.model.PlanVariant;
41
import com.spice.profitmandi.service.integrations.zest.InsuranceService;
42
import com.spice.profitmandi.service.integrations.zest.InsuranceService;
42
import com.spice.profitmandi.service.integrations.zest.MobileInsurancePlan;
43
import com.spice.profitmandi.service.integrations.zest.MobileInsurancePlan;
43
import com.spice.profitmandi.service.inventory.InventoryService;
44
import com.spice.profitmandi.service.inventory.InventoryService;
44
import com.spice.profitmandi.service.inventory.PurchaseReturnService;
45
import com.spice.profitmandi.service.inventory.PurchaseReturnService;
Line 86... Line 87...
86
    static {
87
    static {
87
        serialNumberOrderIdMap.put("862897055749275", 67228);
88
        serialNumberOrderIdMap.put("862897055749275", 67228);
88
    }
89
    }
89
 
90
 
90
    @Autowired
91
    @Autowired
-
 
92
    BrandsService brandsService;
-
 
93
 
-
 
94
    @Autowired
91
    @Qualifier("fofoInventoryItemRepository")
95
    @Qualifier("fofoInventoryItemRepository")
92
    private InventoryItemRepository inventoryItemRepository;
96
    private InventoryItemRepository inventoryItemRepository;
93
 
97
 
94
    @Autowired
98
    @Autowired
95
    private StateGstRateRepository stateGstRateRepository;
99
    private StateGstRateRepository stateGstRateRepository;
Line 2501... Line 2505...
2501
        Predicate p2 = cb.between(fofoOrder.get(ProfitMandiConstants.CREATE_TIMESTAMP), lastCredit, LocalDate.now().atStartOfDay());
2505
        Predicate p2 = cb.between(fofoOrder.get(ProfitMandiConstants.CREATE_TIMESTAMP), lastCredit, LocalDate.now().atStartOfDay());
2502
        Predicate p3 = cb.isNull(fofoOrder.get("cancelledTimestamp"));
2506
        Predicate p3 = cb.isNull(fofoOrder.get("cancelledTimestamp"));
2503
        Predicate joinPredicate = cb.and(
2507
        Predicate joinPredicate = cb.and(
2504
                cb.equal(fofoOrder.get(ProfitMandiConstants.ID), fofoOrderItem.get(ProfitMandiConstants.ORDER_ID)), cb.equal(fofoOrderItem.get("itemId"), tagListingRoot.get("itemId")), cb.equal(itemRoot.get("id"), tagListingRoot.get("itemId")), cb.equal(fofoOrder.get(ProfitMandiConstants.FOFO_ID), fofoId));
2508
                cb.equal(fofoOrder.get(ProfitMandiConstants.ID), fofoOrderItem.get(ProfitMandiConstants.ORDER_ID)), cb.equal(fofoOrderItem.get("itemId"), tagListingRoot.get("itemId")), cb.equal(itemRoot.get("id"), tagListingRoot.get("itemId")), cb.equal(fofoOrder.get(ProfitMandiConstants.FOFO_ID), fofoId));
2505
        ItemCriteria itemCriteria = new ItemCriteria();
2509
        ItemCriteria itemCriteria = new ItemCriteria();
2506
        itemCriteria.setBrands(mongoClient.getMongoBrands(fofoId, null, 3).stream().map(x -> (String) x.get("name")).collect(Collectors.toList()));
2510
        itemCriteria.setBrands(brandsService.getBrands(fofoId, null, 3).stream().map(x -> x.getName()).collect(Collectors.toList()));
2507
        float startValue = 12000;
2511
        float startValue = 12000;
2508
        itemCriteria.setStartPrice(startValue);
2512
        itemCriteria.setStartPrice(startValue);
2509
        itemCriteria.setEndPrice(0);
2513
        itemCriteria.setEndPrice(0);
2510
        itemCriteria.setFeaturedPhone(false);
2514
        itemCriteria.setFeaturedPhone(false);
2511
        itemCriteria.setSmartPhone(true);
2515
        itemCriteria.setSmartPhone(true);