| Line 29... |
Line 29... |
| 29 |
import com.spice.profitmandi.common.exception.ProfitMandiBusinessException;
|
29 |
import com.spice.profitmandi.common.exception.ProfitMandiBusinessException;
|
| 30 |
import com.spice.profitmandi.common.model.CustomRetailer;
|
30 |
import com.spice.profitmandi.common.model.CustomRetailer;
|
| 31 |
import com.spice.profitmandi.common.model.ProfitMandiConstants;
|
31 |
import com.spice.profitmandi.common.model.ProfitMandiConstants;
|
| 32 |
import com.spice.profitmandi.common.model.UnsettledPaymentModel;
|
32 |
import com.spice.profitmandi.common.model.UnsettledPaymentModel;
|
| 33 |
import com.spice.profitmandi.common.util.StringUtils;
|
33 |
import com.spice.profitmandi.common.util.StringUtils;
|
| - |
|
34 |
import com.spice.profitmandi.dao.entity.dtr.Retailer;
|
| - |
|
35 |
import com.spice.profitmandi.dao.entity.dtr.User;
|
| 34 |
import com.spice.profitmandi.dao.entity.transaction.AddWalletRequest;
|
36 |
import com.spice.profitmandi.dao.entity.transaction.AddWalletRequest;
|
| 35 |
import com.spice.profitmandi.dao.entity.transaction.ManualPaymentType;
|
37 |
import com.spice.profitmandi.dao.entity.transaction.ManualPaymentType;
|
| 36 |
import com.spice.profitmandi.dao.entity.transaction.UnsettledPayment;
|
38 |
import com.spice.profitmandi.dao.entity.transaction.UnsettledPayment;
|
| 37 |
import com.spice.profitmandi.dao.entity.transaction.UserWallet;
|
39 |
import com.spice.profitmandi.dao.entity.transaction.UserWallet;
|
| 38 |
import com.spice.profitmandi.dao.entity.transaction.UserWalletHistory;
|
40 |
import com.spice.profitmandi.dao.entity.transaction.UserWalletHistory;
|
| Line 42... |
Line 44... |
| 42 |
import com.spice.profitmandi.dao.repository.catalog.ManualPaymentRequestRepository;
|
44 |
import com.spice.profitmandi.dao.repository.catalog.ManualPaymentRequestRepository;
|
| 43 |
import com.spice.profitmandi.dao.repository.catalog.UnsettledPaymentsRepository;
|
45 |
import com.spice.profitmandi.dao.repository.catalog.UnsettledPaymentsRepository;
|
| 44 |
import com.spice.profitmandi.dao.repository.dtr.FofoStoreRepository;
|
46 |
import com.spice.profitmandi.dao.repository.dtr.FofoStoreRepository;
|
| 45 |
import com.spice.profitmandi.dao.repository.dtr.RetailerRepository;
|
47 |
import com.spice.profitmandi.dao.repository.dtr.RetailerRepository;
|
| 46 |
import com.spice.profitmandi.dao.repository.dtr.UserAccountRepository;
|
48 |
import com.spice.profitmandi.dao.repository.dtr.UserAccountRepository;
|
| - |
|
49 |
import com.spice.profitmandi.dao.repository.dtr.UserRepository;
|
| 47 |
import com.spice.profitmandi.dao.repository.transaction.UserWalletHistoryRepository;
|
50 |
import com.spice.profitmandi.dao.repository.transaction.UserWalletHistoryRepository;
|
| 48 |
import com.spice.profitmandi.dao.repository.transaction.UserWalletRepository;
|
51 |
import com.spice.profitmandi.dao.repository.transaction.UserWalletRepository;
|
| 49 |
import com.spice.profitmandi.service.authentication.RoleManager;
|
52 |
import com.spice.profitmandi.service.authentication.RoleManager;
|
| 50 |
import com.spice.profitmandi.service.user.RetailerService;
|
53 |
import com.spice.profitmandi.service.user.RetailerService;
|
| 51 |
import com.spice.profitmandi.service.wallet.WalletService;
|
54 |
import com.spice.profitmandi.service.wallet.WalletService;
|
| Line 98... |
Line 101... |
| 98 |
@Autowired
|
101 |
@Autowired
|
| 99 |
AddWalletRequestRepository addWalletRequestRepository;
|
102 |
AddWalletRequestRepository addWalletRequestRepository;
|
| 100 |
|
103 |
|
| 101 |
@Autowired
|
104 |
@Autowired
|
| 102 |
private RetailerRepository retailerRepository;
|
105 |
private RetailerRepository retailerRepository;
|
| - |
|
106 |
|
| - |
|
107 |
@Autowired
|
| - |
|
108 |
private UserRepository userRepository;
|
| 103 |
private static final Logger LOGGER = LogManager.getLogger(WalletController.class);
|
109 |
private static final Logger LOGGER = LogManager.getLogger(WalletController.class);
|
| 104 |
|
110 |
|
| 105 |
@RequestMapping(value = "/walletDetails", method = RequestMethod.GET)
|
111 |
@RequestMapping(value = "/walletDetails", method = RequestMethod.GET)
|
| 106 |
public String dashboard(HttpServletRequest request,
|
112 |
public String dashboard(HttpServletRequest request,
|
| 107 |
@RequestParam(name = ProfitMandiConstants.START_TIME, required = false) String startTimeString,
|
113 |
@RequestParam(name = ProfitMandiConstants.START_TIME, required = false) String startTimeString,
|
| Line 575... |
Line 581... |
| 575 |
@RequestParam WalletReferenceType referenceType, Model model) throws Exception {
|
581 |
@RequestParam WalletReferenceType referenceType, Model model) throws Exception {
|
| 576 |
|
582 |
|
| 577 |
LOGGER.info("type" + referenceType);
|
583 |
LOGGER.info("type" + referenceType);
|
| 578 |
List<UserWalletHistory> userWalletHistory = userWalletHistoryRepository
|
584 |
List<UserWalletHistory> userWalletHistory = userWalletHistoryRepository
|
| 579 |
.selectAllByreferenceIdandreferenceType(reference, referenceType);
|
585 |
.selectAllByreferenceIdandreferenceType(reference, referenceType);
|
| - |
|
586 |
|
| - |
|
587 |
if (userWalletHistory.isEmpty()) {
|
| - |
|
588 |
throw new ProfitMandiBusinessException("RefrenceId", reference, "Reference Id not found");
|
| - |
|
589 |
}
|
| 580 |
|
590 |
|
| - |
|
591 |
UserWallet userWallet = userWalletRepository.selectById(userWalletHistory.get(0).getWalletId());
|
| - |
|
592 |
|
| - |
|
593 |
LOGGER.info("userWallet" + userWallet);
|
| - |
|
594 |
CustomRetailer customretailer= retailerService.getFofoRetailer(userWallet.getUserId());
|
| - |
|
595 |
|
| - |
|
596 |
model.addAttribute("userWallet",userWallet);
|
| - |
|
597 |
model.addAttribute("customretailer",customretailer);
|
| - |
|
598 |
|
| - |
|
599 |
|
| 581 |
model.addAttribute("wallethistory", userWalletHistory);
|
600 |
model.addAttribute("wallethistory", userWalletHistory);
|
| - |
|
601 |
|
| 582 |
|
602 |
|
| 583 |
model.addAttribute("response", mvcResponseSender.createResponseString(true));
|
603 |
model.addAttribute("response", mvcResponseSender.createResponseString(true));
|
| 584 |
return "wallet-history";
|
604 |
return "wallet-history";
|
| 585 |
|
605 |
|
| 586 |
}
|
606 |
}
|
| Line 595... |
Line 615... |
| 595 |
|
615 |
|
| 596 |
UserWallet userWallet = userWalletRepository.selectByRetailerId(fofoId);
|
616 |
UserWallet userWallet = userWalletRepository.selectByRetailerId(fofoId);
|
| 597 |
List<UserWalletHistory> userWalletHistory = userWalletHistoryRepository
|
617 |
List<UserWalletHistory> userWalletHistory = userWalletHistoryRepository
|
| 598 |
.selectPaginatedByWalletIdReferenceType(userWallet.getId(), referenceType, offset, limit);
|
618 |
.selectPaginatedByWalletIdReferenceType(userWallet.getId(), referenceType, offset, limit);
|
| 599 |
|
619 |
|
| - |
|
620 |
CustomRetailer customretailer= retailerService.getFofoRetailer(fofoId);
|
| - |
|
621 |
|
| - |
|
622 |
model.addAttribute("userWallet",userWallet);
|
| - |
|
623 |
model.addAttribute("customretailer",customretailer);
|
| 600 |
model.addAttribute("wallethistory", userWalletHistory);
|
624 |
model.addAttribute("wallethistory", userWalletHistory);
|
| 601 |
|
625 |
|
| 602 |
model.addAttribute("response", mvcResponseSender.createResponseString(true));
|
626 |
model.addAttribute("response", mvcResponseSender.createResponseString(true));
|
| 603 |
return "wallet-history";
|
627 |
return "wallet-history";
|
| 604 |
|
628 |
|
| Line 655... |
Line 679... |
| 655 |
history.setReferenceType(referenceType);
|
679 |
history.setReferenceType(referenceType);
|
| 656 |
history.setTimestamp(LocalDateTime.now());
|
680 |
history.setTimestamp(LocalDateTime.now());
|
| 657 |
|
681 |
|
| 658 |
}
|
682 |
}
|
| 659 |
userWalletHistoryRepository.persit(history);
|
683 |
userWalletHistoryRepository.persit(history);
|
| 660 |
model.addAttribute("response", mvcResponseSender.createResponseString(true));
|
684 |
model.addAttribute("response", mvcResponseSender.createResponseString(history.getReference()));
|
| - |
|
685 |
} else if(WalletReferenceType.INCENTIVES==referenceType || WalletReferenceType.OTHERS==referenceType){
|
| 661 |
} else {
|
686 |
LOGGER.error("referenceType: "+referenceType);
|
| 662 |
|
- |
|
| 663 |
ManualPaymentType paymentType = manualPaymentRequestRepository.selectByReferenceType(referenceType);
|
687 |
ManualPaymentType paymentType = manualPaymentRequestRepository.selectByReferenceType(referenceType);
|
| 664 |
|
688 |
|
| 665 |
if (paymentType == null) {
|
689 |
if (paymentType == null) {
|
| 666 |
paymentType = new ManualPaymentType();
|
690 |
paymentType = new ManualPaymentType();
|
| 667 |
}
|
691 |
}
|
| Line 694... |
Line 718... |
| 694 |
history.setReferenceType(referenceType);
|
718 |
history.setReferenceType(referenceType);
|
| 695 |
history.setTimestamp(LocalDateTime.now());
|
719 |
history.setTimestamp(LocalDateTime.now());
|
| 696 |
|
720 |
|
| 697 |
}
|
721 |
}
|
| 698 |
userWalletHistoryRepository.persit(history);
|
722 |
userWalletHistoryRepository.persit(history);
|
| - |
|
723 |
model.addAttribute("response", mvcResponseSender.createResponseString(history.getReference()));
|
| - |
|
724 |
}
|
| - |
|
725 |
else {
|
| 699 |
model.addAttribute("response", mvcResponseSender.createResponseString(true));
|
726 |
model.addAttribute("response", mvcResponseSender.createResponseString(0));
|
| 700 |
}
|
727 |
}
|
| 701 |
return "response";
|
728 |
return "response";
|
| 702 |
|
729 |
|
| 703 |
}
|
730 |
}
|
| 704 |
}
|
731 |
}
|