Subversion Repositories SmartDukaan

Rev

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

Rev 9277 Rev 9285
Line 441... Line 441...
441
			}
441
			}
442
			else{
442
			else{
443
				try {
443
				try {
444
					Date shipDate = new Date();
444
					Date shipDate = new Date();
445
					shipDate.setTime( flipkartTxnDate.getTime() + sla*24*60*60*1000);
445
					shipDate.setTime( flipkartTxnDate.getTime() + sla*24*60*60*1000);
446
					Calendar time = Calendar.getInstance();
446
					Calendar calendar = Calendar.getInstance();
-
 
447
					calendar.setTime(shipDate);
-
 
448
					if(calendar.get(Calendar.DAY_OF_WEEK)!=1){
447
					t_order.setPromised_shipping_time(shipDate.getTime());
449
						t_order.setPromised_shipping_time(shipDate.getTime());
448
					t_order.setExpected_shipping_time(shipDate.getTime());
450
						t_order.setExpected_shipping_time(shipDate.getTime());
-
 
451
					}
-
 
452
					else{
-
 
453
						t_order.setPromised_shipping_time(shipDate.getTime()+24*60*60*1000);
-
 
454
						t_order.setExpected_shipping_time(shipDate.getTime()+24*60*60*1000);
-
 
455
					}
-
 
456
					calendar = Calendar.getInstance();
449
					time.add(Calendar.DAY_OF_MONTH, 4);
457
					calendar.add(Calendar.DAY_OF_MONTH, 4);
450
					t_order.setPromised_delivery_time(time.getTimeInMillis());
458
					t_order.setPromised_delivery_time(calendar.getTimeInMillis());
451
					t_order.setExpected_delivery_time(time.getTimeInMillis());
459
					t_order.setExpected_delivery_time(calendar.getTimeInMillis());
452
				} catch(Exception e) {	
460
				} catch(Exception e) {	
453
					logger.error("Error in updating Shipping or Delivery Time for suborderid  " + subOrderId);
461
					logger.error("Error in updating Shipping or Delivery Time for suborderid  " + subOrderId);
454
					sb.append(orderId + " "+ subOrderId  + " Could not update delivery time" + " " + "\n");
462
					sb.append(orderId + " "+ subOrderId  + " Could not update delivery time" + " " + "\n");
455
					exit = true;
463
					exit = true;
456
					continue;
464
					continue;