WebSVN – SmartDukaan – Diff – /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java

 package com.spice.profitmandi.web.controller;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.AbstractMap;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletRequest;
-import javax.transaction.Transactional;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.json.JSONObject;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.core.io.InputStreamResource;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import com.spice.profitmandi.common.enumuration.ContentType;
 import com.spice.profitmandi.common.enumuration.CounterSize;
 import com.spice.profitmandi.common.enumuration.FofoType;
 import com.spice.profitmandi.common.exception.ProfitMandiBusinessException;
-import com.spice.profitmandi.common.model.AddLocationModel;
-import com.spice.profitmandi.common.model.CustomRetailer;
+import com.spice.profitmandi.common.model.*;
-import com.spice.profitmandi.common.model.ProfitMandiConstants;
-import com.spice.profitmandi.common.model.PromoterDetailModel;
-import com.spice.profitmandi.common.model.SelectStorePartnerInfo;
-import com.spice.profitmandi.common.model.SendMessageModel;
-import com.spice.profitmandi.common.model.UpdateRetailerRequest;
 import com.spice.profitmandi.common.util.Utils;
 import com.spice.profitmandi.common.web.util.ResponseSender;
 import com.spice.profitmandi.dao.entity.auth.AuthUser;
-import com.spice.profitmandi.dao.entity.dtr.BrandLimit;
-import com.spice.profitmandi.dao.entity.dtr.Document;
-import com.spice.profitmandi.dao.entity.dtr.Retailer;
-import com.spice.profitmandi.dao.entity.dtr.RetailerBlockBrands;
-import com.spice.profitmandi.dao.entity.dtr.RetailerBrandsLimit;
-import com.spice.profitmandi.dao.entity.dtr.Shop;
+import com.spice.profitmandi.dao.entity.dtr.*;
-import com.spice.profitmandi.dao.entity.fofo.FofoStore;
+import com.spice.profitmandi.dao.entity.fofo.*;
-import com.spice.profitmandi.dao.entity.fofo.PartnerOnBoardingPanel;
-import com.spice.profitmandi.dao.entity.fofo.PartnerType;
-import com.spice.profitmandi.dao.entity.fofo.PartnerTypeChange;
-import com.spice.profitmandi.dao.entity.fofo.PaymentOption;
-import com.spice.profitmandi.dao.entity.fofo.PincodePartner;
 import com.spice.profitmandi.dao.entity.user.Location;
 import com.spice.profitmandi.dao.entity.user.Promoter;
 import com.spice.profitmandi.dao.entity.user.User;
 import com.spice.profitmandi.dao.repository.auth.AuthRepository;
 import com.spice.profitmandi.dao.repository.cs.CsService;
 import com.spice.profitmandi.dao.repository.cs.RetailerBrandsLimitService;
