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

 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.mail.javamail.MimeMessageHelper;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.ui.Model;
+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.exception.ProfitMandiBusinessException;
 import com.spice.profitmandi.common.model.CustomRetailer;
 import com.spice.profitmandi.common.model.ProfitMandiConstants;
+import com.spice.profitmandi.common.model.UnsettledPaymentModel;
 import com.spice.profitmandi.common.util.StringUtils;
 import com.spice.profitmandi.dao.entity.transaction.AddWalletRequest;
+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.repository.catalog.AddWalletRequestRepository;
+import com.spice.profitmandi.dao.repository.catalog.UnsettledPaymentsRepository;
 import com.spice.profitmandi.dao.repository.dtr.UserAccountRepository;
 import com.spice.profitmandi.dao.repository.transaction.UserWalletRepository;
 import com.spice.profitmandi.service.user.RetailerService;
 import com.spice.profitmandi.service.wallet.WalletService;
 import com.spice.profitmandi.web.model.LoginDetails;
 	@Autowired
 	JavaMailSender mailSender;
 	@Autowired
+	private UnsettledPaymentsRepository unsettledPaymentsRepository;
+	@Autowired
 	private RetailerService retailerService;
 	@Autowired
 	AddWalletRequestRepository addWalletRequestRepository;
 	private static final Logger LOGGER = LogManager.getLogger(WalletController.class);
 		return "add-wallet-request-paginated";
