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

                     LOGGER.info("fofoId" + fofoId);
                     brands = mongoClient.getMongoBrands(fofoId, null, 3).stream().map(x -> (String) x.get("name")).collect(Collectors.toSet());
+                }
                 map.put("brands", brands);
                 map.put("retailerBlockBrands", retailerBlockBrands);
-                if (this.containsRoleType(userRoles, role.getId())) {
-                    try {
-                        FofoStore fofoStore = fofoStoreRepository.selectByRetailerId(retailerId);
-                        map.put("fofoStore", fofoStore);
-                        // map.put("counterSize", fofoStore.getCounterSize().toString());
-                        // LOGGER.info("fofoStore" + fofoStore);
-                    } catch (ProfitMandiBusinessException profitMandiBusinessException) {
-                        LOGGER.error("FofoStore code not found");
-                    }
-                }
-                if (this.containsRoleType(userRoles, role.getId())) {
-                    try {
-                        FofoStore fofoStore = fofoStoreRepository.selectByRetailerId(retailerId);
-                        AST ast = aSTRepository.selectById(fofoStore.getAstId()).get(0);
-                        Map<String, Object> astDetail = postOfficeService.getAreasAndTerritoriesByAstId(ast.getId());
-                        LOGGER.info("astDetail {}", astDetail);
-                        map.put("astDetail", astDetail);
-                    } catch (ProfitMandiBusinessException profitMandiBusinessException) {
-                        LOGGER.error("AST Detail not found");
-                    }
-                }
                 try {
                     PrivateDealUser privateDealUser = privateDealUserRepository.selectById(retailer.getId());
                     if (privateDealUser.getCounterId() != null) {
                         Counter counter = counterRepository.selectById(privateDealUser.getCounterId());
                     map.put("districtMasters", districtMasters);
                     // LOGGER.info("districtMasters" + districtMasters);
                     List<Shop> shops = shopRepository.selectByRetailerId(retailer.getId());
                     map.put("shops", shops);
                     this.addAddress(shops);
+                    if (this.containsRoleType(userRoles, role.getId())) {
+                        try {
+                            FofoStore fofoStore = fofoStoreRepository.selectByRetailerId(retailerId);
+                            map.put("fofoStore", fofoStore);
+                            List<AST> astDetail = postOfficeService.getAreasAndTerritoriesByStateName(retailerAddress.getState());
+                            LOGGER.info("astDetail {}", astDetail);
+                            map.put("astDetail", astDetail);
+                            // map.put("counterSize", fofoStore.getCounterSize().toString());
+                            // LOGGER.info("fofoStore" + fofoStore);
+                        } catch (ProfitMandiBusinessException profitMandiBusinessException) {
+                            LOGGER.error("FofoStore code not found");
+                        }
+                    }
                     // LOGGER.info("shops" + shops);
                 } catch (ProfitMandiBusinessException profitMandiBusinessException) {
                     LOGGER.error("Retailer Registered Address not found");
+                }
             } catch (ProfitMandiBusinessException profitMandiBusinessException) {
+    }
     @SuppressWarnings("unchecked")
     @Override
