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

 import com.spice.profitmandi.common.model.UnsettledPaymentModel;
 import com.spice.profitmandi.common.util.ExcelUtils;
 import com.spice.profitmandi.common.util.FileUtil;
 import com.spice.profitmandi.common.util.StringUtils;
 import com.spice.profitmandi.common.util.WalletHistoryModel;
+import com.spice.profitmandi.dao.entity.dtr.CreditAccount;
 import com.spice.profitmandi.dao.entity.transaction.AddWalletRequest;
 import com.spice.profitmandi.dao.entity.transaction.ManualPaymentType;
 import com.spice.profitmandi.dao.entity.transaction.UnsettledPayment;
 import com.spice.profitmandi.dao.entity.transaction.UserWallet;
 import com.spice.profitmandi.dao.entity.transaction.UserWalletHistory;
 import com.spice.profitmandi.dao.enumuration.transaction.AddWalletRequestStatus;
 import com.spice.profitmandi.dao.enumuration.transaction.TransactionType;
 import com.spice.profitmandi.dao.repository.catalog.AddWalletRequestRepository;
 import com.spice.profitmandi.dao.repository.catalog.ManualPaymentRequestRepository;
 import com.spice.profitmandi.dao.repository.catalog.UnsettledPaymentsRepository;
+import com.spice.profitmandi.dao.repository.dtr.CreditAccountRepository;
 import com.spice.profitmandi.dao.repository.dtr.FofoStoreRepository;
 import com.spice.profitmandi.dao.repository.dtr.RetailerRepository;
 import com.spice.profitmandi.dao.repository.dtr.UserAccountRepository;
 import com.spice.profitmandi.dao.repository.dtr.UserRepository;
 import com.spice.profitmandi.dao.repository.transaction.OrderRepository;
 	@Autowired
 	AddWalletRequestRepository addWalletRequestRepository;
 	@Autowired
-	private RetailerRepository retailerRepository;
+	private CreditAccountRepository creditAccountRepository;
-	@Autowired
-	private UserRepository userRepository;
 	private static final Logger LOGGER = LogManager.getLogger(WalletController.class);
 	@PostMapping(value = "/wallet/upload")
 	public String uploadWalletBulk(HttpServletRequest request, @RequestPart("file") MultipartFile file, Model model)
 			throws Exception {
 		return "walletStatement";
+	}
 	@Autowired
 	TransactionService transactionService;
 	@RequestMapping(value = "/account/reco", method = RequestMethod.GET)
-	public ResponseEntity<?> accountReco(HttpServletRequest request, @RequestParam LocalDate closingDate,
+	public ResponseEntity<?> accountReco(HttpServletRequest request, @RequestParam LocalDate closingDate, Model model)
-			Model model) throws Exception {
+			throws Exception {
 		boolean isAdmin = roleManager.isAdmin(cookiesProcessor.getCookiesObject(request).getRoleIds());
 		if (!isAdmin) {
 			throw new ProfitMandiBusinessException("Unauthorised access", "PartnerId", "Permission Denied");
+		}
 		LocalDateTime closingDateTime = LocalDate.now().atStartOfDay().plusDays(1);
 		Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
 		Set<Integer> retailersSet = customRetailerMap.keySet();
 		Map<Integer, Float> closingPurchaseMap = orderRepository.selectOpeningAmount(closingDateTime, retailersSet);
 		Map<Integer, UserWallet> retailerWalletMap = walletService.getRetailerIdUserWalletMap(retailersSet);
-		Map<Integer, Integer> walletRetailerMap = retailerWalletMap.entrySet().stream().collect(Collectors.toMap(x->x.getValue().getId(), x->x.getKey()));
+		Map<Integer, Integer> walletRetailerMap = retailerWalletMap.entrySet().stream()
+				.collect(Collectors.toMap(x -> x.getValue().getId(), x -> x.getKey()));
 		Set<Integer> walletSet = walletRetailerMap.keySet();
-		Map<Integer, Float> closingBalanceMap = userWalletHistoryRepository.getSumTillDateExcludingPurchase(closingDateTime, walletSet);
+		Map<Integer, Float> closingBalanceMap = userWalletHistoryRepository
+				.getSumTillDateExcludingPurchase(closingDateTime, walletSet);
 		Map<Integer, Float> closingWalletMap = userWalletHistoryRepository.getSumTillDate(closingDateTime, walletSet);
 		Map<Integer, Float> peindingIndentMap = transactionService.getPendingIndentValueMap();
 		List<List<?>> rows = new ArrayList<>();
 		for (Map.Entry<Integer, Float> closingBalance : closingBalanceMap.entrySet()) {
 			int walletId = closingBalance.getKey();
 			int retailerId = walletRetailerMap.get(walletId);
 			float accountClosing = 0f;
 			if (!closingPurchaseMap.containsKey(retailerId)) {
 				accountClosing = closingBalance.getValue();
 			} else {
 				accountClosing = closingBalance.getValue() - closingPurchaseMap.get(retailerId);
+			}
 			CustomRetailer cr = customRetailerMap.get(retailerId);
 			rows.add(Arrays.asList(retailerId, cr.getBusinessName(), cr.getAddress().getCity(),
-					cr.getAddress().getState(), accountClosing, closingWalletMap.get(walletId), peindingIndentMap.get(retailerId)));
+					cr.getAddress().getState(), accountClosing, closingWalletMap.get(walletId),
+					peindingIndentMap.get(retailerId)));
+		}
-		org.apache.commons.io.output.ByteArrayOutputStream byteArrayOutputStream = FileUtil
+		org.apache.commons.io.output.ByteArrayOutputStream byteArrayOutputStream = FileUtil.getCSVByteStream(
-				.getCSVByteStream(Arrays.asList("Id", "Partner Name", "City", "State", "Closing Balance", "Closing Wallet", "In Transit"), rows);
+				Arrays.asList("Id", "Partner Name", "City", "State", "Closing Balance", "Closing Wallet", "In Transit"),
+				rows);
 		final HttpHeaders headers = new HttpHeaders();
 		headers.set("Content-Type", "text/csv");
 		headers.set("Content-disposition",
 				"inline; filename=account-statement-closing-." + StringUtils.toHyphenatedString(closingDate) + ".csv");
 		headers.setContentLength(byteArrayOutputStream.toByteArray().length);
 		final InputStream inputStream = new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
 		final InputStreamResource inputStreamResource = new InputStreamResource(inputStream);
 		return new ResponseEntity<InputStreamResource>(inputStreamResource, headers, HttpStatus.OK);
