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

 import com.spice.profitmandi.dao.entity.catalog.TagListing;
 import com.spice.profitmandi.dao.entity.dtr.InsurancePolicy;
 import com.spice.profitmandi.dao.entity.dtr.InsuranceProvider;
 import com.spice.profitmandi.dao.entity.dtr.PaymentOptionTransaction;
 import com.spice.profitmandi.dao.entity.fofo.*;
-import com.spice.profitmandi.dao.entity.transaction.LineItem;
-import com.spice.profitmandi.dao.entity.transaction.Order;
-import com.spice.profitmandi.dao.entity.transaction.Transaction;
 import com.spice.profitmandi.dao.entity.transaction.TransactionApproval;
+import com.spice.profitmandi.dao.entity.transaction.UserWalletHistory;
 import com.spice.profitmandi.dao.entity.user.Address;
 import com.spice.profitmandi.dao.enumuration.dtr.PaymentOptionReferenceType;
 import com.spice.profitmandi.dao.enumuration.transaction.OrderStatus;
 import com.spice.profitmandi.dao.enumuration.transaction.TransactionApprovalStatus;
 import com.spice.profitmandi.dao.repository.auth.AuthRepository;
 import com.spice.profitmandi.dao.repository.catalog.ItemRepository;
 import com.spice.profitmandi.dao.repository.catalog.TagListingRepository;
 import com.spice.profitmandi.dao.repository.dtr.*;
 import com.spice.profitmandi.dao.repository.fofo.*;
 import com.spice.profitmandi.dao.repository.inventory.StateRepository;
-import com.spice.profitmandi.dao.repository.transaction.LineItemRepository;
-import com.spice.profitmandi.dao.repository.transaction.OrderRepository;
+import com.spice.profitmandi.dao.repository.transaction.*;
-import com.spice.profitmandi.dao.repository.transaction.TransactionApprovalRepository;
-import com.spice.profitmandi.dao.repository.transaction.TransactionRepository;
 import com.spice.profitmandi.dao.repository.user.AddressRepository;
+import com.spice.profitmandi.dao.repository.user.CartRepository;
 import com.spice.profitmandi.service.EmailService;
 import com.spice.profitmandi.service.NotificationService;
 import com.spice.profitmandi.service.authentication.RoleManager;
 import com.spice.profitmandi.service.integrations.zest.InsuranceService;
 import com.spice.profitmandi.service.integrations.zest.MobileInsurancePlan;
 import com.spice.profitmandi.service.order.BulkOrderService;
 import com.spice.profitmandi.service.order.OrderService;
 import com.spice.profitmandi.service.pricing.PricingService;
 import com.spice.profitmandi.service.transaction.TransactionService;
 import com.spice.profitmandi.service.user.RetailerService;
+import com.spice.profitmandi.service.wallet.WalletService;
 import com.spice.profitmandi.service.whatsapp.WhatsappMessageService;
 import com.spice.profitmandi.service.whatsapp.WhatsappMessageType;
 import com.spice.profitmandi.web.model.LoginDetails;
 import com.spice.profitmandi.web.util.CookiesProcessor;
 import com.spice.profitmandi.web.util.MVCResponseSender;
+import in.shop2020.model.v1.order.WalletReferenceType;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 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.MessagingException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
     private MouRepository mouRepository;
     @Autowired
     private WhatsappMessageService whatsappMessageService;
     @Autowired
     private TransactionRepository transactionRepository;
+    @Autowired
+    WalletService walletService;
+    @Autowired
+    CartRepository cartRepository;
+    @Autowired
+    UserWalletRepository userWalletRepository;
     @RequestMapping(value = "/order")
     public String orderIndex(HttpServletRequest request, @RequestParam(name = "cartData") String cartData, Model model)
             throws ProfitMandiBusinessException {
         LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
         Map<Integer, JSONObject> contentMap = commonSolrService.getContentByCatalogIds(catalogIds);
         JSONObject jsonObj = contentMap.get(item.getCatalogItemId());
         pendingOrderItem.setImgUrl(jsonObj.getString("imageUrl_s"));
         pendingOrder.setPendingOrderItems(Arrays.asList(pendingOrderItem));
         CustomerAddress customerAddress = customerAddressRepository.selectById(pendingOrder.getCustomerAddressId());
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("dd/MM/yyyy h:mm a");
         Map<String, Object> emailModel = new HashMap<>();
         emailModel.put("customer", customerAddress);
         emailModel.put("pendingOrder", pendingOrder);
         emailModel.put("date", dateTimeFormatter);
         Customer customer = customerRepository.selectById(pendingOrder.getCustomerId());
         return "online-order-item";
+    }
     //TODO Tejus
     @RequestMapping(value = "/getBulkOrder")
