Subversion Repositories SmartDukaan

Rev

Rev 8254 | Rev 8283 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 8254 Rev 8281
Line 248... Line 248...
248
            order.setLineitems(Collections.singletonList(lineItem));            
248
            order.setLineitems(Collections.singletonList(lineItem));            
249
            order.setStatus(OrderStatus.SUBMITTED_FOR_PROCESSING);
249
            order.setStatus(OrderStatus.SUBMITTED_FOR_PROCESSING);
250
            order.setStatusDescription("In Process");
250
            order.setStatusDescription("In Process");
251
            order.setCreated_timestamp(new Date().getTime());
251
            order.setCreated_timestamp(new Date().getTime());
252
            try {
252
            try {
253
            	order.setPromised_shipping_time(row.getCell(SHIP_DATE_INDEX).getDateCellValue().getTime());
253
            	Date shippingDate = interchangeDateAndMonth(row.getCell(SHIP_DATE_INDEX).getDateCellValue());
-
 
254
            	order.setPromised_shipping_time(shippingDate.getTime());
254
            	order.setExpected_shipping_time(row.getCell(SHIP_DATE_INDEX).getDateCellValue().getTime());
255
            	order.setExpected_shipping_time(shippingDate.getTime());
255
            	//order.setPromised_shipping_time(sdf.parse(row.getCell(SHIP_DATE_INDEX).getStringCellValue()).getTime());
256
            	//order.setPromised_shipping_time(sdf.parse(row.getCell(SHIP_DATE_INDEX).getStringCellValue()).getTime());
256
            	//order.setExpected_shipping_time(sdf.parse(row.getCell(SHIP_DATE_INDEX).getStringCellValue()).getTime());
257
            	//order.setExpected_shipping_time(sdf.parse(row.getCell(SHIP_DATE_INDEX).getStringCellValue()).getTime());
257
            	Calendar time = Calendar.getInstance();
258
            	Calendar time = Calendar.getInstance();
258
            	time.setTimeInMillis(order.getExpected_shipping_time());
259
            	time.setTimeInMillis(order.getExpected_shipping_time());
259
            	time.add(Calendar.DAY_OF_MONTH, 3);
260
            	time.add(Calendar.DAY_OF_MONTH, 3);
Line 331... Line 332...
331
                ebayOrder.setEbayListingId(ebayItem.getEbayListingId());
332
                ebayOrder.setEbayListingId(ebayItem.getEbayListingId());
332
                ebayOrder.setSalesRecordNumber(new Double(row.getCell(SALES_RECORD_NUM_INDEX).getNumericCellValue()).longValue());
333
                ebayOrder.setSalesRecordNumber(new Double(row.getCell(SALES_RECORD_NUM_INDEX).getNumericCellValue()).longValue());
333
                row.getCell(TRANSACTION_ID_INDEX).setCellType(Cell.CELL_TYPE_STRING);
334
                row.getCell(TRANSACTION_ID_INDEX).setCellType(Cell.CELL_TYPE_STRING);
334
                ebayOrder.setTransactionId(row.getCell(TRANSACTION_ID_INDEX).getStringCellValue());
335
                ebayOrder.setTransactionId(row.getCell(TRANSACTION_ID_INDEX).getStringCellValue());
335
                try {
336
                try {
336
                	ebayOrder.setEbayTxnDate(row.getCell(TRANSACTION_DATE_INDEX).getDateCellValue().getTime());
337
                	Date ebayTransactionDate = interchangeDateAndMonth(row.getCell(TRANSACTION_DATE_INDEX).getDateCellValue());
-
 
338
                	ebayOrder.setEbayTxnDate(ebayTransactionDate.getTime());
337
                	//ebayOrder.setEbayTxnDate(sdf2.parse(row.getCell(TRANSACTION_DATE_INDEX).getStringCellValue()).getTime());
339
                	//ebayOrder.setEbayTxnDate(sdf2.parse(row.getCell(TRANSACTION_DATE_INDEX).getStringCellValue()).getTime());
338
                	//ebayOrder.setEbayTxnDate(sdf.parse(row.getCell(TRANSACTION_DATE_INDEX).getStringCellValue()).getTime());
340
                	//ebayOrder.setEbayTxnDate(sdf.parse(row.getCell(TRANSACTION_DATE_INDEX).getStringCellValue()).getTime());
339
                } catch (Exception e) {
341
                } catch (Exception e) {
340
                	logger.error("Error in setting transaction date for Ebay Order with OrderId : " + order.getId());
342
                	logger.error("Error in setting transaction date for Ebay Order with OrderId : " + order.getId());
341
                }
343
                }
Line 354... Line 356...
354
        
356
        
355
        checkForErrors();
357
        checkForErrors();
356
        return "authsuccess";
358
        return "authsuccess";
357
    }
359
    }
358
    
360
    
-
 
361
    private Date interchangeDateAndMonth(Date date) {
-
 
362
		Date updatedDate = new Date(date.getTime());
-
 
363
		updatedDate.setDate(date.getMonth());
-
 
364
		updatedDate.setMonth(date.getDate());
-
 
365
		return updatedDate;
-
 
366
	}
-
 
367
    
359
    private LineItem createLineItem(long itemId, long quantity, double amount) throws CatalogServiceException, TException {
368
    private LineItem createLineItem(long itemId, long quantity, double amount) throws CatalogServiceException, TException {
360
    	LineItem lineItem = new LineItem();
369
    	LineItem lineItem = new LineItem();
361
    	CatalogService.Client catalogClient = new CatalogClient().getClient();
370
    	CatalogService.Client catalogClient = new CatalogClient().getClient();
362
    	Item item = catalogClient.getItem(itemId);
371
    	Item item = catalogClient.getItem(itemId);
363
    	
372