-import com.spice.profitmandi.dao.repository.dtr.BrandLimitRepository;
-import com.spice.profitmandi.dao.repository.dtr.DocumentRepository;
-import com.spice.profitmandi.dao.repository.dtr.FofoStoreRepository;
-import com.spice.profitmandi.dao.repository.dtr.Mongo;
+import com.spice.profitmandi.dao.repository.dtr.*;
-import com.spice.profitmandi.dao.repository.dtr.PartnerOnBoardingPanelRepository;
-import com.spice.profitmandi.dao.repository.dtr.RetailerBlockBrandsRepository;
-import com.spice.profitmandi.dao.repository.dtr.RetailerBrandsLimitRepository;
-import com.spice.profitmandi.dao.repository.dtr.RetailerRepository;
-import com.spice.profitmandi.dao.repository.dtr.ShopRepository;
 import com.spice.profitmandi.dao.repository.fofo.PartnerTypeChangeRepository;
 import com.spice.profitmandi.dao.repository.fofo.PartnerTypeChangeService;
 import com.spice.profitmandi.dao.repository.fofo.PincodePartnerRepository;
 import com.spice.profitmandi.dao.repository.user.LocationRepository;
 import com.spice.profitmandi.dao.repository.user.PromoterRepository;
 import com.spice.profitmandi.service.user.RetailerService;
 import com.spice.profitmandi.service.user.StoreTimelineTatService;
 import com.spice.profitmandi.web.model.LoginDetails;
 import com.spice.profitmandi.web.util.CookiesProcessor;
 import com.spice.profitmandi.web.util.MVCResponseSender;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.json.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.core.io.InputStreamResource;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.transaction.Transactional;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.stream.Collectors;
 @Controller
 @Transactional(rollbackOn = Throwable.class)
 public class RetailerController {
 	@Autowired
 	private StoreTimelineTatService storeTimelineTatService;
 	@RequestMapping(value = "/retailerDetails", method = RequestMethod.GET)
 	public String retailerInfoByEmailIdOrMobileNumber(HttpServletRequest request,
-			@RequestParam(name = ProfitMandiConstants.EMAIL_ID_OR_MOBILE_NUMBER) String emailIdOrMobileNumber,
+													  @RequestParam(name = ProfitMandiConstants.EMAIL_ID_OR_MOBILE_NUMBER) String emailIdOrMobileNumber,
-			Model model) throws ProfitMandiBusinessException {
+													  Model model) throws ProfitMandiBusinessException {
 		LOGGER.info("Request Received at url {} with emailIdOrMobileNumber {}", request.getRequestURI(),
 				emailIdOrMobileNumber);
 		Map<String, Object> map = retailerService.getByEmailIdOrMobileNumber(emailIdOrMobileNumber);
 		return "retailer-details";
+	}
 	@RequestMapping(value = "/retailerDetails", method = RequestMethod.PUT)
 	public String updateRetailerDetails(HttpServletRequest request,
-			@RequestBody UpdateRetailerRequest updateRetailerRequest, Model model) throws ProfitMandiBusinessException {
+										@RequestBody UpdateRetailerRequest updateRetailerRequest, Model model) throws ProfitMandiBusinessException {
 		LOGGER.info("Request Received at url {} with body {}", request.getRequestURI(), updateRetailerRequest);
 		Map<String, Object> map = retailerService.updateRetailerDetails(updateRetailerRequest);
 		model.addAllAttributes(map);
 		model.addAttribute("counterSizes", CounterSize.values());
 		return responseSender.ok(retailerService.getAllDistrictMaster(stateName));
+	}
 	@RequestMapping(value = "/retailerDocument/documentId", method = RequestMethod.GET)
 	public ResponseEntity<?> retailerDocumentById(HttpServletRequest request,
-			@RequestParam(name = ProfitMandiConstants.DOCUMENT_ID) int documentId,
+												  @RequestParam(name = ProfitMandiConstants.DOCUMENT_ID) int documentId,
-			@RequestParam(name = ProfitMandiConstants.RETAILER_ID) int retailerId) throws ProfitMandiBusinessException {
+												  @RequestParam(name = ProfitMandiConstants.RETAILER_ID) int retailerId) throws ProfitMandiBusinessException {
 		Document document = documentRepository.selectById(documentId);
 		Retailer retailer = retailerRepository.selectById(retailerId);
 		if (retailer.getDocumentId() == null) {
 			throw new ProfitMandiBusinessException(ProfitMandiConstants.RETAILER_ID, retailer.getId(), "RTLR_1012");
 		return responseSender.ok(document);
+	}
 	@RequestMapping(value = "/retailerDocument/download", method = RequestMethod.GET)
 	public ResponseEntity<?> downloadRetailerDocument(HttpServletRequest request,
-			@RequestParam(name = ProfitMandiConstants.RETAILER_ID) int retailerId, Model model)
+													  @RequestParam(name = ProfitMandiConstants.RETAILER_ID) int retailerId, Model model)
 			throws ProfitMandiBusinessException {
 		Retailer retailer = retailerRepository.selectById(retailerId);
 		if (retailer.getDocumentId() == null) {
 		// responseSender.ok(ResponseCodeHolder.getMessage("ITM_AGNG_OK_1000"));
+	}
 	@RequestMapping(value = "/retailerShopDocument/shopId", method = RequestMethod.GET)
 	public ResponseEntity<?> retailerShopDocumentById(HttpServletRequest request,
-			@RequestParam(name = ProfitMandiConstants.SHOP_ID) int shopId,
+													  @RequestParam(name = ProfitMandiConstants.SHOP_ID) int shopId,
-			@RequestParam(name = ProfitMandiConstants.RETAILER_ID) int retailerId) throws ProfitMandiBusinessException {
+													  @RequestParam(name = ProfitMandiConstants.RETAILER_ID) int retailerId) throws ProfitMandiBusinessException {
 		Shop shop = shopRepository.selectById(shopId);
 		if (shop.getRetailerId() != retailerId) {
 			throw new ProfitMandiBusinessException(ProfitMandiConstants.SHOP_ID, shop.getId(), "SHP_1004");
+		}
 		return responseSender.ok(document);
+	}
 	@RequestMapping(value = "/retailerShopDocument/download", method = RequestMethod.GET)
 	public ResponseEntity<?> downloadRetailerShopDocument(HttpServletRequest request,
-			@RequestParam(name = ProfitMandiConstants.SHOP_ID) int shopId,
+														  @RequestParam(name = ProfitMandiConstants.SHOP_ID) int shopId,
-			@RequestParam(name = ProfitMandiConstants.RETAILER_ID) int retailerId, Model model)
+														  @RequestParam(name = ProfitMandiConstants.RETAILER_ID) int retailerId, Model model)
 			throws ProfitMandiBusinessException {
 		Shop shop = shopRepository.selectById(shopId);
 		if (shop.getRetailerId() != retailerId) {
 		return new ResponseEntity<InputStreamResource>(inputStreamResource, headers, HttpStatus.OK);
 		// return
 		// responseSender.ok(ResponseCodeHolder.getMessage("ITM_AGNG_OK_1000"));
+	}
 	@GetMapping(value = "/getstore")
 	public String getstore(HttpServletRequest request, Model model) {
 		List<Integer> fofoIds = fofoStoreRepository.selectAll().stream().map(x -> x.getId())
 				.collect(Collectors.toList());
+		;
 		Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = retailerService.getFofoRetailers(fofoIds);
 		LOGGER.info("fofoIds" + fofoIds);
 		return "store";
+	}
 	@RequestMapping(value = "/getPartnerinfo")
 	public String getPartnerinfo(HttpServletRequest request,
-			@RequestBody SelectStorePartnerInfo selectStorePartnerInfo,Model model) throws ProfitMandiBusinessException {
+								 @RequestBody SelectStorePartnerInfo selectStorePartnerInfo, Model model) throws ProfitMandiBusinessException {
 		LOGGER.info("selectStorePartnerInfo" + selectStorePartnerInfo.getUserIds());
 		List<FofoStore> fofoStores = fofoStoreRepository.selectByRetailerIds(selectStorePartnerInfo.getUserIds());
 		LOGGER.info("fofoStoresInfo" + fofoStores);
 		Map<Integer, Boolean> investments = new HashMap<>();
 						fofoStore.setGraceDate(null);
 						fofoStore.setGraceCount(0);
 						fofoStoreRepository.persist(fofoStore);
+					}
 				} catch (ProfitMandiBusinessException e) {
-		     }
+				}
+			}
 			investments.put(fofoStore.getId(), isOk);