-    public Map<String, Object> updateRetailerDetails(UpdateRetailerRequest updateRetailerRequest) throws ProfitMandiBusinessException {
+    public Map<String, Object> updateRetailerDetails(UpdateRetailerRequest updateRetailerRequest) throws
+            ProfitMandiBusinessException {
         Map<String, Object> map = this.getByEmailIdOrMobileNumber(updateRetailerRequest.getEmailIdOrMobileNumber());
         User dtrUser = (User) map.get("user");
         dtrUser = this.createUser(dtrUser, updateRetailerRequest);
             fofoPartnerPaymentOptionRepository.persist(fofoPartnerPaymentOption);
+        }
+    }
-    private User createUser(User user, UpdateRetailerRequest updateRetailerRequest) throws ProfitMandiBusinessException {
+    private User createUser(User user, UpdateRetailerRequest updateRetailerRequest) throws
+            ProfitMandiBusinessException {
         User dtrUser = null;
         try {
             dtrUser = userRepository.selectByMobileNumber(updateRetailerRequest.getUserMobileNumber());
         } catch (ProfitMandiBusinessException e) {
             userUserRepository.persist(saholicUser);
+        }
         return saholicUser;
+    }
-    private Retailer updateRetailer(User user, Retailer retailer, UpdateRetailerRequest updateRetailerRequest) throws ProfitMandiBusinessException {
+    private Retailer updateRetailer(User user, Retailer retailer, UpdateRetailerRequest updateRetailerRequest) throws
+            ProfitMandiBusinessException {
         if (retailer == null) {
             LOGGER.info("createSaholicUser.....");
             int saholicUserId = this.createSaholicUser(user, updateRetailerRequest.getName());
             retailer = new Retailer();
             retailer.setId(saholicUserId);
         } catch (ProfitMandiBusinessException e) {
+        }
+    }
-    private void createPrivateDealUser(User user, boolean fofo, String gstNumber, Retailer retailer, int retailerAddressId) {
+    private void createPrivateDealUser(User user, boolean fofo, String gstNumber, Retailer retailer,
+                                       int retailerAddressId) {
         PrivateDealUser privateDealUser = null;
         try {
             privateDealUser = privateDealUserRepository.selectById(retailer.getId());
         } catch (ProfitMandiBusinessException profitMandiBusinessException) {
             LOGGER.error("PrivateDealUser not found");
         } else {
             return null;
+        }
+    }
-    private Address updateRetailerAddress(Address address, CustomAddress customAddress, int retailerId) throws ProfitMandiBusinessException {
+    private Address updateRetailerAddress(Address address, CustomAddress customAddress, int retailerId) throws
+            ProfitMandiBusinessException {
         if (address == null) {
             address = new Address();
             address.setRetaierId(retailerId);
             this.updateAddress(address, customAddress);
             // addressRepository.persist(addressRetailer);
         address.setState(state.getName());
         addressRepository.persist(address);
         LOGGER.info("Address Updated" + address);
+    }
-    private void updateRetailerShops(List<Shop> shops, Set<CustomShop> customShops, int retailerId, Address sameAsRetailerAddressValue) throws ProfitMandiBusinessException {
+    private void updateRetailerShops(List<Shop> shops, Set<CustomShop> customShops, int retailerId, Address
+            sameAsRetailerAddressValue) throws ProfitMandiBusinessException {
         if (shops.isEmpty()) {
             for (CustomShop customShop : customShops) {
                 Shop shop = new Shop();
                 this.createOrUpdateShop(shop, customShop, retailerId, sameAsRetailerAddressValue);
                 shops.add(shop);
+                }
+            }
+        }
+    }
-    private void createOrUpdateShop(Shop shop, CustomShop customShop, int retailerId, Address sameAsRetailerAddressValue) throws ProfitMandiBusinessException {
+    private void createOrUpdateShop(Shop shop, CustomShop customShop, int retailerId, Address
+            sameAsRetailerAddressValue) throws ProfitMandiBusinessException {
         shop.setRetailerId(retailerId);
         shop.setName(customShop.getName());
         if (customShop.getDocumentId() > 0) {
             if (shop.getDocumentId() != null && shop.getDocumentId() != customShop.getDocumentId()) {
                 try {
         Function<Role, String> roleToNameFunction = role -> String.valueOf(role.getName());
         Set<String> userRoleStrings = roles.stream().map(roleToNameFunction).collect(Collectors.toSet());
         return String.join(", ", userRoleStrings);
+    }
+    private FofoStore createFofoStoreCodeByRetailerId(int retailerId, String districtName, String
-    private FofoStore createFofoStoreCodeByRetailerId(int retailerId, String districtName, String stateName, UpdateRetailerRequest updateRetailerRequest) throws ProfitMandiBusinessException {
+            stateName, UpdateRetailerRequest updateRetailerRequest) throws ProfitMandiBusinessException {
         FofoStore fofoStore = null;
         try {
             fofoStore = fofoStoreRepository.selectByRetailerId(retailerId);
             fofoStore.setActivationType(ActivationType.ACTIVE);
         return fofoStore;
+    }
     @Override
+    public FofoStore createFofoStoreCodeByUserId(int userId, String districtName, String
-    public FofoStore createFofoStoreCodeByUserId(int userId, String districtName, String stateName, UpdateRetailerRequest updateRetailerRequest) throws ProfitMandiBusinessException {
+            stateName, UpdateRetailerRequest updateRetailerRequest) throws ProfitMandiBusinessException {
         User user = userRepository.selectById(userId);
         // = userAccountRepository.selectRetailerIdByUserId(user.getId());
         UserAccount userAccounts = userAccountRepository.selectSaholicByUserId(user.getId());
         Retailer retailer = retailerRepository.selectById(userAccounts.getAccountKey());
         Role roleFofo = roleRepository.selectByName(RoleType.FOFO.toString());
         List<Integer> storeIds = storeStream.map(x -> x.getId()).collect(Collectors.toList());
         return this.getFofoRetailers(storeIds);
+    }
     @Override
-    public LoginRequestResponseModel registerWebUser(LoginRequestResponseModel loginRequestModel) throws ProfitMandiBusinessException {
+    public LoginRequestResponseModel registerWebUser(LoginRequestResponseModel loginRequestModel) throws
+            ProfitMandiBusinessException {
         com.spice.profitmandi.dao.entity.user.User saholicUser = this.createSaholicUser(loginRequestModel);
         loginRequestModel.setUserId(saholicUser.getId());
         this.createRetailerAddress(loginRequestModel);
         privateDealUserAddressMapping.setAddressId(loginRequestModel.getBusinessAddress().getId());
         privateDealUserAddressMappingRepository.persist(privateDealUserAddressMapping);
+    }
-    private void createRetailerAddress(LoginRequestResponseModel loginRequestResponseModel) throws ProfitMandiBusinessException {
+    private void createRetailerAddress(LoginRequestResponseModel loginRequestResponseModel) throws
+            ProfitMandiBusinessException {
         Address businessAddress = loginRequestResponseModel.getBusinessAddress();
         businessAddress.setRetaierId(loginRequestResponseModel.getUserId());
         addressRepository.persist(businessAddress);
+    }
+    }
     //    @Override
     @Cacheable(value = "getContactsByFofoId", cacheManager = "oneDayCacheManager")
-    public List<RetailerContact> getContactsByFofoId(int fofoId, boolean activeOnly) throws ProfitMandiBusinessException {
+    public List<RetailerContact> getContactsByFofoId(int fofoId, boolean activeOnly) throws
+            ProfitMandiBusinessException {
         List<RetailerContact> retailerContacts = retailerContactRepository.selectAllByRetailerId(fofoId, activeOnly);
         com.spice.profitmandi.dao.entity.user.User user = userUserRepository.selectById(fofoId);
         RetailerContact retailerContact = new RetailerContact();
         retailerContact.setMobile(user.getMobileNumber());
         retailerContact.setName(user.getName());
         return retailerContacts;
+    }
     @Override
-    public Map<Integer, CustomRetailer> getFofoRetailersPaginated(boolean activeOnly, int offset, int limit, FofoType fofoType) {
+    public Map<Integer, CustomRetailer> getFofoRetailersPaginated(boolean activeOnly, int offset,
+                                                                  int limit, FofoType fofoType) {
         Stream<FofoStore> storeStream = fofoStoreRepository.selectByStatusFofoType(activeOnly, fofoType, offset, limit).stream();
         List<Integer> storeIds = storeStream.map(x -> x.getId()).collect(Collectors.toList());
         return this.getFofoRetailers(storeIds);

Subversion Repositories SmartDukaan

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