| Line 509... |
Line 509... |
| 509 |
return responseSender.ok(fofoStoreRepository.selectByRetailerId(fofoId).getCode());
|
509 |
return responseSender.ok(fofoStoreRepository.selectByRetailerId(fofoId).getCode());
|
| 510 |
}
|
510 |
}
|
| 511 |
|
511 |
|
| 512 |
@RequestMapping(value = "/store/order", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
|
512 |
@RequestMapping(value = "/store/order", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
|
| 513 |
public ResponseEntity<?> getOrderDetail(HttpServletRequest request, @RequestParam(value = "id") int id,
|
513 |
public ResponseEntity<?> getOrderDetail(HttpServletRequest request, @RequestParam(value = "id") int id,
|
| 514 |
@RequestParam(name = "offset") int offset, @RequestParam(name = "limit") int limit)
|
514 |
@RequestParam(name = "offset") int offset, @RequestParam(name = "limit") int limit) throws Exception {
|
| 515 |
throws ProfitMandiBusinessException {
|
- |
|
| 516 |
List<CustomerOrderDetail> customerOrderDetails = new ArrayList<>();
|
515 |
List<CustomerOrderDetail> customerOrderDetails = new ArrayList<>();
|
| 517 |
|
- |
|
| - |
|
516 |
List<Integer> catalogIds = new ArrayList<>();
|
| 518 |
List<PendingOrder> pendingOrders = pendingOrderRepository.selectByCustomerId(id, offset, limit);
|
517 |
List<PendingOrder> pendingOrders = pendingOrderRepository.selectByCustomerId(id, offset, limit);
|
| 519 |
if (!pendingOrders.isEmpty()) {
|
518 |
if (!pendingOrders.isEmpty()) {
|
| 520 |
for (PendingOrder po : pendingOrders) {
|
519 |
for (PendingOrder po : pendingOrders) {
|
| 521 |
List<PendingOrderItem> pois = pendingOrderItemRepository.selectByOrderId(po.getId());
|
520 |
List<PendingOrderItem> pois = pendingOrderItemRepository.selectByOrderId(po.getId());
|
| - |
|
521 |
for (PendingOrderItem pendingOrderItem : pois) {
|
| - |
|
522 |
Item item = itemRepository.selectById(pendingOrderItem.getItemId());
|
| - |
|
523 |
pendingOrderItem.setItemName(item.getItemDescription());
|
| - |
|
524 |
catalogIds.add(item.getCatalogItemId());
|
| - |
|
525 |
}
|
| - |
|
526 |
|
| - |
|
527 |
Map<Integer, JSONObject> contentMap = commonSolrService.getContentByCatalogIds(catalogIds);
|
| - |
|
528 |
|
| 522 |
for (PendingOrderItem poi : pois) {
|
529 |
for (PendingOrderItem poi : pois) {
|
| 523 |
|
530 |
|
| 524 |
CustomerOrderDetail customerOrderDetail = new CustomerOrderDetail();
|
531 |
CustomerOrderDetail customerOrderDetail = new CustomerOrderDetail();
|
| 525 |
|
532 |
|
| 526 |
Item item = itemRepository.selectById(poi.getItemId());
|
533 |
Item item = itemRepository.selectById(poi.getItemId());
|
| - |
|
534 |
JSONObject jsonObj = contentMap.get(item.getCatalogItemId());
|
| - |
|
535 |
customerOrderDetail.setImageUrl(jsonObj.getString("imageUrl_s"));
|
| 527 |
customerOrderDetail.setBrand(item.getBrand());
|
536 |
customerOrderDetail.setBrand(item.getBrand());
|
| 528 |
customerOrderDetail.setColor(item.getColor());
|
537 |
customerOrderDetail.setColor(item.getColor());
|
| 529 |
customerOrderDetail.setId(poi.getOrderId());
|
538 |
customerOrderDetail.setId(poi.getOrderId());
|
| 530 |
customerOrderDetail.setItemId(poi.getItemId());
|
539 |
customerOrderDetail.setItemId(poi.getItemId());
|
| 531 |
customerOrderDetail.setModelName(item.getModelName());
|
540 |
customerOrderDetail.setModelName(item.getModelName());
|