Subversion Repositories SmartDukaan

Rev

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

Rev 9279 Rev 9286
Line 413... Line 413...
413
				t_order.setOrderType(OrderType.B2C);
413
				t_order.setOrderType(OrderType.B2C);
414
				t_order.setCod(false);
414
				t_order.setCod(false);
415
				try {
415
				try {
416
					Date shipDate = new Date();
416
					Date shipDate = new Date();
417
					shipDate.setTime( flipkartTxnDate.getTime() + sla*24*60*60*1000);
417
					shipDate.setTime( flipkartTxnDate.getTime() + sla*24*60*60*1000);
418
					Calendar time = Calendar.getInstance();
418
					Calendar calendar = Calendar.getInstance();
-
 
419
					calendar.setTime(shipDate);
-
 
420
					if(calendar.get(Calendar.DAY_OF_WEEK)!=1){
419
					t_order.setPromised_shipping_time(shipDate.getTime());
421
						t_order.setPromised_shipping_time(shipDate.getTime());
420
					t_order.setExpected_shipping_time(shipDate.getTime());
422
						t_order.setExpected_shipping_time(shipDate.getTime());
-
 
423
					}
-
 
424
					else{
-
 
425
						t_order.setPromised_shipping_time(shipDate.getTime()+24*60*60*1000);
-
 
426
						t_order.setExpected_shipping_time(shipDate.getTime()+24*60*60*1000);
-
 
427
					}
-
 
428
					calendar = Calendar.getInstance();
421
					time.add(Calendar.DAY_OF_MONTH, 4);
429
					calendar.add(Calendar.DAY_OF_MONTH, 4);
422
					t_order.setPromised_delivery_time(time.getTimeInMillis());
430
					t_order.setPromised_delivery_time(calendar.getTimeInMillis());
423
					t_order.setExpected_delivery_time(time.getTimeInMillis());
431
					t_order.setExpected_delivery_time(calendar.getTimeInMillis());
424
				} catch(Exception e) {	
432
				} catch(Exception e) {	
425
					logger.error("Error in updating Shipping or Delivery Time for suborderid  " + subOrderId);
433
					logger.error("Error in updating Shipping or Delivery Time for suborderid  " + subOrderId);
426
					sb.append(orderId + " "+ subOrderId  + " Could not update delivery time" + " " + "\n");
434
					sb.append(orderId + " "+ subOrderId  + " Could not update delivery time" + " " + "\n");
427
					exit = true;
435
					exit = true;
428
					continue;
436
					continue;