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

 import com.spice.profitmandi.common.enumuration.FofoType;
 import com.spice.profitmandi.common.exception.ProfitMandiBusinessException;
 import com.spice.profitmandi.common.model.*;
 import com.spice.profitmandi.common.util.StringUtils;
 import com.spice.profitmandi.common.util.Utils;
-import com.spice.profitmandi.dao.entity.dtr.User;
 import com.spice.profitmandi.dao.entity.dtr.*;
+import com.spice.profitmandi.dao.entity.dtr.User;
 import com.spice.profitmandi.dao.entity.fofo.*;
 import com.spice.profitmandi.dao.entity.inventory.State;
 import com.spice.profitmandi.dao.entity.logistics.AST;
 import com.spice.profitmandi.dao.entity.logistics.ASTRepository;
 import com.spice.profitmandi.dao.entity.user.*;
 import com.spice.profitmandi.dao.enumuration.dtr.RetailerType;
 import com.spice.profitmandi.dao.enumuration.dtr.RoleType;
 import com.spice.profitmandi.dao.enumuration.fofo.PaymentOptionType;
 import com.spice.profitmandi.dao.enumuration.transaction.PartnerVerificationApprovalStatus;
 import com.spice.profitmandi.dao.model.LastMonthCreditedIncomeModel;
-import com.spice.profitmandi.dao.repository.dtr.UserRepository;
 import com.spice.profitmandi.dao.repository.dtr.*;
+import com.spice.profitmandi.dao.repository.dtr.UserRepository;
 import com.spice.profitmandi.dao.repository.fofo.*;
 import com.spice.profitmandi.dao.repository.inventory.StateRepository;
 import com.spice.profitmandi.dao.repository.user.*;
 import com.spice.profitmandi.service.PostOfficeService;
+import com.spice.profitmandi.service.catalog.BrandsService;
 import in.shop2020.model.v1.user.CartStatus;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
     OfferPayoutRepository offerPayoutRepository;
     @Autowired
     PartnerTypeChangeService partnerTypeChangeService;
+    @Autowired
+    BrandsService brandsService;
     @Override
     public Map<String, Object> getByEmailIdOrMobileNumber(String emailIdOrMobileNumber) throws ProfitMandiBusinessException {
         User user = null;
         int fofoId = Utils.SYSTEM_PARTNER_ID;
                 map.put("retailer", retailer);
                 List<String> retailerBlockBrands = null;
                 Set<String> brands = null;
                 if (retailer.getId() != fofoId) {
-                    brands = mongoClient.getMongoBrands(retailer.getId(), null, 3).stream().map(x -> (String) x.get("name")).collect(Collectors.toSet());
+                    brands = brandsService.getBrands(retailer.getId(), null, 3).stream().map(x -> x.getName()).collect(Collectors.toSet());
-                    retailerBlockBrands = retailerBlockBrandsRepository.selectAllByRetailer(retailer.getId()).stream().map(x -> x.getBlockBrands()).collect(Collectors.toList());
+                    retailerBlockBrands = brandsService.partnerIneligibleBrands(fofoId);
-                    LOGGER.info("loginDetailsFofoId" + retailer.getId());
                 } else {
                     LOGGER.info("fofoId" + fofoId);
-                    brands = mongoClient.getMongoBrands(fofoId, null, 3).stream().map(x -> (String) x.get("name")).collect(Collectors.toSet());
+                    brands = brandsService.getBrands(fofoId, null, 3).stream().map(x -> x.getName()).collect(Collectors.toSet());
+                }
                 map.put("brands", brands);
                 map.put("retailerBlockBrands", retailerBlockBrands);
                 try {
             String fofoStoreCode = StringUtils.generateFofoStoreSequence(
                     districtMaster.getStateShortName() + districtMaster.getShortName(), nextStoreCodeInt);
             fofoStore.setCode(fofoStoreCode);
             fofoStore.setCodeInt(nextStoreCodeInt);
             fofoStore.setBagsLastCredited(LocalDateTime.now());
+            if (retailerAddress.getName().contains(ProfitMandiConstants.COMPANY_NAME) || retailerAddress.getName().contains(ProfitMandiConstants.COMPANY_SHORT_NAME)) {
+                fofoStore.setInternal(true);
+            } else {
+                fofoStore.setInternal(false);
+            }
+            fofoStore.setFofoType(FofoType.FRANCHISE);
             fofoStore.setFofoType(updateRetailerRequest.getFofoType());
             fofoStore.setActivationType(ActivationType.ACTIVE);
             fofoStoreRepository.persist(fofoStore);
             // Auto fill in onboarding Panel
     @Override
     @Cacheable(value = "allFofoRetailersInternalFalse", cacheManager = "thirtyMinsTimeOutCacheManager")
     public Map<Integer, CustomRetailer> getAllFofoRetailersInternalFalse() throws ProfitMandiBusinessException {
         // TODO Auto-generated method stub
-        Stream<FofoStore> storeStream = fofoStoreRepository.selectAll().stream().filter(x-> !x.isInternal());
-        List<Integer> storeIds = storeStream.map(x -> x.getId()).collect(Collectors.toList());
+        List<Integer> storeIds = fofoStoreRepository.selectAll().stream().filter(x -> x.getFofoType().equals(FofoType.FRANCHISE)).map(x -> x.getId()).collect(Collectors.toList());
         return this.getFofoRetailers(storeIds);
+    }
     @Override
     public LoginRequestResponseModel registerWebUser(LoginRequestResponseModel loginRequestModel) throws

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java – Rev 34942 → 35203