WebSVN – SmartDukaan – Diff – /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/BidServiceImpl.java

 package com.spice.profitmandi.dao.service;
 import com.spice.profitmandi.common.model.ProfitMandiConstants;
+import com.spice.profitmandi.common.util.StringUtils;
 import com.spice.profitmandi.common.util.Utils;
 import com.spice.profitmandi.dao.entity.auth.AuthUser;
 import com.spice.profitmandi.dao.entity.catalog.Bid;
 import com.spice.profitmandi.dao.entity.catalog.Liquidation;
-import com.spice.profitmandi.dao.entity.dtr.User;
+import com.spice.profitmandi.dao.entity.user.User;
 import com.spice.profitmandi.dao.enumuration.cs.EscalationType;
 import com.spice.profitmandi.dao.repository.auth.AuthRepository;
 import com.spice.profitmandi.dao.repository.catalog.BidRepository;
 import com.spice.profitmandi.dao.repository.catalog.LiquidationRepository;
 import com.spice.profitmandi.dao.repository.cs.CsService;
-import com.spice.profitmandi.dao.repository.dtr.UserRepository;
+import com.spice.profitmandi.dao.repository.user.UserRepository;
 import com.spice.profitmandi.service.AuthService;
 import com.spice.profitmandi.service.NotificationService;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
         String message = String.format(
                 "Dear Team,\n\n"
                         + "This is to inform you that the material for %s, valued at Rs.%s, "
                         + "is on hold until the payment against the stock is received. Kindly "
                         + "top up your wallet with an amount of Rs.%s to proceed with the dispatch.",
-                user.getFirstName() + " " + user.getLastName(), totalPayableAmount, (totalPayableAmount - netAmountInHand)
+                user.getName(), totalPayableAmount, (totalPayableAmount - netAmountInHand)
         );
         Utils.sendMailWithAttachments(mailSender, emailTo, ccTo, subject, message);
+    }
     @Override
     public void sendSummaryMailToUserAndManagers(int userId, List<Bid> bids, Liquidation liquidation) throws Exception {
         String content = this.generateContent(bids, liquidation, ProfitMandiConstants.BID_ENUM.CLOSED);
         AuthUser authUser = authRepository.selectById(userId);
+        //String[] emailTo = {"vikas.jangra@smartdukaan.com"};
-        String[] emailTo = {authUser.getEmailId()};
+        String[] emailTo = {authUser.getEmailId(), "vikas.jangra@smartdukaan.com"};
         String[] ccTo = authService.getAllManagers(userId).stream().map(AuthUser::getEmailId).toArray(String[]::new);
         String subject = "Liquidation Report";
         String message = "Dear Team,\n\n"
                 + "Liquidation has been completed. Here is the summary:\n\n"
         LOGGER.info("mailMessage: {}",message);
         Utils.sendMailWithAttachments(mailSender, emailTo, ccTo, subject, message);
+    }
     @Override
