Subversion Repositories SmartDukaan

Rev

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

Rev 22040 Rev 22411
Line 373... Line 373...
373
			rrp.setRechargeStatus("");
373
			rrp.setRechargeStatus("");
374
			final ProfitMandiResponse<?> profitMandiResponse=new ProfitMandiResponse<>(LocalDateTime.now(), request.getRequestURL().toString() , HttpStatus.INTERNAL_SERVER_ERROR.toString(), HttpStatus.INTERNAL_SERVER_ERROR, ResponseStatus.SUCCESS, new RechargeResultPojo());
374
			final ProfitMandiResponse<?> profitMandiResponse=new ProfitMandiResponse<>(LocalDateTime.now(), request.getRequestURL().toString() , HttpStatus.INTERNAL_SERVER_ERROR.toString(), HttpStatus.INTERNAL_SERVER_ERROR, ResponseStatus.SUCCESS, new RechargeResultPojo());
375
			return new ResponseEntity<>(profitMandiResponse,HttpStatus.INTERNAL_SERVER_ERROR);	
375
			return new ResponseEntity<>(profitMandiResponse,HttpStatus.INTERNAL_SERVER_ERROR);	
376
		}
376
		}
377
		rrp = new RechargeResultPojo();
377
		rrp = new RechargeResultPojo();
378
		rrp.setRechargeStatus(t_rechargeOrder.getStatus().name());
378
		String[] os = Utils.getOrderStatus(t_rechargeOrder.getStatus());
-
 
379
		rrp.setIsError(Boolean.parseBoolean(os[0]));
-
 
380
		rrp.setRechargeStatus(os[1]);
-
 
381
		rrp.setDetailDisplayMessage(os[2]);
379
		final ProfitMandiResponse<?> profitMandiResponse=new ProfitMandiResponse<>(LocalDateTime.now(), request.getRequestURL().toString() , HttpStatus.OK.toString(), HttpStatus.OK, ResponseStatus.SUCCESS, rrp);
382
		final ProfitMandiResponse<?> profitMandiResponse=new ProfitMandiResponse<>(LocalDateTime.now(), request.getRequestURL().toString() , HttpStatus.OK.toString(), HttpStatus.OK, ResponseStatus.SUCCESS, rrp);
380
		return new ResponseEntity<>(profitMandiResponse,HttpStatus.OK);
383
		return new ResponseEntity<>(profitMandiResponse,HttpStatus.OK);
381
	}
384
	}
382
	
385
	
383
	@RequestMapping(value = ProfitMandiConstants.URL_MY_RECHARGES , method=RequestMethod.GET,produces = MediaType.APPLICATION_JSON_VALUE)
386
	@RequestMapping(value = ProfitMandiConstants.URL_MY_RECHARGES , method=RequestMethod.GET,produces = MediaType.APPLICATION_JSON_VALUE)