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

     @SuppressWarnings("unchecked")
     @Override
     public Map<String, Object> updateRetailerDetails(UpdateRetailerRequest updateRetailerRequest) throws ProfitMandiBusinessException {
         Map<String, Object> map = this.getByEmailIdOrMobileNumber(updateRetailerRequest.getEmailIdOrMobileNumber());
-        User user = (User) map.get("user");
+        User dtrUser = (User) map.get("user");
-        user = this.createUser(user, updateRetailerRequest);
+        dtrUser = this.createUser(dtrUser, updateRetailerRequest);
-        map.put("user", user);
+        map.put("user", dtrUser);
         List<UserRole> userRoles = (List<UserRole>) map.get("userRoles");
         Role roleUser = roleRepository.selectByName(RoleType.USER.toString());
-        userRoles = this.addRole(userRoles, user.getId(), roleUser.getId());
+        userRoles = this.addRole(userRoles, dtrUser.getId(), roleUser.getId());
         Retailer retailer = (Retailer) map.get("retailer");
-        retailer = this.updateRetailer(user, retailer, updateRetailerRequest);
+        retailer = this.updateRetailer(dtrUser, retailer, updateRetailerRequest);
         map.put("retailer", retailer);
         List<String> retailerBlockBrands = retailerBlockBrandsRepository.selectAllByRetailer(retailer.getId()).stream().map(x -> x.getBlockBrands()).collect(Collectors.toList());
+        }
         map.put("retailerBlockBrands", retailerBlockBrands);
         Role roleRetailer = roleRepository.selectByName(RoleType.RETAILER.toString());
-        userRoles = this.addRole(userRoles, user.getId(), roleRetailer.getId());
+        userRoles = this.addRole(userRoles, dtrUser.getId(), roleRetailer.getId());
         Role roleFofo = roleRepository.selectByName(RoleType.FOFO.toString());
         if (updateRetailerRequest.isFofo()) {
-            userRoles = this.addRole(userRoles, user.getId(), roleFofo.getId());
+            userRoles = this.addRole(userRoles, dtrUser.getId(), roleFofo.getId());
         } else {
-            userRoles = this.removeRole(userRoles, user.getId(), roleFofo.getId());
+            userRoles = this.removeRole(userRoles, dtrUser.getId(), roleFofo.getId());
+        }
         map.put("fofoRole", this.containsRoleType(userRoles, roleFofo.getId()));
         if (this.containsRoleType(userRoles, roleFofo.getId())) {
             this.createDefaultPaymentOption(retailer.getId());
             FofoStore fofoStore = this.createFofoStoreCodeByRetailerId(retailer.getId(), updateRetailerRequest.getDistrictName(), retailerAddress.getState(), updateRetailerRequest);
             map.put("fofoStore", fofoStore);
             fofoStore.setActive(updateRetailerRequest.isActive());
+        }
-        this.createPrivateDealUser(user, updateRetailerRequest.isFofo(), updateRetailerRequest.getGstNumber(), retailer, retailerAddress.getId());
+        this.createPrivateDealUser(dtrUser, updateRetailerRequest.isFofo(), updateRetailerRequest.getGstNumber(), retailer, retailerAddress.getId());
         map.put("gstNumber", updateRetailerRequest.getGstNumber());
         this.updateSaholicUser(retailer.getId(), retailerAddress.getId());
         List<Shop> shops = (List<Shop>) map.get("shops");
         if (shops == null) {
             fofoPartnerPaymentOptionRepository.persist(fofoPartnerPaymentOption);
+        }
+    }
-    private User createUser(User user, UpdateRetailerRequest updateRetailerRequest) {
+    private User createUser(User user, UpdateRetailerRequest updateRetailerRequest) throws ProfitMandiBusinessException {
+        User dtrUser = userRepository.selectByMobileNumber(updateRetailerRequest.getUserMobileNumber());
+        if(dtrUser != null) throw new ProfitMandiBusinessException("Mobile already exist", updateRetailerRequest.getUserMobileNumber(),"");
+        User dtrUserByEmail = userRepository.selectByMobileNumber(updateRetailerRequest.getUserEmailId());
+        if(dtrUserByEmail != null) throw new ProfitMandiBusinessException("Email already exist", updateRetailerRequest.getUserEmailId(),"");
         if (user == null) {
             user = new User();
             user.setCity("");
             user.setPinCode(0);
             user.setState("");
             user.setReferral_url("");
             user.setGroup_id(1);
             user.setStatus(1);
             user.setActivated(true);
             user.setCreateTimestamp(LocalDateTime.now());
-            user.setEmailId(" ");
+        }
         user.setActivated(updateRetailerRequest.isActive());
         user.setFirstName(updateRetailerRequest.getUserFirstName());
         user.setLastName(updateRetailerRequest.getUserLastName());
         user.setMobileNumber(updateRetailerRequest.getUserMobileNumber());
+        }
         return saholicUser.getId();
+    }
     private com.spice.profitmandi.dao.entity.user.User createSaholicUser(
-                                                                         LoginRequestResponseModel loginRequestResponseModel) {
+            LoginRequestResponseModel loginRequestResponseModel) {
         com.spice.profitmandi.dao.entity.user.User saholicUser = null;
         try {
             saholicUser = userUserRepository.selectByEmailId(loginRequestResponseModel.getEmail());
             saholicUser.setCreateTimestamp(LocalDateTime.now());
         } catch (ProfitMandiBusinessException e) {
         fofoUser.setEmailId(newEmail);
         thisDtrUser.setEmailId(newEmail);
+    }
-//    @Override
+    //    @Override
     @Cacheable(value = "getContactsByFofoId", cacheManager = "oneDayCacheManager")
     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();

Subversion Repositories SmartDukaan

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