WebSVN – SmartDukaan – Diff – /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

 	PAYMENT_FLAGGED_DENIED,
 	DELIVERY_SUCCESS,
 	CANCEL_REQUEST_RECEIVED,
 	CANCEL_REQUEST_CONFIRMED,
 	CANCELLED_ON_CUSTOMER_REQUEST,
-	NOT_USABLE,
+	SHIPPED_TO_DESTINATION_CITY,
-	COMPLETED,                  //Not Used
+	REACHED_DESTINATION_CITY,
 	COD_VERIFICATION_FAILED,
 	FAILED,
 	RTO_IN_TRANSIT,
 	RTO_RECEIVED_PRESTINE,
 	DOA_PICKUP_REQUEST_RAISED,
 	LOW_INV_PO_RAISED,
 	LOW_INV_REVERSAL_IN_PROCESS,
 	LOW_INV_NOT_AVAILABLE_AT_HOTSPOT,
 	LOW_INV_PO_RAISED_TIMEOUT,
 	LOW_INV_REVERSAL_TIMEOUT,
-	MANIFESTED,
+	FIRST_DELIVERY_ATTEMPT_MADE,
 	CAPTURE_IN_PROCESS,
 	DOA_REQUEST_RECEIVED,
 	DOA_REQUEST_AUTHORIZED,
 	DOA_PICKUP_DENIED,
 	DOA_RECEIVED_DAMAGED,
 										OrderStatus.PAYMENT_PENDING,			OrderStatus.COD_VERIFICATION_PENDING,
 										OrderStatus.SUBMITTED_FOR_PROCESSING,	OrderStatus.ACCEPTED,
 										OrderStatus.INVENTORY_LOW,				OrderStatus.BILLED,
 										OrderStatus.PAYMENT_FLAGGED,			OrderStatus.SHIPPED_FROM_WH,
 										OrderStatus.SHIPPED_TO_LOGST,			OrderStatus.PAYMENT_FLAGGED_DENIED,
+										OrderStatus.SHIPPED_TO_DESTINATION_CITY,	OrderStatus.REACHED_DESTINATION_CITY,
 										OrderStatus.CANCEL_REQUEST_RECEIVED,	OrderStatus.CANCEL_REQUEST_CONFIRMED,
 										OrderStatus.RTO_IN_TRANSIT,				OrderStatus.RTO_RECEIVED_PRESTINE,
 										OrderStatus.DOA_PICKUP_REQUEST_RAISED,	OrderStatus.DOA_PICKUP_CONFIRMED,
 										OrderStatus.DOA_RETURN_IN_TRANSIT,		OrderStatus.DOA_RECEIVED_PRESTINE,
 										OrderStatus.DOA_CERT_INVALID,			OrderStatus.DOA_CERT_VALID,
 										OrderStatus.LOW_INV_PO_RAISED,			OrderStatus.LOW_INV_REVERSAL_IN_PROCESS,
 										OrderStatus.LOW_INV_NOT_AVAILABLE_AT_HOTSPOT,	OrderStatus.LOW_INV_PO_RAISED_TIMEOUT,
-										OrderStatus.LOW_INV_REVERSAL_TIMEOUT,	OrderStatus.MANIFESTED,
+										OrderStatus.LOW_INV_REVERSAL_TIMEOUT,	OrderStatus.FIRST_DELIVERY_ATTEMPT_MADE,
 										OrderStatus.CAPTURE_IN_PROCESS,			OrderStatus.DOA_REQUEST_RECEIVED,
 										OrderStatus.DOA_REQUEST_AUTHORIZED,		OrderStatus.DOA_RECEIVED_DAMAGED,
 										OrderStatus.DOA_LOST_IN_TRANSIT,		OrderStatus.RTO_RECEIVED_DAMAGED,
 										OrderStatus.RTO_LOST_IN_TRANSIT,		OrderStatus.RTO_INVENTORY_REVERSED,
 										OrderStatus.RET_REQUEST_RECEIVED,		OrderStatus.RET_REQUEST_AUTHORIZED,
 	/**
 	Add the invoice number to the order.
 	*/
 	void addInvoiceNumber(1:i64 orderId, 2:string invoiceNumber, 3:string color) throws (1:TransactionServiceException ex),
 	/**
 	Depending on the third parameter, marks either all prepaid or all cod orders BILLED by the
-	given warehouse and were picked up by the given provider as MANIFESTED.
-	*/
-	bool markOrdersAsManifested(1:i64 warehouseId, 2:i64 providerId, 3:bool cod) throws (1:TransactionServiceException ex),
-	/**
-	Depending on the third parameter, marks either all prepaid or all cod orders BILLED and marked as MANIFESTED by the
 	given warehouse and were picked up by the given provider as SHIPPED_FROM_WH.
 	*/
 	bool markOrdersAsShippedFromWarehouse(1:i64 warehouseId, 2:i64 providerId, 3:bool cod, 4:list<i64> orderIds) throws (1:TransactionServiceException ex),
 	/**
 	Marks all SHIPPED_FROM_WH orders of the previous day for a provider as SHIPPED_TO_LOGISTICS.
+	Raises an exception if we encounter report for an AWB number that we did not ship.
+	*/
+	void markOrdersAsPickedUp(1:i64 providerId, 2:map<string, string> pickupDetails) throws (1:TransactionServiceException ex),
+	/**
 	Returns a list of orders that were shipped from warehouse but did not appear in the pick-up report.
-	Raises an exception if we encounter report for an AWB number that we did not ship.
 	*/
