WebSVN – SmartDukaan – Diff – /trunk/Support/src/main/java/in/shop2020/support/controllers/FlipkartDashboardController.java

 				txn.setStatusDescription("Order for flipkart ");
 				List<in.shop2020.model.v1.order.Order> orderlist = new ArrayList<in.shop2020.model.v1.order.Order>();
 				double total_price=0;
 				InventoryService.Client inventoryClient = null;
 				Warehouse fulfillmentWarehouse= null;
+				boolean exit = false;
 				for(int i=0;i<quantity;i++){
 					LineItem lineItem = null;
 					lineItem = createLineItem(sku,unitSellingPrice);
 					logger.info(orderId+" "+subOrderId + "sku and Price " + sku + " " + unitSellingPrice);
 					lineItem.setExtra_info("flipkartOrderId = " + orderId + " flipkartsubOrderId = " + subOrderId);
 						t_order.setPromised_delivery_time(time.getTimeInMillis());
 						t_order.setExpected_delivery_time(time.getTimeInMillis());
 					} catch(Exception e) {
 						logger.error("Error in updating Shipping or Delivery Time for suborderid  " + subOrderId);
 						sb.append(orderId + " "+ subOrderId  + " Could not update delivery time" + " " + "\n");
+						exit = true;
 						continue;
+					}
 					SnapdealItem snapdealItem = new CatalogClient().getClient().getSnapdealItem(sku);
 					inventoryClient = new InventoryClient().getClient();
 					try {
 						t_order.getLineitems().get(0).setTransfer_price(vendorItemPricing.getTransferPrice());
 						t_order.getLineitems().get(0).setNlc(vendorItemPricing.getNlc());
 					} catch (InventoryServiceException e) {
 						logger.error("Error connecting inventory service for suborderid  " + orderId + " " + subOrderId , e);
 						sb.append(orderId + " " + subOrderId+ " Inventory Service Exception" + " " + "\n");
+						exit = true;
 						continue;
 					} catch (TTransportException e) {
 						logger.error("Transport Exception with Inventory Service for suborderid  " + orderId + " " + subOrderId , e);
 						sb.append(orderId + " " + subOrderId + " Transport Exception with Inventory Service" + " " + "\n");
+						exit = true;
 						continue;
 					} catch (TException e) {
 						logger.error("Exception with Inventory Service for suborderid  " + orderId + " " + subOrderId , e);
 						sb.append(orderId + " " + subOrderId + " Exception in Inventory Service" + " " + "\n");
+						exit = true;
 						continue;
 					} catch (CatalogServiceException e) {
 						logger.error("Exception with Catalog Service for   " + orderId + " " + subOrderId + " while getting item " + lineItem.getItem_id(), e);
 						sb.append(orderId + " " + subOrderId + " Exception in Catalog Service" + " " + "\n");
+						exit = true;
 						continue;
+					}
 					t_order.setLogistics_provider_id(FLIPKART_LOGISTICS_ID);
 					t_order.setAirwaybill_no("");
 					t_order.setTracking_id("");
 					t_order.setSource(FLIPKART_SOURCE_ID);
 					t_order.setOrderType(OrderType.B2C);
 					total_price = total_price + unitSellingPrice;
 					orderlist.add(t_order);
+				}
+				if(exit){
+					continue;
+				}
 				txn.setOrders(orderlist);
 				try {
 					transactionId =  String.valueOf(transaction_client.createTransaction(txn));
 					logger.info("Transaction id is : " + transactionId);
 				} catch (TransactionServiceException e) {
 					logger.error(orderId+" "+subOrderId + " Could not create transaction " , e);
 					sb.append(orderId+" "+subOrderId + " Could not create transaction" +"\n");
-					logger.info(orderId+" "+subOrderId + " Could not create transaction" +"\n");
 					continue;
 				} catch (TException e) {
-					logger.error("Problem with transaction service while creating transaction", e);
 					sb.append(orderId+" "+subOrderId + " Transaction Service Exception could not create transaction" +"\n");
 					logger.info(orderId+" "+subOrderId + " Transaction Service Exception could not create transaction" +"\n");
 					continue;
+				}
 				try{
 			ServletOutputStream sos;
 			try {
 				sos = response.getOutputStream();
 				if(sb.toString().equalsIgnoreCase("")){
-					sos.write("Orders Created Successfully (No Alerts)".toString().getBytes());
+					sos.write((orders_processed + " Orders Created").toString().getBytes());
+				}
 				else{
-					if(orders_processed!=0){
-						sos.write(("Orders Created with Alerts \n"+ sb.toString()).getBytes());
+						sos.write((orders_processed +" Orders Created \n"+ sb.toString()).getBytes());
-					}
-					else{
-						sos.write(("Zero Approved Orders \n"+ sb.toString()).getBytes());
-					}
+				}
 				sos.flush();
 			} catch (IOException e) {
 				System.out.println("Unable to stream the manifest file");
+			}
 				"yukti.jain@shop2020.in","manisha.sharma@shop2020.in","chandan.kumar@shop2020.in","ankush.dhingra@shop2020.in","amar.kumar@shop2020.in"};
 		*/
 		try {
 			logger.info("Before Sending Emails");
 			if(sb.toString().equalsIgnoreCase("")){
-				String emailSubjectTxt = "Flipkart Orders Created Successfully"+sdf.format(cal.getTime());
+				String emailSubjectTxt = orders_processed + " Flipkart Orders Created "+sdf.format(cal.getTime());
 				mailer.sendSSLMessage(sendTo, emailSubjectTxt,"Orders Created Successfully (No Alerts)", emailFromAddress, password, new ArrayList<File>());
-				logger.info("Sending Emails Flipkart Orders Created Successfully (No Alerts)");
+				logger.info("Sending Email Flipkart Orders Created Successfully (No Alerts)");
+			}
 			else{
 				if(orders_processed!=0){
-					String emailSubjectTxt = "Flipkart Orders Created Successfully (Check Alerts)"+sdf.format(cal.getTime());
+					String emailSubjectTxt = orders_processed + " Flipkart Orders Created (Check Alerts)"+sdf.format(cal.getTime());
 					mailer.sendSSLMessage(sendTo, emailSubjectTxt,sb.toString(), emailFromAddress, password, new ArrayList<File>());
-					logger.info("Sending Emails Flipkart Orders Created Successfully (Check Alerts)");
+					logger.info("Sending Email Flipkart Orders Created Successfully (Check Alerts)");
+				}
 				else{
-					String emailSubjectTxt = "No New Approved Orders"+sdf.format(cal.getTime());
+					String emailSubjectTxt = "No new orders created "+sdf.format(cal.getTime());
 					mailer.sendSSLMessage(sendTo, emailSubjectTxt,sb.toString(), emailFromAddress, password, new ArrayList<File>());
-					logger.info("Sending Emails Flipkart Orders Created Successfully (Check Alerts)");
+					logger.info("Sending Email Flipkart Orders Created Successfully (Check Alerts)");
+				}
+			}
+			}
 			catch (Exception e) {

Subversion Repositories SmartDukaan

(root)/trunk/Support/src/main/java/in/shop2020/support/controllers/FlipkartDashboardController.java – Rev 9031 → 9032