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

+                }
                 totalPayableAmount += cartItem.getSellingPrice() * cartItem.getQuantity();
                 cartItems.add(cartItem);
+            }
             Bid bid = null;
+            ProfitMandiConstants.BID_ENUM finalBidStatus = ProfitMandiConstants.BID_ENUM.CLOSED;
             if (type.equals(ProfitMandiConstants.PO_TYPE.AUTO)) {
                 bid = bidRepository.selectById(fofoBulkOrderModels.get(0).getRowIndex());
+            }
             LOGGER.info("totalAmount of item " + totalPayableAmount);
             double walletAmount = walletService.getWalletAmount(fofoId);
                 if (type.equals(ProfitMandiConstants.PO_TYPE.MANUAL)) {
                     throw new ProfitMandiBusinessException("Skipping order due to insufficient balance for id - ", fofoId, " ,Check wallet Balance once");
                 } else {
                     if (scheduleType.equals(ProfitMandiConstants.BID_CRON_ENUM.TODAY)) {
                         bidService.sendMailToRBM(netAmountInHand, totalPayableAmount, fofoId);
-                        bid.setStatus(ProfitMandiConstants.BID_ENUM.PROCESSING);
+                        finalBidStatus = ProfitMandiConstants.BID_ENUM.PROCESSING;
                         LOGGER.info("Skipping order due to insufficient balance for id - "+ fofoId+ " Sending mail to RBM");
                         //throw new ProfitMandiBusinessException("Skipping order due to insufficient balance for id - ", fofoId, " ,Sending mail to RBM");
                     } else {
                         bidService.cancelYesterdayProcessBid(bid);
                         LOGGER.info("Skipping order due to insufficient balance for id - "+ fofoId+ " Cancelling the BID");
+                        finalBidStatus = ProfitMandiConstants.BID_ENUM.CANCELLED;
                         //throw new ProfitMandiBusinessException("Skipping order due to insufficient balance for id - ", fofoId, " ,Cancelling the BID");
+                    }
+                }
+            }
             UserCart userCart = cartService.setCartItems(fofoId, cartItems);
                     loanId = loan.getId();
+                }
             } catch (Exception exception){
                 if (type.equals(ProfitMandiConstants.PO_TYPE.AUTO)) {
                     bidService.sendMailToRBM(netAmountInHand, totalPayableAmount, fofoId);
-                    bid.setStatus(ProfitMandiConstants.BID_ENUM.PROCESSING);
+                    finalBidStatus = ProfitMandiConstants.BID_ENUM.PROCESSING;
                     LOGGER.info("Skipping order due to insufficient balance for id - "+ fofoId+ " Cancelling the BID");
                     //throw new ProfitMandiBusinessException("Skipping order unable to create load for id - ", fofoId, " ,Sending mail to RBM");
+                }
+            }
+            if (finalBidStatus.equals(ProfitMandiConstants.BID_ENUM.CLOSED)) {
-            int transactionId = transactionService.createTransactionInternally(userCart, totalPayableAmount, 0);
+                int transactionId = transactionService.createTransactionInternally(userCart, totalPayableAmount, 0);
-            //Set here created by
+                //Set here created by
-            Transaction transaction = transactionRepository.selectById(transactionId);
+                Transaction transaction = transactionRepository.selectById(transactionId);
-            transaction.setCreatedBy(creatorId);
+                transaction.setCreatedBy(creatorId);
-            LOGGER.info("transaction  created by {}", transaction.getCreatedBy());
+                LOGGER.info("transaction  created by {}", transaction.getCreatedBy());
-            commonPaymentService.payThroughWallet(transactionId);
+                commonPaymentService.payThroughWallet(transactionId);
-            if (type.equals(ProfitMandiConstants.PO_TYPE.AUTO)) {
+                if (type.equals(ProfitMandiConstants.PO_TYPE.AUTO)) {
-                bid.setStatus(ProfitMandiConstants.BID_ENUM.CLOSED);
+                    bid.setStatus(finalBidStatus);
-            }
+                }
-            if (approvalRequired) {
+                if (approvalRequired) {
-                this.createApproval(transactionId);
+                    this.createApproval(transactionId);
-                if (loanId > 0) {
+                    if (loanId > 0) {
-                    LoanTransaction loanTransaction = new LoanTransaction();
+                        LoanTransaction loanTransaction = new LoanTransaction();
-                    loanTransaction.setLoanId(loanId);
+                        loanTransaction.setLoanId(loanId);
-                    loanTransaction.setTransactionId(transactionId);
+                        loanTransaction.setTransactionId(transactionId);
-                    loanTransactionRepository.persist(loanTransaction);
+                        loanTransactionRepository.persist(loanTransaction);
+                    }
+                } else {
+                    transactionService.processTransaction(transactionId, loanId);
+                }
-            } else {
-                transactionService.processTransaction(transactionId,loanId);
+            }
+        }
+    }
             AuthUser authUser = authRepository.selectById(transaction.getCreatedBy());
             TransactionApprovalModel transactionApprovalModel = new TransactionApprovalModel();
             String retailerName = " ";
             retailerName = orderList.get(0).getRetailerName();
             transactionApprovalModel.setRetailerName(retailerName);
+            if (authUser == null) {
+                transactionApprovalModel.setCreatedBy(retailerName);
+            } else {
-            transactionApprovalModel.setCreatedBy(authUser.getFullName());
+                transactionApprovalModel.setCreatedBy(authUser.getFullName());
+            }
             transactionApprovalModel.setCreatedOn(transaction.getCreateTimestamp());
             transactionApprovalModel.setTransactionId(transactionApproval.getId());
             transactionApprovalModel.setLineItemModels(lineItemModelList);
             approvalModelList.add(transactionApprovalModel);

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java – Rev 34572 → 34573