Subversion Repositories SmartDukaan

Rev

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

Rev 29418 Rev 29419
Line 2... Line 2...
2 
 
 2 
 
3 
import java.time.LocalDate;
 3 
import java.time.LocalDate;
4 
import java.time.LocalDateTime;
 4 
import java.time.LocalDateTime;
5 
import java.time.temporal.ChronoUnit;
 5 
import java.time.temporal.ChronoUnit;
6 
import java.util.ArrayList;
 6 
import java.util.ArrayList;
- 
 
 7 
import java.util.Arrays;
7 
import java.util.List;
 8 
import java.util.List;
8 
 
 9 
 
9 
import javax.servlet.http.HttpServletRequest;
 10 
import javax.servlet.http.HttpServletRequest;
10 
import javax.servlet.http.HttpServletResponse;
 11 
import javax.servlet.http.HttpServletResponse;
11 
 
 12 
 
Line 132... Line 133...
132 
 
 133 
 
133 
	@RequestMapping(value = "/order/detail", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 134 
	@RequestMapping(value = "/order/detail", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
134 
	@ApiImplicitParams({
 135 
	@ApiImplicitParams({
135 
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
 136 
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
136 
	public ResponseEntity<?> getOrderDetails(HttpServletRequest request, HttpServletResponse response,
 137 
	public ResponseEntity<?> getOrderDetails(HttpServletRequest request, HttpServletResponse response,
137 
			@RequestParam String airwayBillNo) throws Throwable {
 138 
			@RequestParam String airwayBillNo, @RequestParam int orderId) throws Throwable {
- 
 
 139 
 
- 
 
 140 
		LOGGER.info("airwayBillNo" + airwayBillNo);
- 
 
 141 
		List<Order> orders = null;
- 
 
 142 
		if (!airwayBillNo.equals("NaN")) {
138 
		List<Order> orders = orderRepository.selectByAirwayBillNumber(airwayBillNo);
 143 
			orders = orderRepository.selectByAirwayBillNumber(airwayBillNo);
- 
 
 144 
		} else {
- 
 
 145 
			orders = orderRepository.selectByOrderIds(Arrays.asList(orderId));
- 
 
 146 
		}
139 
		List<CustomOrder> customOrders = new ArrayList<CustomOrder>();
 147 
		List<CustomOrder> customOrders = new ArrayList<CustomOrder>();
140 
 
 148 
 
141 
		for (Order order : orders) {
 149 
		for (Order order : orders) {
142 
			CustomOrder co = null;
 150 
			CustomOrder co = null;
143 
 
 151