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

 import com.spice.profitmandi.common.model.ProfitMandiConstants;
 import com.spice.profitmandi.common.model.UnsettledPaymentModel;
 import com.spice.profitmandi.common.util.*;
 import com.spice.profitmandi.dao.entity.dtr.CreditAccount;
 import com.spice.profitmandi.dao.entity.transaction.*;
+import com.spice.profitmandi.dao.entity.user.FullStockPayment;
 import com.spice.profitmandi.dao.enumuration.fofo.Gateway;
+import com.spice.profitmandi.dao.enumuration.onBorading.onBoardingFormEnums.FullStockPaymentStatus;
 import com.spice.profitmandi.dao.enumuration.transaction.AddWalletRequestStatus;
 import com.spice.profitmandi.dao.enumuration.transaction.TransactionType;
 import com.spice.profitmandi.dao.model.DateRangeModel;
 import com.spice.profitmandi.dao.model.StoreTimelineModel;
 import com.spice.profitmandi.dao.repository.catalog.AddWalletRequestRepository;
 import com.spice.profitmandi.dao.repository.dtr.CreditAccountRepository;
 import com.spice.profitmandi.dao.repository.dtr.FofoStoreRepository;
 import com.spice.profitmandi.dao.repository.dtr.PartnerOnBoardingPanelRepository;
 import com.spice.profitmandi.dao.repository.dtr.UserAccountRepository;
 import com.spice.profitmandi.dao.repository.transaction.*;
+import com.spice.profitmandi.dao.repository.user.FullStockPaymentRepository;
 import com.spice.profitmandi.dao.repository.user.LoiFormRepository;
 import com.spice.profitmandi.dao.service.SidbiService;
 import com.spice.profitmandi.service.NotificationService;
 import com.spice.profitmandi.service.authentication.RoleManager;
 import com.spice.profitmandi.service.transaction.TransactionService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 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.*;
 import org.springframework.web.multipart.MultipartFile;
 import javax.mail.internet.InternetAddress;
 import javax.mail.internet.MimeMessage;
 import javax.servlet.http.HttpServletRequest;
 import javax.swing.*;
-import org.springframework.transaction.annotation.Transactional;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.math.BigDecimal;
 import java.text.MessageFormat;
     @Autowired
     PartnerOnBoardingPanelRepository partnerOnBoardingPanelRepository;
     @Autowired
     StoreTimelineTatService storeTimelineTatService;