+	}
 	@RequestMapping(value = "/account/closing-statements", method = RequestMethod.GET)
 	public ResponseEntity<?> getAccountStatement(HttpServletRequest request, @RequestParam LocalDate closingDate,
 			Model model) throws Exception {
 		boolean isAdmin = roleManager.isAdmin(cookiesProcessor.getCookiesObject(request).getRoleIds());
 		if (!isAdmin) {
 			throw new ProfitMandiBusinessException("Unauthorised access", "PartnerId", "Permission Denied");
+		}
 		LocalDateTime closingDateTime = closingDate.atStartOfDay().plusDays(1);
 		Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
 		Set<Integer> retailersSet = customRetailerMap.keySet();
 		Map<Integer, Float> closingPurchaseMap = orderRepository.selectOpeningAmount(closingDateTime, retailersSet);
 		Map<Integer, UserWallet> retailerWalletMap = walletService.getRetailerIdUserWalletMap(retailersSet);
-		Map<Integer, Integer> walletRetailerMap = retailerWalletMap.entrySet().stream().collect(Collectors.toMap(x->x.getValue().getId(), x->x.getKey()));
+		Map<Integer, Integer> walletRetailerMap = retailerWalletMap.entrySet().stream()
+				.collect(Collectors.toMap(x -> x.getValue().getId(), x -> x.getKey()));
 		Set<Integer> walletSet = walletRetailerMap.keySet();
-		Map<Integer, Float> closingBalanceMap = userWalletHistoryRepository.getSumTillDateExcludingPurchase(closingDateTime, walletSet);
+		Map<Integer, Float> closingBalanceMap = userWalletHistoryRepository
+				.getSumTillDateExcludingPurchase(closingDateTime, walletSet);
 		List<List<?>> rows = new ArrayList<>();
 		for (Map.Entry<Integer, Float> closingWalletBalance : closingBalanceMap.entrySet()) {
 			int walletId = closingWalletBalance.getKey();
 			int retailerId = walletRetailerMap.get(walletId);
 			if (!closingPurchaseMap.containsKey(retailerId)) {
 		addWalletRequestRepository.persist(addWalletRequest);
 		model.addAttribute("response", mvcResponseSender.createResponseString(true));
 		return "response";
+	}
+	@RequestMapping(value = "/getCreditDetail", method = RequestMethod.GET)
+	public String getCreditDetail(HttpServletRequest request, Model model) throws Exception {
+		List<CreditAccount> creditAccounts = creditAccountRepository.selectAll();
+		Map<Integer, CustomRetailer> customRetailers = retailerService.getAllFofoRetailers();
+		model.addAttribute("creditAccounts", creditAccounts);
+		model.addAttribute("customRetailers", customRetailers);
+		return "partner-credit-detail";
+	}
+	@RequestMapping(value = "/activateKred", method = RequestMethod.POST)
+	public String activateKred(HttpServletRequest request, @RequestParam int fofoId, Model model) throws Exception {
+		CreditAccount creditAccount = creditAccountRepository.selectByFofoId(fofoId);
+		creditAccount.setActive(true);
+		Map<Integer, CustomRetailer> customRetailers = retailerService.getAllFofoRetailers();
+		model.addAttribute("creditAccount", creditAccount);
+		model.addAttribute("customRetailers", customRetailers);
+		return "partner-credit-detail-row";
+	}
+	@RequestMapping(value = "/deactivateKred", method = RequestMethod.POST)
+	public String deactivateKred(HttpServletRequest request, @RequestParam int fofoId, Model model) throws Exception {
+		CreditAccount creditAccount = creditAccountRepository.selectByFofoId(fofoId);
+		creditAccount.setActive(false);
+		Map<Integer, CustomRetailer> customRetailers = retailerService.getAllFofoRetailers();
+		model.addAttribute("creditAccount", creditAccount);
+		model.addAttribute("customRetailers", customRetailers);
+		return "partner-credit-detail-row";
+	}
+}

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java – Rev 29083 → 29811