+	}
 	@RequestMapping(value = "/addAmountToWallet", method = RequestMethod.PUT)
 	public String addAmountToWallet(HttpServletRequest request, @RequestParam(name = "id", defaultValue = "0") int id,
+			@RequestParam(name = "walletRequestid", defaultValue = "0") int walletRequestid, Model model)
-			Model model) throws Exception {
+			throws Exception {
-		AddWalletRequest addWalletRequest = addWalletRequestRepository.selectById(id);
+		AddWalletRequest addWalletRequest = addWalletRequestRepository.selectById(walletRequestid);
 		if (addWalletRequest.getStatus().equals(AddWalletRequestStatus.pending)) {
-			walletService.addAmountToWallet(addWalletRequest.getRetailerId(), id, WalletReferenceType.ADVANCE_AMOUNT,
+			walletService.addAmountToWallet(addWalletRequest.getRetailerId(), walletRequestid,
-					"ntfs/rgfs", addWalletRequest.getAmount());
+					WalletReferenceType.ADVANCE_AMOUNT, "ntfs/rgfs", addWalletRequest.getAmount());
 			addWalletRequest.setStatus(AddWalletRequestStatus.approved);
 			addWalletRequest.setUpdateTimestamp(LocalDateTime.now());
 			addWalletRequestRepository.persist(addWalletRequest);
+			unsettledPaymentsRepository.deleteById(id);
 			model.addAttribute("response", mvcResponseSender.createResponseString(true));
 			CustomRetailer customRetailer = retailerService.getFofoRetailer(addWalletRequest.getRetailerId());
 			String subject = "Request Approved for " + customRetailer.getBusinessName() + " of Rs."
 					+ addWalletRequest.getAmount();
 			String messageText = MessageFormat.format(
+	}
 	private void sendMailWithAttachments(String subject, String messageText) throws Exception {
 		MimeMessage message = mailSender.createMimeMessage();
 		MimeMessageHelper helper = new MimeMessageHelper(message, true);
-		String[] email = { "neerajgupta2021@gmail.com","adeel.yazdani@smartdukaan.com", "kamini.sharma@smartdukaan.com", "care@smartdukaan.com",
+		String[] email = { "neerajgupta2021@gmail.com", "adeel.yazdani@smartdukaan.com",
-				"mohinder.mutreja@smartdukaan.com" };
+				"kamini.sharma@smartdukaan.com", "care@smartdukaan.com", "mohinder.mutreja@smartdukaan.com" };
 		helper.setSubject(subject);
 		helper.setText(messageText);
 		helper.setTo(email);
 		InternetAddress senderAddress = new InternetAddress("noreply@smartdukaan.com", "ProfitMandi Admin");
 		helper.setFrom(senderAddress);
 			fofoIds.add(walletdetail.getRetailerId());
+		}
 		return fofoIds;
+	}
+	@RequestMapping(value = "/getcreateUnsettledPayments", method = RequestMethod.GET)
+	public String getcreateUnsettledPayment(HttpServletRequest request,
+			@RequestParam(name = "offset", defaultValue = "0") int offset,
+			@RequestParam(name = "limit", defaultValue = "15") int limit, Model model) throws Exception {
+		List<UnsettledPayment> up = null;
+		long size = 0;
+		up = unsettledPaymentsRepository.selectAllById(offset, limit);
+		size = unsettledPaymentsRepository.selectAllCount();
+		if (!up.isEmpty()) {
+			model.addAttribute("unsettledPayment", up);
+			model.addAttribute("start", offset + 1);
+			model.addAttribute("size", size);
+			model.addAttribute("url", "/getPaginatedUnsettledPayments");
+			if (up.size() < limit) {
+				model.addAttribute("end", offset + up.size());
+			} else {
+				model.addAttribute("end", offset + limit);
+			}
+		} else {
+			model.addAttribute("unsettledPayment", up);
+			model.addAttribute("size", size);
+		}
+		LOGGER.info("unsettledPaymentList" + up);
+		return "unsettled-payments";
+	}
+	@RequestMapping(value = "/getUnsettledPaymentsByAmount", method = RequestMethod.GET)
+	public String getUnsettledPaymentByAmount(HttpServletRequest request,
+			@RequestParam(name = "amount", defaultValue = "0") float amount,
+			@RequestParam(name = "offset", defaultValue = "0") int offset,
+			@RequestParam(name = "limit", defaultValue = "10") int limit, Model model) throws Exception {
+		List<UnsettledPayment> up = null;
+		long size = 0;
+		up = unsettledPaymentsRepository.selectAllByAmount(amount, offset, limit);
+		size = unsettledPaymentsRepository.selectAllCount();
+		if (!up.isEmpty()) {
+			model.addAttribute("unsettledPayment", up);
+			model.addAttribute("start", offset + 1);
+			model.addAttribute("size", size);
+			model.addAttribute("url", "/getPaginatedUnsettledPayments");
+			if (up.size() < limit) {
+				model.addAttribute("end", offset + up.size());
+			} else {
+				model.addAttribute("end", offset + limit);
+			}
+			return "unsettle-payment-modal";
+		} else {
+			model.addAttribute("unsettledPayment", up);
+			model.addAttribute("size", size);
+		}
+		return "unsettle-payment-modal";
+	}
+	@RequestMapping(value = "/createUnsettledPaymentsEntries", method = RequestMethod.POST)
+	public String createUnsettledPaymentsEntries(HttpServletRequest request,
+			@RequestBody UnsettledPaymentModel unsettledPaymentModel, Model model) throws Exception {
+		UnsettledPayment up = new UnsettledPayment();
+		up.setTransaction_reference(unsettledPaymentModel.getTransactionReference());
+		up.setAmount(unsettledPaymentModel.getAmount());
+		up.setDescription(unsettledPaymentModel.getDescription());
+		up.setReference_date(unsettledPaymentModel.getReferenceDate());
+		LOGGER.info("uppaynments" + up);
+		unsettledPaymentsRepository.persist(up);
+		model.addAttribute("response", mvcResponseSender.createResponseString(true));
+		return "response";
+	}
+	@RequestMapping(value = "/removeUnsettledPaymentsEntries", method = RequestMethod.DELETE)
+	public String removeUnsettledPaymentsEntries(HttpServletRequest request,
+			@RequestParam(name = "id", defaultValue = "0") int id, Model model) throws Exception {
+		unsettledPaymentsRepository.deleteById(id);
+		model.addAttribute("response", mvcResponseSender.createResponseString(true));
+		return "response";
+	}
+}

Subversion Repositories SmartDukaan

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