| Line 102... |
Line 102... |
| 102 |
@Autowired
|
102 |
@Autowired
|
| 103 |
AddWalletRequestRepository addWalletRequestRepository;
|
103 |
AddWalletRequestRepository addWalletRequestRepository;
|
| 104 |
|
104 |
|
| 105 |
@Autowired
|
105 |
@Autowired
|
| 106 |
private RetailerRepository retailerRepository;
|
106 |
private RetailerRepository retailerRepository;
|
| 107 |
|
107 |
|
| 108 |
@Autowired
|
108 |
@Autowired
|
| 109 |
private UserRepository userRepository;
|
109 |
private UserRepository userRepository;
|
| 110 |
private static final Logger LOGGER = LogManager.getLogger(WalletController.class);
|
110 |
private static final Logger LOGGER = LogManager.getLogger(WalletController.class);
|
| 111 |
|
111 |
|
| 112 |
@RequestMapping(value = "/walletDetails", method = RequestMethod.GET)
|
112 |
@RequestMapping(value = "/walletDetails", method = RequestMethod.GET)
|
| Line 582... |
Line 582... |
| 582 |
@RequestParam WalletReferenceType referenceType, Model model) throws Exception {
|
582 |
@RequestParam WalletReferenceType referenceType, Model model) throws Exception {
|
| 583 |
|
583 |
|
| 584 |
LOGGER.info("type" + referenceType);
|
584 |
LOGGER.info("type" + referenceType);
|
| 585 |
List<UserWalletHistory> userWalletHistory = userWalletHistoryRepository
|
585 |
List<UserWalletHistory> userWalletHistory = userWalletHistoryRepository
|
| 586 |
.selectAllByreferenceIdandreferenceType(reference, referenceType);
|
586 |
.selectAllByreferenceIdandreferenceType(reference, referenceType);
|
| 587 |
|
587 |
|
| 588 |
if (userWalletHistory.isEmpty()) {
|
588 |
if (userWalletHistory.isEmpty()) {
|
| 589 |
throw new ProfitMandiBusinessException("RefrenceId", reference, "Reference Id not found");
|
589 |
throw new ProfitMandiBusinessException("RefrenceId", reference, "Reference Id not found");
|
| 590 |
}
|
590 |
}
|
| 591 |
|
591 |
|
| 592 |
UserWallet userWallet = userWalletRepository.selectById(userWalletHistory.get(0).getWalletId());
|
592 |
UserWallet userWallet = userWalletRepository.selectById(userWalletHistory.get(0).getWalletId());
|
| 593 |
|
593 |
|
| 594 |
LOGGER.info("userWallet" + userWallet);
|
594 |
LOGGER.info("userWallet" + userWallet);
|
| 595 |
CustomRetailer customretailer= retailerService.getFofoRetailer(userWallet.getUserId());
|
595 |
CustomRetailer customretailer = retailerService.getFofoRetailer(userWallet.getUserId());
|
| 596 |
|
596 |
|
| 597 |
model.addAttribute("userWallet",userWallet);
|
597 |
model.addAttribute("userWallet", userWallet);
|
| 598 |
model.addAttribute("customretailer",customretailer);
|
598 |
model.addAttribute("customretailer", customretailer);
|
| 599 |
|
- |
|
| 600 |
|
599 |
|
| 601 |
model.addAttribute("wallethistory", userWalletHistory);
|
600 |
model.addAttribute("wallethistory", userWalletHistory);
|
| 602 |
|
- |
|
| 603 |
|
601 |
|
| 604 |
model.addAttribute("response", mvcResponseSender.createResponseString(true));
|
602 |
model.addAttribute("response", mvcResponseSender.createResponseString(true));
|
| 605 |
return "wallet-history";
|
603 |
return "wallet-history";
|
| 606 |
|
604 |
|
| 607 |
}
|
605 |
}
|
| 608 |
|
606 |
|
| 609 |
@RequestMapping(value = "/getWalletHistoryByPartner", method = RequestMethod.GET)
|
607 |
@RequestMapping(value = "/getWalletHistoryByPartner", method = RequestMethod.GET)
|
| 610 |
public String getWalletHistoryByPartner(HttpServletRequest request,
|
608 |
public String getWalletHistoryByPartner(HttpServletRequest request, int fofoId,
|
| 611 |
int fofoId,
|
- |
|
| 612 |
@RequestParam(name="referenceType",required=false) WalletReferenceType referenceType,
|
609 |
@RequestParam(name = "referenceType", required = false) WalletReferenceType referenceType,
|
| 613 |
@RequestParam(name="offset", required=false, defaultValue="0")int offset,
|
610 |
@RequestParam(name = "offset", required = false, defaultValue = "0") int offset,
|
| 614 |
@RequestParam(name="limit", required=false, defaultValue="30")int limit,
|
611 |
@RequestParam(name = "limit", required = false, defaultValue = "30") int limit, Model model)
|
| 615 |
Model model) throws Exception {
|
612 |
throws Exception {
|
| 616 |
|
613 |
|
| 617 |
UserWallet userWallet = userWalletRepository.selectByRetailerId(fofoId);
|
614 |
UserWallet userWallet = userWalletRepository.selectByRetailerId(fofoId);
|
| 618 |
List<UserWalletHistory> userWalletHistory = userWalletHistoryRepository
|
615 |
List<UserWalletHistory> userWalletHistory = userWalletHistoryRepository
|
| 619 |
.selectPaginatedByWalletIdReferenceType(userWallet.getId(), referenceType, offset, limit);
|
616 |
.selectPaginatedByWalletIdReferenceType(userWallet.getId(), referenceType, offset, limit);
|
| 620 |
|
617 |
|
| 621 |
CustomRetailer customretailer= retailerService.getFofoRetailer(fofoId);
|
618 |
CustomRetailer customretailer = retailerService.getFofoRetailer(fofoId);
|
| 622 |
|
619 |
|
| 623 |
model.addAttribute("userWallet",userWallet);
|
620 |
model.addAttribute("userWallet", userWallet);
|
| 624 |
model.addAttribute("customretailer",customretailer);
|
621 |
model.addAttribute("customretailer", customretailer);
|
| 625 |
model.addAttribute("wallethistory", userWalletHistory);
|
622 |
model.addAttribute("wallethistory", userWalletHistory);
|
| 626 |
|
623 |
|
| 627 |
model.addAttribute("response", mvcResponseSender.createResponseString(true));
|
624 |
model.addAttribute("response", mvcResponseSender.createResponseString(true));
|
| 628 |
return "wallet-history";
|
625 |
return "wallet-history";
|
| 629 |
|
626 |
|
| 630 |
}
|
627 |
}
|
| 631 |
|
628 |
|
| 632 |
@RequestMapping(value = "/getPartnerName", method = RequestMethod.GET)
|
629 |
@RequestMapping(value = "/getPartnerName", method = RequestMethod.GET)
|
| 633 |
public String getPartnerName(HttpServletRequest request,
|
630 |
public String getPartnerName(HttpServletRequest request,
|
| 634 |
@RequestParam(name = "reference", defaultValue = "0") int reference,
|
631 |
@RequestParam(name = "reference", defaultValue = "0") int reference,
|
| Line 657... |
Line 654... |
| 657 |
throws Exception {
|
654 |
throws Exception {
|
| 658 |
|
655 |
|
| 659 |
List<UserWalletHistory> userWalletHistory = userWalletHistoryRepository
|
656 |
List<UserWalletHistory> userWalletHistory = userWalletHistoryRepository
|
| 660 |
.selectAllByreferenceIdandreferenceType(reference, referenceType);
|
657 |
.selectAllByreferenceIdandreferenceType(reference, referenceType);
|
| 661 |
UserWallet userWallet = userWalletRepository.selectByRetailerId(retailerId);
|
658 |
UserWallet userWallet = userWalletRepository.selectByRetailerId(retailerId);
|
| 662 |
if (!userWalletHistory.isEmpty()) {
|
- |
|
| 663 |
|
659 |
|
| - |
|
660 |
if (!userWalletHistory.isEmpty()) {
|
| - |
|
661 |
int WalletId = userWalletHistory.get(0).getWalletId();
|
| - |
|
662 |
UserWallet user = userWalletRepository.selectById(WalletId);
|
| - |
|
663 |
if (retailerId != user.getUserId()) {
|
| - |
|
664 |
throw new ProfitMandiBusinessException("RefrenceId", reference, "Reference Id assign to Other partner");
|
| - |
|
665 |
}
|
| 664 |
UserWalletHistory history = new UserWalletHistory();
|
666 |
UserWalletHistory history = new UserWalletHistory();
|
| 665 |
if (TransactionType.CREDIT.equals(transactiontype)) {
|
667 |
if (TransactionType.CREDIT.equals(transactiontype)) {
|
| 666 |
userWallet.setAmount(userWallet.getAmount() + amount);
|
668 |
userWallet.setAmount(userWallet.getAmount() + amount);
|
| 667 |
history.setAmount(amount);
|
669 |
history.setAmount(amount);
|
| 668 |
history.setDescription(description);
|
670 |
history.setDescription(description);
|
| Line 681... |
Line 683... |
| 681 |
history.setTimestamp(LocalDateTime.now());
|
683 |
history.setTimestamp(LocalDateTime.now());
|
| 682 |
|
684 |
|
| 683 |
}
|
685 |
}
|
| 684 |
userWalletHistoryRepository.persist(history);
|
686 |
userWalletHistoryRepository.persist(history);
|
| 685 |
model.addAttribute("response", mvcResponseSender.createResponseString(history.getReference()));
|
687 |
model.addAttribute("response", mvcResponseSender.createResponseString(history.getReference()));
|
| 686 |
} else if(WalletReferenceType.INCENTIVES==referenceType || WalletReferenceType.OTHERS==referenceType){
|
688 |
} else if (WalletReferenceType.INCENTIVES == referenceType || WalletReferenceType.OTHERS == referenceType) {
|
| 687 |
LOGGER.error("referenceType: "+referenceType);
|
689 |
LOGGER.error("referenceType: " + referenceType);
|
| 688 |
ManualPaymentType paymentType = manualPaymentRequestRepository.selectByReferenceType(referenceType);
|
690 |
ManualPaymentType paymentType = manualPaymentRequestRepository.selectByReferenceType(referenceType);
|
| 689 |
|
691 |
|
| 690 |
if (paymentType == null) {
|
692 |
if (paymentType == null) {
|
| 691 |
paymentType = new ManualPaymentType();
|
693 |
paymentType = new ManualPaymentType();
|
| 692 |
}
|
694 |
}
|
| Line 720... |
Line 722... |
| 720 |
history.setTimestamp(LocalDateTime.now());
|
722 |
history.setTimestamp(LocalDateTime.now());
|
| 721 |
|
723 |
|
| 722 |
}
|
724 |
}
|
| 723 |
userWalletHistoryRepository.persist(history);
|
725 |
userWalletHistoryRepository.persist(history);
|
| 724 |
model.addAttribute("response", mvcResponseSender.createResponseString(history.getReference()));
|
726 |
model.addAttribute("response", mvcResponseSender.createResponseString(history.getReference()));
|
| 725 |
}
|
- |
|
| 726 |
else {
|
727 |
} else {
|
| 727 |
model.addAttribute("response", mvcResponseSender.createResponseString(0));
|
728 |
model.addAttribute("response", mvcResponseSender.createResponseString(0));
|
| 728 |
}
|
729 |
}
|
| 729 |
return "response";
|
730 |
return "response";
|
| 730 |
|
731 |
|
| 731 |
}
|
732 |
}
|
| 732 |
|
733 |
|
| 733 |
@RequestMapping(value = "/addMoney", method = RequestMethod.POST)
|
734 |
@RequestMapping(value = "/addMoney", method = RequestMethod.POST)
|
| 734 |
public String addMoney(HttpServletRequest request,
|
735 |
public String addMoney(HttpServletRequest request, @RequestParam float amount,
|
| 735 |
@RequestParam float amount, @RequestParam String transactionReference,
|
736 |
@RequestParam String transactionReference, @RequestParam LocalDateTime referenceTime,
|
| 736 |
@RequestParam LocalDateTime referenceTime , @RequestParam String bankName, @RequestParam int fofoId, Model model)
|
737 |
@RequestParam String bankName, @RequestParam int fofoId, Model model) throws Exception {
|
| 737 |
throws Exception {
|
- |
|
| 738 |
|
738 |
|
| 739 |
AddWalletRequest addWalletRequest = new AddWalletRequest();
|
739 |
AddWalletRequest addWalletRequest = new AddWalletRequest();
|
| 740 |
addWalletRequest.setRetailerId(fofoId);
|
740 |
addWalletRequest.setRetailerId(fofoId);
|
| 741 |
addWalletRequest.setAmount(amount);
|
741 |
addWalletRequest.setAmount(amount);
|
| 742 |
addWalletRequest.setTransaction_reference(transactionReference);
|
742 |
addWalletRequest.setTransaction_reference(transactionReference);
|
| 743 |
addWalletRequest.setCreateTimestamp(LocalDateTime.now());
|
743 |
addWalletRequest.setCreateTimestamp(LocalDateTime.now());
|
| 744 |
addWalletRequest.setBank_name(bankName);
|
744 |
addWalletRequest.setBank_name(bankName);
|
| 745 |
addWalletRequest.setReference_date(referenceTime.toLocalDate());
|
745 |
addWalletRequest.setReference_date(referenceTime.toLocalDate());
|
| 746 |
addWalletRequest.setStatus(AddWalletRequestStatus.pending);
|
746 |
addWalletRequest.setStatus(AddWalletRequestStatus.pending);
|
| 747 |
|
747 |
|
| 748 |
LOGGER.info("info"+ addWalletRequest);
|
748 |
LOGGER.info("info" + addWalletRequest);
|
| 749 |
|
749 |
|
| 750 |
addWalletRequestRepository.persist(addWalletRequest);
|
750 |
addWalletRequestRepository.persist(addWalletRequest);
|
| 751 |
model.addAttribute("response", mvcResponseSender.createResponseString(true));
|
751 |
model.addAttribute("response", mvcResponseSender.createResponseString(true));
|
| 752 |
return "response";
|
752 |
return "response";
|
| 753 |
}
|
753 |
}
|
| 754 |
}
|
754 |
}
|