-    public String getBulkOrder(HttpServletRequest request, Model model) throws ProfitMandiBusinessException {
+    public String getBulkOrder(HttpServletRequest request, Model model) throws ProfitMandiBusinessException, MessagingException, IOException {
         return "bulk-order";
+    }
     @PostMapping(value = "/bulkOrder/upload")
     public String uploadCatalog(HttpServletRequest request, @RequestPart("file") MultipartFile file, Model model)
     // This method is use for sending all pending transaction to Transation Approval menu
     @RequestMapping(value = "/transaction/pendingApprovals", method = RequestMethod.GET)
     public String getTransactionApproval(HttpServletRequest request, Model model) throws Exception {
         List<TransactionApproval> transactionApprovals = transactionApprovalRepository.selectAllPending();
-        // List<Integer> transactionAppprovalIds= Arrays.asList( 1135352, 1135353, 1135354);
         LOGGER.info("list of Approval transaction Id " + transactionApprovals);
-        List<TransctionApprovalModel> approvalModelList = new ArrayList<>();
+        List<TransactionApprovalModel> approvalModelList = bulkOrderService.getAllPendingTransactionApproval();
-        for (TransactionApproval transactionApproval : transactionApprovals) {
-            List<Order> orderList = orderRepository.selectAllByTransactionId(transactionApproval.getId());
-            Transaction transaction = transactionRepository.selectById(transactionApproval.getId());
-            List<LineItemModel> lineItemModelList = new ArrayList<>();
-            for (Order order : orderList) {
-                LineItem lineItem = order.getLineItem();
-                LineItemModel lineItemModel = new LineItemModel();
-                lineItemModel.setItemId(lineItem.getItemId());
-                lineItemModel.setItemName(lineItem.getItem().getItemDescription());
-                lineItemModel.setItemQuantity(lineItem.getQuantity());
-                lineItemModel.setSellingPrice(lineItem.getUnitPrice());
-                lineItemModel.setDp(tagListingRepository.selectByItemId(lineItem.getItemId()).getSellingPrice());
-                lineItemModelList.add(lineItemModel);
-            }
-            AuthUser authUser = authRepository.selectById(transaction.getCreatedBy());
-            TransctionApprovalModel transactionApprovalModel = new TransctionApprovalModel();
-            String retailerName = " ";
-            retailerName = orderList.get(0).getRetailerName();
-            transactionApprovalModel.setRetailerName(retailerName);
-            transactionApprovalModel.setCreatedBy(authUser.getFullName());
-            transactionApprovalModel.setCreatedOn(transaction.getCreateTimestamp());
-            transactionApprovalModel.setTransactionId(transactionApproval.getId());
-            transactionApprovalModel.setLineItemModels(lineItemModelList);
-            approvalModelList.add(transactionApprovalModel);
-        }
         model.addAttribute("approvalModelList", approvalModelList);
         return "transaction/transaction-approvals";
+    }
     @RequestMapping(value = "transaction/approval", method = RequestMethod.PUT)
+    }
     private void updateApprovalStatus(int transactionId, int approvalId, String approvedBy, LocalDateTime approvedOn, String remark, TransactionApprovalStatus transactionApprovalStatus) throws Exception {
         TransactionApproval transactionApproval = transactionApprovalRepository.selectById(transactionId);
+        int retailerId = transactionRepository.selectById(transactionId).getRetailerId();
         if (!transactionApproval.getStatus().equals(TransactionApprovalStatus.PENDING)) {
             throw new ProfitMandiBusinessException("Transaction already Processed", "Transaction already Processed", "Transaction already Processed");
+        }
         transactionApproval.setStatus(transactionApprovalStatus);
         transactionApproval.setRemark(remark);
         transactionApproval.setApprovalId(approvalId);
         transactionApproval.setApprovedBy(approvedBy);
         transactionApproval.setApprovedOn(approvedOn);
         if (transactionApprovalStatus.equals(TransactionApprovalStatus.APPROVED)) {
             transactionService.processTransaction(transactionId);
+        } else {
+            float totalAmount = 0;
+            // referense id = transaction id
+            // here refund the amount of an order
+            List<UserWalletHistory> uwhList = walletService.getAllByReference(retailerId, transactionId, WalletReferenceType.PURCHASE);
+            // Do is negative so that add amount in wallet
+            totalAmount = -uwhList.get(0).getAmount();
+            walletService.refundToWallet(retailerId, totalAmount, transactionId, WalletReferenceType.PURCHASE, "Order canceled");
+        }
+    }
     @RequestMapping(value = "/bulkOrderTemplate", method = RequestMethod.GET)
     public ResponseEntity<?> bulkOrderTemplate() throws Exception {

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java – Rev 33247 → 33336