+    @Autowired
+    FullStockPaymentRepository fullStockPaymentRepository;
+    @Autowired
+    com.spice.profitmandi.dao.repository.auth.AuthRepository authRepository;
+    @Autowired
+    com.spice.profitmandi.dao.repository.cs.PositionRepository positionRepository;
     @PostMapping(value = "/wallet/upload")
     public String uploadWalletBulk(HttpServletRequest request, @RequestPart("file") MultipartFile file, Model model) throws Exception {
         List<WalletHistoryModel> walletHistoryModelList = ExcelUtils.parseWalletBulkCredit(file.getInputStream());
         for (WalletHistoryModel walletHistoryModel : walletHistoryModelList) {
+            }
         } else {
             String rejectReason = "Entry already Approved Please reject";
             throw new ProfitMandiBusinessException(rejectReason, rejectReason, rejectReason);
+        }
+        // FSP wallet addons can only be approved by Account team L3
+        if (addWalletRequest.getFspId() > 0) {
+            LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
+            String approverEmail = loginDetails.getEmailId();
+            com.spice.profitmandi.dao.entity.auth.AuthUser approverUser = authRepository.selectByEmailOrMobile(approverEmail);
+            boolean isAccountL3 = false;
+            if (approverUser != null) {
+                List<com.spice.profitmandi.dao.entity.cs.Position> positions = positionRepository.selectPositionByAuthId(approverUser.getId());
+                for (com.spice.profitmandi.dao.entity.cs.Position position : positions) {
+                    if (position.getEscalationType().equals(com.spice.profitmandi.dao.enumuration.cs.EscalationType.L3)
+                            && position.getCategoryId() == ProfitMandiConstants.TICKET_CATEGORY_ACCOUNTS) {
+                        isAccountL3 = true;
+                        break;
+                    }
+                }
+            }
+            if (!isAccountL3) {
+                throw new ProfitMandiBusinessException(
+                        "Only Account team L3 can approve Full Stock Payment entries",
+                        approverEmail,
+                        "You are not authorized to approve FSP wallet requests");
+            }
+        }
         if (addWalletRequest.getStatus().equals(AddWalletRequestStatus.pending)) {
             walletService.addAmountToWallet(addWalletRequest.getRetailerId(), walletRequestid, WalletReferenceType.ADVANCE_AMOUNT, "ntfs/rgfs", addWalletRequest.getAmount(), addWalletRequest.getCreateTimestamp());
             addWalletRequest.setStatus(AddWalletRequestStatus.approved);
             addWalletRequest.setUpdateTimestamp(LocalDateTime.now());
             unsettledPaymentsRepository.deleteById(id);
             if (storeTimelineModel != null && storeTimelineModel.getFullStockTimestamp() == null) {
                 UserWallet userWallet = userWalletRepository.selectByRetailerId(addWalletRequest.getRetailerId());
                 List<UserWalletHistory> userWalletHistories = userWalletHistoryRepository.selectByWalletIdAndReferenceType(userWallet.getId(), WalletReferenceType.ADVANCE_AMOUNT);
                 long totalAdvanceAmount = userWalletHistories.stream().mapToLong(x -> x.getAmount()).sum();
                 LOGGER.info("totalAdvanceAmount - " + totalAdvanceAmount);
-                if (totalAdvanceAmount >= ProfitMandiConstants.MIN_FULL_STOCK_PAYMENT) {
+                if (totalAdvanceAmount >= ProfitMandiConstants.FSP_DIRECT_WALLET_THRESHOLD) {
+                    storeTimelineTatService.onFullPaymentReceived(storeTimelineModel.getOnboardingId());
+                }
+                // Mark linked FullStockPayment record as APPROVED via fspId
+                if (addWalletRequest.getFspId() > 0) {
+                    FullStockPayment fsp = fullStockPaymentRepository.selectById(addWalletRequest.getFspId());
+                    if (fsp != null && fsp.getPaymentStatus() == FullStockPaymentStatus.PENDING) {
+                        fsp.setPaymentStatus(FullStockPaymentStatus.APPROVED);
+                        fsp.setApproveTimestamp(LocalDateTime.now());
+                        fullStockPaymentRepository.persist(fsp);
+                        LOGGER.info("Marked FSP id={} as APPROVED via wallet addon approval, onboardingId={}", fsp.getId(), storeTimelineModel.getOnboardingId());
+                    }
+                }
+                // Auto-mark FULL_STOCK_PAYMENT in timeline when total approved FSP amount >= 7 lakh
+                double totalApprovedFsp = fullStockPaymentRepository.selectByOnboardingId(storeTimelineModel.getOnboardingId())
+                        .stream()
+                        .filter(p -> p.getPaymentStatus() == FullStockPaymentStatus.APPROVED)
+                        .mapToDouble(FullStockPayment::getCollectedAmount)
+                        .sum();
+                LOGGER.info("totalApprovedFsp={} for onboardingId={}", totalApprovedFsp, storeTimelineModel.getOnboardingId());
+                if (totalApprovedFsp >= ProfitMandiConstants.FSP_DIRECT_WALLET_THRESHOLD) {
                     storeTimelineTatService.onFullPaymentReceived(storeTimelineModel.getOnboardingId());
+                    LOGGER.info("Auto-marked FULL_STOCK_PAYMENT done for onboardingId={}, totalApprovedFsp={}", storeTimelineModel.getOnboardingId(), totalApprovedFsp);
+                }
+            }
             model.addAttribute("response1", mvcResponseSender.createResponseString(true));
             CustomRetailer customRetailer = retailerService.getFofoRetailer(addWalletRequest.getRetailerId());
         AddWalletRequest addWalletRequest = addWalletRequestRepository.selectById(id);
         if (addWalletRequest.getStatus().equals(AddWalletRequestStatus.pending)) {
             addWalletRequest.setStatus(AddWalletRequestStatus.rejected);
             addWalletRequest.setUpdateTimestamp(LocalDateTime.now());
             addWalletRequestRepository.persist(addWalletRequest);
+            // Mark linked FSP as REJECTED via fspId
+            if (addWalletRequest.getFspId() > 0) {
+                try {
+                    FullStockPayment fsp = fullStockPaymentRepository.selectById(addWalletRequest.getFspId());
+                    if (fsp != null && fsp.getPaymentStatus() == FullStockPaymentStatus.PENDING) {
+                        fsp.setPaymentStatus(FullStockPaymentStatus.REJECTED);
+                        fsp.setDescription("Wallet addon request rejected");
+                        fsp.setApproveTimestamp(LocalDateTime.now());
+                        fullStockPaymentRepository.persist(fsp);
+                        LOGGER.info("Marked FSP id={} as REJECTED via wallet addon rejection", fsp.getId());
+                    }
+                } catch (Exception e) {
+                    LOGGER.error("Error marking FSP as REJECTED on wallet addon rejection", e);
+                }
+            }
             model.addAttribute("response1", mvcResponseSender.createResponseString(true));
             CustomRetailer customRetailer = retailerService.getFofoRetailer(addWalletRequest.getRetailerId());
             String subject = "Request Rejected for " + customRetailer.getBusinessName() + " of Rs." + addWalletRequest.getAmount();
             String messageText = MessageFormat.format("User Id - {0}\n Name -{1}\n Email -{2}\n mobile -{3}\n Reference - {4}\n Amount - Rs.{5}", new Integer(addWalletRequest.getRetailerId()), customRetailer.getBusinessName(), customRetailer.getEmail(), customRetailer.getMobileNumber(), addWalletRequest.getTransaction_reference(), new Float(addWalletRequest.getAmount()));

Subversion Repositories SmartDukaan

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