-	list<Order> markOrdersAsPickedUp(1:i64 providerId, 2:map<string, string> pickupDetails) throws (1:TransactionServiceException ex),
+	list<Order> getOrdersNotPickedUp(1:i64 providerId),
 	/**
 	Marks all orders with AWBs in the given map as delivered. Also sets the delivery timestamp and
 	the name of the receiver.
 	Raises an exception if we encounter report for an AWB number that we did not ship.
 	*/
 	void markOrdersAsDelivered(1:i64 providerId, 2:map<string, string> deliveredOrders) throws (1:TransactionServiceException ex),
 	/**
-	Mark all orders with AWBs in the given map as failed. Also sets the delivery timestamp.
+	Mark all orders with AWBs in the given map as RTO. Also sets the delivery timestamp.
 	Raises an exception if we encounter report for an AWB number that we did not ship.
 	*/
-	void markOrdersAsFailed(1:i64 providerId, 2:map<string, string> returnedOrders) throws (1:TransactionServiceException ex),
+	void markAsRTOrders(1:i64 providerId, 2:map<string, string> returnedOrders) throws (1:TransactionServiceException ex),
+	/**
+	Returns a list of orders that were returned by courier.
+	*/
+	list<Order> getRTOrders(1:i64 providerId),
 	/**
 	Update the status description of orders whose AWB numbers are keys of the Map.
+	*/
+	void updateNonDeliveryReason(1:i64 providerId, 2:map<string, string> undeliveredOrders) throws (1:TransactionServiceException ex),
+	/**
 	Returns a list of orders that were picked up or shipped four days ago but did not get delivered.
 	*/
+	list<Order> getNonDeliveredOrdersbyCourier(1:i64 providerId),
+	/**
+	Mark all orders with AWBs in the given map as local connected. Also sets the local connected timestamp.
+	*/
+	void markOrdersAsLocalConnected(1:i64 providerId, 2:map<string, string> local_connected_orders) throws (1:TransactionServiceException ex),
+	/**
+	Returns a list of orders that were picked up or shipped but pending local connection.
+	*/
+	list<Order> getOrdersNotLocalConnected(1:i64 providerId),
+	/**
+	Mark all orders with AWBs in the given map as reached destination city. Also sets the reached destination timestamp.
+	*/
+	void markOrdersAsDestinationCityReached(1:i64 providerId, 2:map<string, string> destination_city_reached_orders) throws (1:TransactionServiceException ex),
+	/**
+	Mark all orders with AWBs in the given map as first delivery attempt made. Also sets the first delivery attempted timestamp.
+	*/
-	list<Order> updateNonDeliveryReason(1:i64 providerId, 2:map<string, string> undeliveredOrders) throws (1:TransactionServiceException ex),
+	void markOrdersAsFirstDeliveryAttempted(1:i64 providerId, 2:map<string, string> first_atdl_orders) throws (1:TransactionServiceException ex),
 	/**
 	Returns the list of orders whose delivery time has passed but have not been
 	delivered yet for the given provider and warehouse. To get a complete list of
 	undelivered orders, pass them as -1.
 	*/
 	bool authorizePickup(1:i64 orderId, 2:string pickupNumber, 3:i64 providerId) throws (1:TransactionServiceException ex),
 	/**
 	Marks all DOA_PICKUP_AUTHORIZED orders of the previous day for a provider as DOA_RETURN_IN_TRANSIT.
+	*/
+	void markDoasAsPickedUp(1:i64 providerId, 2:map<string, string> pickupDetails),
+	/**
 	Returns a list of orders that were authorized for pickup but did not appear in the pick-up report.
 	*/
-	list<Order> markDoasAsPickedUp(1:i64 providerId, 2:map<string, string> pickupDetails),
+	list<Order> getDoasNotPickedUp(1:i64 providerId),
 	/**
 	Marks all RET_PICKUP_CONFIRMED orders of the previous day for a provider as RET_RETURN_IN_TRANSIT.
+	*/
+	void markReturnOrdersAsPickedUp(1:i64 providerId, 2:map<string, string> pickupDetails),
+	/**
 	Returns a list of orders that were authorized for pickup but did not appear in the pick-up report.
 	*/
-	list<Order> markReturnOrdersAsPickedUp(1:i64 providerId, 2:map<string, string> pickupDetails),
+	list<Order> getReturnOrdersNotPickedUp(1:i64 providerId),
 	/**
 	If the order status is DOA_PICKUP_CONFIRMED or DOA_RETURN_IN_TRANSIT, marks the order status as DOA_RECEIVED_PRESTINE and returns true.
 	If the order status is RTO_IN_TRANSIT, marks the order status as RTO_RECEIVED_PRESTINE and returns true.
 	If the order is in any other state, it returns false.
 	Returns the order corresponding to an AWB number
 	*/
 	Order getOrderForAwb(1:string awb) throws (1:TransactionServiceException ex),
 	/**
-	Returns the order corresponding to a logistics provider id for a given order status
+	Returns the order corresponding to a logistics provider id for a given list of order status
 	*/
-	list<Order> getOrdersForProviderForStatus(1:i64 logistics_provider_id, 2:OrderStatus order_status) throws (1:TransactionServiceException ex)
+	list<Order> getOrdersForProviderForStatus(1:i64 logistics_provider_id, 2:list<OrderStatus> order_status_list) throws (1:TransactionServiceException ex)
 	/**
 	Returns list of orders fullfiled from a certain vendor and billed in a given date range
 	*/
 	list<Order> getBilledOrdersForVendor(1:i64 vendorId, 2:i64 billingDateFrom, 3:i64 billingDateTo) throws (1:TransactionServiceException ex),

Subversion Repositories SmartDukaan

(root)/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift – Rev 4905 → 4910