+		}
 		Map<Integer, CustomRetailer> customRetailers = retailerService.getFofoRetailers(false);
 		model.addAttribute("customRetailers", customRetailers);
 		return "store-investment";
+	}
 	@GetMapping(value = "/getAllStores")
 	public String getAllStores(HttpServletRequest request, Model model) {
 		List<FofoStore> fofoStores = fofoStoreRepository.selectAll().stream().filter(x -> x.isActive())
 				.collect(Collectors.toList());
 		return "partner-category";
+	}
 	@PostMapping(value = "/updatePartnerCategory")
 	public String updatePartnerCategory(HttpServletRequest request, @RequestParam(name = "fofoId") int fofoId,
-			@RequestParam(name = "partnerType") PartnerType partnerType, Model model) throws Exception {
+										@RequestParam(name = "partnerType") PartnerType partnerType, Model model) throws Exception {
 		PartnerTypeChange ptc = new PartnerTypeChange();
 		ptc.setFofoId(fofoId);
 		ptc.setPartnerType(partnerType);
 		ptc.setCreateTimestamp(LocalDate.now().atStartOfDay().plusDays(1));
 		return "response";
+	}
 	@PostMapping(value = "/deactivateStore")
 	public String deActivateStore(HttpServletRequest request,
-			@RequestParam(name = ProfitMandiConstants.FOFO_ID) int fofoId, Model model) throws Exception {
+								  @RequestParam(name = ProfitMandiConstants.FOFO_ID) int fofoId, Model model) throws Exception {
 		FofoStore fofoStore = fofoStoreRepository.selectByRetailerId(fofoId);
 		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
 		if (!Arrays.asList("kamini.sharma@smartdukaan.com", "tarun.verma@smartdukaan.com", "amit.gupta@smartdukaan.com")
 				.contains(loginDetails.getEmailId())) {
 			throw new ProfitMandiBusinessException("Access Denied", "Unauthorised Access",
 		return "response";
+	}
 	@PostMapping(value = "/activateStoreForever")
 	public String activateStoreForever(HttpServletRequest request,
-			@RequestParam(name = ProfitMandiConstants.FOFO_ID) int fofoId, Model model) throws Exception {
+									   @RequestParam(name = ProfitMandiConstants.FOFO_ID) int fofoId, Model model) throws Exception {
 		FofoStore fofoStore = fofoStoreRepository.selectByRetailerId(fofoId);
 		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
 		if (!Arrays.asList("kamini.sharma@smartdukaan.com", "tarun.verma@smartdukaan.com", "amit.gupta@smartdukaan.com",
 				"manish.tiwari@smartdukaan.com").contains(loginDetails.getEmailId())) {
 			throw new ProfitMandiBusinessException("Access Denied", "Unauthorised Access",
 		return "response";
+	}
 	@PostMapping(value = "/activateStoreTemporary")
 	public String activateStoreTemporary(HttpServletRequest request,
-			@RequestParam(name = ProfitMandiConstants.FOFO_ID) int fofoId,
+										 @RequestParam(name = ProfitMandiConstants.FOFO_ID) int fofoId,
-			@RequestParam(name = "days", required = true) int days, Model model) throws Exception {
+										 @RequestParam(name = "days", required = true) int days, Model model) throws Exception {
 		FofoStore fofoStore = fofoStoreRepository.selectByRetailerId(fofoId);
 		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
 		if (!Arrays.asList("kamini.sharma@smartdukaan.com", "tarun.verma@smartdukaan.com", "amit.gupta@smartdukaan.com",
 				"manish.tiwari@smartdukaan.com").contains(loginDetails.getEmailId())) {
+	}
 	// Extend billing for 2 days
 	@PostMapping(value = "/extendBilling")
 	public String extendBilling(HttpServletRequest request,
-			@RequestParam(name = ProfitMandiConstants.FOFO_ID) int fofoId, Model model) throws Exception {
+								@RequestParam(name = ProfitMandiConstants.FOFO_ID) int fofoId, Model model) throws Exception {
 		FofoStore fofoStore = fofoStoreRepository.selectByRetailerId(fofoId);
 		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
 		if (Arrays.asList("kamini.sharma@smartdukaan.com", "tarun.verma@smartdukaan.com", "prakash.rai@smartdukaan.com",
 				"amit.gupta@smartdukaan.com").contains(loginDetails.getEmailId())) {
 			fofoStore.setGraceDate(LocalDate.now().plusDays(2));
+	}
 	@RequestMapping(value = "/getPromoterInfo", method = RequestMethod.GET)
 	public String getPromoterInfo(HttpServletRequest request,
-			@RequestParam(name = "offset", defaultValue = "0") int offset,
+								  @RequestParam(name = "offset", defaultValue = "0") int offset,
-			@RequestParam(name = "limit", defaultValue = "10") int limit,
+								  @RequestParam(name = "limit", defaultValue = "10") int limit,
-			@RequestParam(name = "fofoId", required = false, defaultValue = "0") int fofoId, Model model)
+								  @RequestParam(name = "fofoId", required = false, defaultValue = "0") int fofoId, Model model)
 			throws Exception {
 		LOGGER.info("requested url : " + request.getRequestURL().toString());
 		List<Promoter> promoterInfo = null;
 		long size = 0;
+	}
 	@RequestMapping(value = "/getPaginatedPromoterInfo", method = RequestMethod.GET)
 	public String getPaginatedPromoterInfo(HttpServletRequest request,
-			@RequestParam(name = "offset", defaultValue = "0") int offset,
+										   @RequestParam(name = "offset", defaultValue = "0") int offset,
-			@RequestParam(name = "limit", defaultValue = "10") int limit,
+										   @RequestParam(name = "limit", defaultValue = "10") int limit,
-			@RequestParam(name = "fofoId", required = false, defaultValue = "0") int fofoId, Model model)
+										   @RequestParam(name = "fofoId", required = false, defaultValue = "0") int fofoId, Model model)
 			throws ProfitMandiBusinessException {
 		LOGGER.info("requested offset=[{}], limit = [{}]", offset, limit);
 		List<Promoter> promoterInfo = null;
 		if (fofoId != 0) {
 			promoterInfo = promoterRepository.selectAllPromoterByFofoId(fofoId, offset, limit);
 		return "promoter-info-paginated";
+	}
 	@RequestMapping(value = "/createPromoter", method = RequestMethod.POST)
 	public String createPromoter(HttpServletRequest request, @RequestBody PromoterDetailModel promoterdetailModel,
-			Model model) throws Exception {
+								 Model model) throws Exception {
 		LOGGER.info("requested url : " + request.getRequestURL().toString());
 		LOGGER.info("requested url : " + promoterdetailModel);
 		Promoter promoter = promoterRepository.selectById(promoterdetailModel.getId());
 		if (promoter == null) {
 			promoter = new Promoter();
+	}
 	@RequestMapping(value = "/removePromoterfromPartnerStore", method = RequestMethod.POST)
 	public String removePromoterfromPartnerStore(HttpServletRequest request,
-			@RequestParam(name = "id", defaultValue = "0") int id, Model model) throws Exception {
+												 @RequestParam(name = "id", defaultValue = "0") int id, Model model) throws Exception {
 		Promoter promoter = promoterRepository.selectById(id);
 		promoter.setStatus(false);
 		promoterRepository.persist(promoter);
+	}
 	@RequestMapping(value = "/updateLocation", method = RequestMethod.POST)
 	public String updateLocation(HttpServletRequest request, @RequestBody AddLocationModel addLocationModel,
-			Model model) throws Exception {
+								 Model model) throws Exception {
 		Location userlocation = locationRepository.selectById(addLocationModel.getUserId());
 		userlocation.setName(addLocationModel.getName());
 		userlocation.setCity(addLocationModel.getCity());
 		Map<Integer, List<Integer>> pp = csService.getAuthUserIdPartnerIdMapping();
 		Set<Integer> fofoIds = new HashSet<>(pp.get(authUser.getId()));
-		Map<Integer, CustomRetailer> customRetailersMap = fofoIds.stream().map(x->{
+		Map<Integer, CustomRetailer> customRetailersMap = fofoIds.stream().map(x -> {
 			try {
 				return retailerService.getFofoRetailer(x);
 			} catch (ProfitMandiBusinessException e) {
 				// TODO Auto-generated catch block
 				return null;
+			}
-		}).filter(x->x!=null).collect(Collectors.toMap(x->x.getPartnerId(), x->x));
+		}).filter(x -> x != null).collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
 		model.addAttribute("customRetailersMap", customRetailersMap);
 		return "partner-readonly-info";
+	}
 	@RequestMapping(value = "/getBlockBrand")
 	public String getBlockBrand(HttpServletRequest request,
-			@RequestParam(name = "brand", required = true, defaultValue = "0") String brand, Model model)
+								@RequestParam(name = "brand", required = true, defaultValue = "0") String brand, Model model)
 			throws Exception {
 		List<RetailerBlockBrands> retailerBlockBrands = retailerBlockBrandsRepository.selectAllByBrands(brand);
 		List<Integer> blockBrandPartners = retailerBlockBrands.stream().map(x -> x.getFofoId())
+	}
 	@RequestMapping(value = "/getRetailerBlockBrandMappping", method = RequestMethod.POST)
 	public String getBlockBrandMappping(HttpServletRequest request,
-			@RequestParam(name = "brand", required = true, defaultValue = "0") String brand,
+										@RequestParam(name = "brand", required = true, defaultValue = "0") String brand,
-			@RequestParam(name = "fofoIds", required = true, defaultValue = "0") List<Integer> fofoIds, Model model)
+										@RequestParam(name = "fofoIds", required = true, defaultValue = "0") List<Integer> fofoIds, Model model)
 			throws Exception {
 		List<RetailerBlockBrands> retailerBlockBrands = retailerBlockBrandsRepository.selectAllByBrands(brand);
 		if (!retailerBlockBrands.isEmpty()) {
 			retailerBlockBrandsRepository.deleteAllbyBrands(brand);
+		}
+	}
 	@RequestMapping(value = "/setUpdateLimit", method = RequestMethod.POST)
 	public String getUpdateLimit(HttpServletRequest request,
-			@RequestParam(name = "brand", required = true, defaultValue = "0") String brand,
+								 @RequestParam(name = "brand", required = true, defaultValue = "0") String brand,
-			@RequestParam(name = "fofoId", required = true, defaultValue = "0") int fofoId,
+								 @RequestParam(name = "fofoId", required = true, defaultValue = "0") int fofoId,
-			@RequestParam(name = "limit", required = true, defaultValue = "0") float limit, Model model)
+								 @RequestParam(name = "limit", required = true, defaultValue = "0") float limit, Model model)
 			throws Exception {
 		CustomRetailer cr = retailerService.getFofoRetailer(fofoId);
 		Map.Entry<Integer, CustomRetailer> customRetailers = new AbstractMap.SimpleEntry(cr.getPartnerId(), cr);
 			retailerBrands.setPartnerId(fofoId);
 			retailerBrands.setBrandName(brand);
 			retailerBrands.setUpdatedTimestamp(LocalDateTime.now());
 			retailerBrandsLimitRepository.persist(retailerBrands);
-		}
-		else {
+		} else {
 			retailerBrands.setBrandLimit(limit);
 			retailerBrands.setIsUpdate(1);
 			retailerBrands.setUpdatedTimestamp(LocalDateTime.now());
 			retailerBrandsLimitRepository.persist(retailerBrands);
+	}
 	@RequestMapping(value = "/getRetailerBrandslimitMapping", method = RequestMethod.GET)
 	public String getRetailerBrandslimit(HttpServletRequest request,
-			@RequestParam(name = "brand", required = true, defaultValue = "0") String brand, Model model)
+										 @RequestParam(name = "brand", required = true, defaultValue = "0") String brand, Model model)
 			throws Exception {
 		Map<Integer, CustomRetailer> customRetailers = retailerService.getFofoRetailers(true);
 		List<RetailerBrandsLimit> retailerBrandsLimit = retailerBrandsLimitRepository.setAllLimitByBrands(brand);
 		Map<Integer, RetailerBrandsLimit> retailerBrandsLimitMap = retailerBrandsLimit.stream()
+	}
 	@RequestMapping(value = "/setBrandWiseLimit", method = RequestMethod.POST)
 	public String brandwiseLimit(HttpServletRequest request,
-			@RequestParam(name = "brands", required = true, defaultValue = "") String brands,
+								 @RequestParam(name = "brands", required = true, defaultValue = "") String brands,
-			@RequestParam(name = "limit", required = true, defaultValue = "") float limit, Model model)
+								 @RequestParam(name = "limit", required = true, defaultValue = "") float limit, Model model)
 			throws Exception {
 		LOGGER.info("limit" + limit);
 		BrandLimit brandLimit = brandLimitRepository.setLimitByBrands(brands);
 			brandLimit.setBrandName(brands);
 			brandLimit.setCreatedTimestamp(LocalDateTime.now());
 			brandLimit.setUpdatedTimestamp(LocalDateTime.now());
 			brandLimitRepository.persist(brandLimit);
-		}
-		else {
+		} else {
 			brandLimit.setBrandLimit(limit);
 			brandLimit.setUpdatedTimestamp(LocalDateTime.now());
 			brandLimitRepository.persist(brandLimit);
+	}
 	@RequestMapping(value = "/setPartnerPincode", method = RequestMethod.POST)
 	public String setPartnerPincode(HttpServletRequest request,
-			@RequestParam(name = "pincode", required = true, defaultValue = "") String pincode,
+									@RequestParam(name = "pincode", required = true, defaultValue = "") String pincode,
-			@RequestParam(name = "fofoId", required = true, defaultValue = "") int fofoId, Model model)
+									@RequestParam(name = "fofoId", required = true, defaultValue = "") int fofoId, Model model)
 			throws Exception {
 		if (!pincode.equals("")) {
 			PincodePartner pinPartner = new PincodePartner();
 			pinPartner.setFofoId(fofoId);
+	}
 	@RequestMapping(value = "/removePartnerPincode", method = RequestMethod.POST)
 	public String removePartnerPincode(HttpServletRequest request, @RequestParam int id,
-			@RequestParam(name = "fofoId", required = true, defaultValue = "") int fofoId, Model model)
+									   @RequestParam(name = "fofoId", required = true, defaultValue = "") int fofoId, Model model)
 			throws Exception {
 		PincodePartnerRepository.delete(id);
 		List<PincodePartner> partnerPincodeList = PincodePartnerRepository.selectByPartnerId(fofoId);
+	}
 	@RequestMapping(value = "/removeSearchPincode", method = RequestMethod.POST)
 	public String removeSearchPincode(HttpServletRequest request, @RequestParam int id,
-			@RequestParam(name = "pin", required = true, defaultValue = "") String pin,
+									  @RequestParam(name = "pin", required = true, defaultValue = "") String pin,
-			@RequestParam(name = "fofoId", required = true, defaultValue = "") int fofoId, Model model)
+									  @RequestParam(name = "fofoId", required = true, defaultValue = "") int fofoId, Model model)
 			throws Exception {
 		PincodePartnerRepository.delete(id);
 		List<PincodePartner> partnerPincodeList = PincodePartnerRepository.selectPartnersByPincode(pin);
+	}
 	@RequestMapping(value = "/searchPincodePartner", method = RequestMethod.GET)
 	public String searchPincodePartner(HttpServletRequest request,
-			@RequestParam(name = "pincode", required = true, defaultValue = "") String pincode, Model model)
+									   @RequestParam(name = "pincode", required = true, defaultValue = "") String pincode, Model model)
 			throws Exception {
 		List<PincodePartner> partnerPincodeList = PincodePartnerRepository.selectPartnersByPincode(pincode);
 		Map<Integer, CustomRetailer> customRetailerMap = retailerService.getFofoRetailers(true);
+	}
 	@RequestMapping(value = "/showPartnerPincode", method = RequestMethod.GET)
 	public String showPartnerPincode(HttpServletRequest request,
-			@RequestParam(name = "partnerId", required = true, defaultValue = "") int partnerId, Model model)
+									 @RequestParam(name = "partnerId", required = true, defaultValue = "") int partnerId, Model model)
 			throws Exception {
 		List<PincodePartner> partnerPincodeList = PincodePartnerRepository.selectByPartnerId(partnerId);
 		model.addAttribute("partnerPincodeList", partnerPincodeList);

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java – Rev 29633 → 30017