WebSVN – SmartDukaan – Diff – /trunk/Common/src/main/java/in/shop2020/serving/services/FetchNewFlipCartOrders.java

 				i++;
+			}
 			for(Order order:orders){
 				System.out.println("Order  " + order.getExternalId() +" "+order.getOrderItemId() + " : "+ order.getStatus() + " "+order.getStatusDateMessage() + " "
 						+ order.getStatusLabel() + " " + order.getPickup_by_date() + " "+ order.getTrackingId());
+				/*if(order.getFreebie_items()!=null && order.getFreebie_items().size()>0){
+					System.out.println("Freebie Item ID :"+order.getFreebie_items().get(0).getSku());
+				}*/
+			}
 			processOrders(orders);
 		} catch (IOException e) {
 			e.printStackTrace();
+		}
 		int total_orders = 0;
 		int duplicate_orders = 0;
 		int orders_processed = 0;
 		int not_approved = 0;
 		for(Order order : orders){
+			String status = "";
+			boolean isHold = false;
 			total_orders++;
 			if(order.getExternalId().length()==0 || order.getOrderItemId().length()==0 ){
 				sb.append(" Could not parse order id " + order.getExternalId()+ " " + order.getExternalId() + "\n");
 				continue;
+			}
 			else{
 				sb.append(orderId+" "+subOrderId + " Could not parse order date" +"\n");
 				logger.info(orderId+" "+subOrderId + " Could not parse order date");
 				continue;
+			}
+			if(order.getService_profile()!=null && "NON_FBF".equalsIgnoreCase(order.getService_profile())){
+				String fulfillByUs = order.getService_profile();
+			} else {
+				sb.append(orderId+" "+subOrderId + " Could not parse FBF Condition" +"\n");
+				logger.info(orderId+" "+subOrderId + " Could not parse FBF Condition");
+				continue;
+			}
 			if(order.getPickup_by_date()!=null){
 				ship_date = order.getPickup_by_date();
+			}
 			if(order.getSku().equals("")){
 				sb.append(orderId+" "+subOrderId + " Could not parse sku" +"\n");
+			}
 			else{
 				skuAtFlipkart =  order.getSku();
 				logger.info(orderId+" "+subOrderId + " Processing  sku " + skuAtFlipkart);
+			}
-			if(order.getStatusLabel().length()!=0 && (order.getStatusLabel().equalsIgnoreCase("Approved") || order.getStatusLabel().equalsIgnoreCase("confirmed"))){
+			if(order.getStatusLabel().length()!=0 && (order.getStatusLabel().equalsIgnoreCase("Approved") || order.getStatusLabel().equalsIgnoreCase("On hold") || order.getStatusLabel().equalsIgnoreCase("confirmed"))){
-				String status = order.getStatus();
+				status = order.getStatus();
+				if("on_hold".equalsIgnoreCase(status)){
+					isHold = true;
+				}
+			}
 			else{
-				if(order.getStatus().length()==0){
-					sb.append(orderId+" "+subOrderId + " Could not parse status " + "\n");
+				sb.append(orderId+" "+subOrderId + " Could not parse status " + "\n");
-					logger.info(orderId+" "+subOrderId + " Could not parse status " +"\n");
+				logger.info(orderId+" "+subOrderId + " Could not parse status " +"\n");
-				}
-				else{
-					//sb.append(orderId+" "+subOrderId + " Order not Approved" +"\n");
-					logger.info(orderId+" "+subOrderId + " Order not Approved" +"\n");
-					not_approved++;
-				}
 				continue;
+			}
 			double unitSellingPrice,shippingPrice,octroiFee,emiFee;
 			if(order.getListPrice()!=0 ){
 				if(order.getListPrice() > 0){
 				logger.error("Problem.. thrift exception with Transaction service " , e);
 				e.printStackTrace();
 				continue;
+			}
 			flipkartItem = new CatalogClient("catalog_service_server_host_amazon","catalog_service_server_port").getClient().getFlipkartItemBySkyAtFlipkart(skuAtFlipkart);
+			//flipkartItem = new CatalogClient().getClient().getFlipkartItemBySkyAtFlipkart(skuAtFlipkart);
 			sku = flipkartItem.getItem_id();
 			if(sku==0){
 				System.out.println("SKU Mapping doesnt exists " + skuAtFlipkart);
 				sb.append(orderId + " "+ subOrderId  + " SKU Mapping doesnt exist" + " " +skuAtFlipkart+ "\n");
 				continue;
 			logger.info(orderId+" "+subOrderId + "sku and Price " + sku + " " + unitSellingPrice);
 			lineItem.setExtra_info("flipkartOrderId = " + orderId + " flipkartsubOrderId = " + subOrderId);
 			in.shop2020.model.v1.order.Order t_order = new in.shop2020.model.v1.order.Order();
 			t_order.setCustomer_id(user.getUserId());
 			t_order.setCustomer_email(sourceDetail.getEmail());
-			t_order.setCustomer_mobilenumber("+91-9999999999");
+			t_order.setCustomer_mobilenumber(order.getPhone());
 			t_order.setCustomer_name(shipToName);
 			t_order.setCustomer_address1(addressLine1);
 			t_order.setCustomer_address2(addressLine2);
 			t_order.setCustomer_city(city);
 			t_order.setCustomer_state(state);
 			t_order.setCustomer_pincode(pincode);
 			t_order.setTotal_weight(lineItem.getTotal_weight());
 			t_order.setLineitems(Collections.singletonList(lineItem));
 			t_order.setStatus(OrderStatus.PAYMENT_PENDING);
-			t_order.setStatusDescription("In Process");
 			t_order.setCreated_timestamp(new Date().getTime());
 			t_order.setOrderType(OrderType.B2C);
+			/*if(order.getFreebie_items().size()>0){
+				System.out.println("Freebie found");
+				FlipkartItem freebieItem = new CatalogClient("catalog_service_server_host_amazon","catalog_service_server_port").getClient().getFlipkartItemBySkyAtFlipkart(order.getFreebie_items().get(0).getSku());
+				if(freebieItem.getItem_id()!=0){
+					t_order.setFreebieItemId(freebieItem.getItem_id());
+				}
+			}
+			else{
+				System.out.println("No Freebie");
+			}*/
+			if(isHold){
+				t_order.setCod(true);
+				t_order.setStatusDescription("Cod Verification Pending");
+			} else {
+				t_order.setStatusDescription("In Process");
-			t_order.setCod(false);
+				t_order.setCod(false);
+			}
 			if(shipByDate!=null){
 				t_order.setPromised_shipping_time(shipByDate.getTime());
 				t_order.setExpected_shipping_time(shipByDate.getTime());
 				t_order.setPromised_delivery_time(shipByDate.getTime()+ 4*24*60*60);
 				t_order.setExpected_delivery_time(shipByDate.getTime()+ 4*24*60*60);
 		java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("yyyy-MM-dd-HH:mm:ss");
 		Calendar cal=GregorianCalendar.getInstance();
 		String emailFromAddress = "build@shop2020.in";
 		String password = "cafe@nes";
 		GmailUtils mailer = new GmailUtils();
-		//String sendTo[] = new String[]{"vikram.raghav@shop2020.in"};
+		//String sendTo[] = new String[]{"manish.sharama@shop2020.in"};
 		String sendTo[] = new String[]{ "sandeep.sachdeva@shop2020.in", "vikram.raghav@shop2020.in", "rajneesh.arora@shop2020.in",
 				"khushal.bhatia@shop2020.in","manoj.kumar@saholic.com","chaitnaya.vats@saholic.com",
-				"yukti.jain@shop2020.in","manisha.sharma@shop2020.in","chandan.kumar@shop2020.in","ankush.dhingra@shop2020.in","anikendra.das@shop2020.in"};
+				"yukti.jain@shop2020.in","manish.sharma@shop2020.in","chandan.kumar@shop2020.in","ankush.dhingra@shop2020.in","anikendra.das@shop2020.in"};
 		try {
 			logger.info("Before Sending Emails");
 			String ordersProcessingStatus = "Total Orders : " + total_orders +"\n"+
 			"Processed Orders : " + orders_processed +"\n"+
 			"Existing Orders : " + duplicate_orders +"\n"+

Subversion Repositories SmartDukaan

(root)/trunk/Common/src/main/java/in/shop2020/serving/services/FetchNewFlipCartOrders.java – Rev 11509 → 12589