-    public void notifyPartner(int userId, List<Bid> bids, Liquidation liquidation, ProfitMandiConstants.BID_ENUM status) throws Exception {
+    public void notifyPartner(int userId, Bid bid, ProfitMandiConstants.BID_ENUM status) throws Exception {
         User user = userRepository.selectById(userId);
-        List<Bid> topBid = bidRepository.selectBidByLiquidationId(bids.get(0).getLiquidationId());
+        List<Bid> topBid = bidRepository.selectBidByLiquidationId(bid.getLiquidationId());
-        String message = this.generateBidStatusMessage(user.getFirstName()+" "+user.getLastName(), bids.get(0), topBid.get(0).getBiddingAmount());
+        String message = this.generateWhatsAppBidMessage(user.getName(), bid, topBid.get(0).getBiddingAmount(), status);
+        String mobile = user.getMobileNumber();
-        notificationService.sendWhatsappMessage(message, "Bid Update!", user.getMobileNumber());
+        notificationService.sendWhatsappMessage(message, "Bid Update!", mobile);
+    }
     private String generateContent(List<Bid> bids, Liquidation liquidation, ProfitMandiConstants.BID_ENUM status){
         StringBuilder sb = new StringBuilder();
-        if (status.equals(ProfitMandiConstants.BID_ENUM.CLOSED)){
-            sb.append("<h3>Congratulations your BID has ").append(status).append("</h3>");
-        } else {
-            sb.append("<h3>Sorry your BID has ").append(status).append("</h3>");
-        }
         sb.append("<h4>Bidding Summary</h3>");
         sb.append("<p><strong>Liquidation ID:</strong> ").append(liquidation.getId()).append("</p>");
         sb.append("<p><strong>Catalog ID:</strong> ").append(liquidation.getCatalogId()).append("</p>");
         sb.append("<p><strong>Total Quantity Available:</strong> ").append(liquidation.getQuantity()).append("</p>");
         sb.append("<p><strong>End Date:</strong> ").append(liquidation.getEndDate()).append("</p>");
         sb.append("</table>");
         return sb.toString();
+    }
-    public void cancelYesterdayProcessBid(int id) throws Exception {
+    public void cancelYesterdayProcessBid(Bid bid) throws Exception {
-        Bid bid = bidRepository.selectById(id);
         bid.setStatus(ProfitMandiConstants.BID_ENUM.CANCELLED);
         Liquidation liquidation = liquidationRepository.selectLiquidationById(bid.getLiquidationId());
         List<Bid> bids = bidRepository.selectBidByLiquidationId(bid.getLiquidationId());
         this.sendSummaryMailToUserAndManagers(liquidation.getCreatedBy(), bids, liquidation);
-        List<Bid> partnerBid = new ArrayList<>();
-        partnerBid.add(bid);
-        this.notifyPartner(bid.getFofoId(), partnerBid, liquidation, ProfitMandiConstants.BID_ENUM.CANCELLED);
+        this.notifyPartner(bid.getFofoId(), bid, ProfitMandiConstants.BID_ENUM.CANCELLED);
     }
-    private String generateBidStatusMessage(String fofoName, Bid bidData, double topBidAmount) {
+    private String generateWhatsAppBidMessage(String fofoName, Bid bidData, double topBidAmount, ProfitMandiConstants.BID_ENUM status) {
-        StringBuilder message = new StringBuilder();
+        String bidTime = StringUtils.toLocalDateTime(String.valueOf(bidData.getCreatedAt()));
-        message.append("Hi ").append(fofoName).append(",👋\n\n");
+        String bidAmount = String.format("%.2f", bidData.getBiddingAmount());
-        switch (bidData.getStatus()) {
+        String message = "";
+        if (status.equals(ProfitMandiConstants.BID_ENUM.CLOSED)) {
+            message = "Congratulations! %s,"+ "\n"+
-            case CLOSED:
+                    "\n"+
-                message.append("Your bid for ").append(bidData.getItemName()).append(" has been confirmed!🎉\n\n")
+                    "Your bid for %s has been confirmed!\n" +
+                    "\n"+
-                    .append("🧾Bid Details:\n")
+                    "Bid Details:\n" +
-                    .append("* Bid Amount: ₹").append(String.format("%.2f", bidData.getBiddingAmount())).append("\n")
+                    "* Bid Amount: ₹%s\n" +
-                    .append("* Quantity: ").append(bidData.getQuantity()).append("\n")
+                    "* Quantity: %s\n" +
-                    .append("* Confirmation Date: ").append(bidData.getCreatedAt()).append("\n\n")
+                    "* Bid Time: %s\n" +
+                    "\n"+
-                    .append("Thank you for participating. We'll dispatch your order soon.");
+                    "Thank you for participating. We'll dispatch your order soon.";
+            message = String.format(message, fofoName, bidData.getItemName(), bidAmount, bidData.getQuantity(), bidTime);
+        }
+        else if (status.equals(ProfitMandiConstants.BID_ENUM.CANCELLED)) {
-                break;
+            message = "Hi %s,"+ "\n"+
-            case CANCELLED:
+                    "\n"+
-                message.append("We regret to inform you that your bid for ").append(bidData.getItemName()).append(" was not selected this time.\n\n")
+                    "We regret to inform you that your bid for %s was not selected this time.\n" +
+                    "\n"+
-                    .append("🧾Bid Details:\n")
+                    "Bid Details:\n" +
-                    .append("* Bid Amount: ₹").append(String.format("%.2f", bidData.getBiddingAmount())).append("\n")
+                    "* Bid Amount: ₹%s\n" +
-                    .append("* Quantity: ").append(bidData.getQuantity()).append("\n")
+                    "* Quantity: %s\n" +
-                    .append("* Bid Date: ").append(bidData.getCreatedAt()).append("\n")
+                    "* Bid Time: %s\n" +
-                        .append("Qualified Bid Amount: ").append(topBidAmount).append("\n\n")
+                    "* Qualified Bid Amount: ₹%s\n" +
+                    "\n"+
-                    .append("Thank you for your participation. Stay tuned for more opportunities!");
+                    "Thank you for your participation. Stay tuned for more opportunities!";
+            message = String.format(message, fofoName, bidData.getItemName(), bidAmount, bidData.getQuantity(), bidTime, String.format("%.2f", topBidAmount));
+        }
+        else if (status.equals(ProfitMandiConstants.BID_ENUM.PENDING)) {
-                break;
+            message = "Hi %s,"+ "\n"+
-            case PENDING:
+                    "\n"+
-                message.append("Your bid for ").append(bidData.getItemName()).append(" is currently pending.⏳\n\n")
+                    "Your bid for %s has been placed successfully!\n" +
+                    "\n"+
-                    .append("Bid Details:\n")
+                    "Bid Details:\n" +
+                    "* Bid Amount: ₹%s\n" +
+                    "* Quantity: %s\n" +
+                    "* Bid Time: %s\n" +
+                    "\n"+
-                    .append("* Bid Amount: ₹").append(String.format("%.2f", bidData.getBiddingAmount())).append("\n")
+                    "We'll keep you updated. You'll be notified once the bidding period ends.";
-                    .append("* Quantity: ").append(bidData.getQuantity()).append("\n")
+            message = String.format(message, fofoName, bidData.getItemName(), bidAmount, bidData.getQuantity(), bidTime);
+        }
+        else if (status.equals(ProfitMandiConstants.BID_ENUM.UPDATE)) {
+            message = "Hi %s,"+ "\n"+
+                    "\n"+
-                    .append("* Bid Date: ").append(bidData.getCreatedAt()).append("\n\n")
+                    "A higher bid has been placed for %s. Don't miss your chance!\n" +
+                    "\n"+
+                    "Your Bid Details:\n" +
-                    .append("We'll notify you once the bidding period ends.");
+                    "* Bid Amount: ₹%s\n" +
+                    "* Quantity: %s\n" +
+                    "* Bid Time: %s\n" +
-                break;
+                    "\n"+
+                    "Another user has placed a higher bid of ₹%s.\n" +
+                    "Update your bid before the bidding ends to stay ahead in the race!";
+            message = String.format(message, fofoName, bidData.getItemName(), bidAmount, bidData.getQuantity(), bidTime, String.format("%.2f", topBidAmount));
+        }
-        return message.toString();
+        return message;
+    }
+}

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/BidServiceImpl.java – Rev 34470 → 34492