| Line 808... |
Line 808... |
| 808 |
}
|
808 |
}
|
| 809 |
|
809 |
|
| 810 |
@RequestMapping(value = "/cancelPendingOrderItem", method = RequestMethod.POST)
|
810 |
@RequestMapping(value = "/cancelPendingOrderItem", method = RequestMethod.POST)
|
| 811 |
public ResponseEntity<?> cancelPendingOrderItem(HttpServletRequest request, @RequestParam int id,
|
811 |
public ResponseEntity<?> cancelPendingOrderItem(HttpServletRequest request, @RequestParam int id,
|
| 812 |
|
812 |
|
| 813 |
@RequestParam String statusDescription) throws Exception {
|
813 |
@RequestParam String statusDescription, @RequestParam String reason) throws Exception {
|
| 814 |
|
814 |
|
| 815 |
PendingOrderItem pendingOrderItem = pendingOrderItemRepository.selectById(id);
|
815 |
PendingOrderItem pendingOrderItem = pendingOrderItemRepository.selectById(id);
|
| 816 |
PendingOrder pendingOrder = pendingOrderRepository.selectById(pendingOrderItem.getOrderId());
|
816 |
PendingOrder pendingOrder = pendingOrderRepository.selectById(pendingOrderItem.getOrderId());
|
| 817 |
Customer customer = customerRepository.selectById(pendingOrder.getCustomerId());
|
817 |
Customer customer = customerRepository.selectById(pendingOrder.getCustomerId());
|
| 818 |
if (pendingOrderItem.getBilledTimestamp() == null) {
|
818 |
if (pendingOrderItem.getBilledTimestamp() == null) {
|
| 819 |
pendingOrderItem.setStatus(OrderStatus.CANCELLED);
|
819 |
pendingOrderItem.setStatus(OrderStatus.CANCELLED);
|
| - |
|
820 |
pendingOrderItem.setRemark(reason);
|
| 820 |
pendingOrderItem.setStatusDescription(statusDescription);
|
821 |
pendingOrderItem.setStatusDescription("cancel by self");
|
| 821 |
pendingOrderItem.setCancelledTimestamp(LocalDateTime.now());
|
822 |
pendingOrderItem.setCancelledTimestamp(LocalDateTime.now());
|
| 822 |
List<OrderStatus> status = pendingOrderItemRepository.selectByOrderId(pendingOrderItem.getOrderId())
|
823 |
List<OrderStatus> status = pendingOrderItemRepository.selectByOrderId(pendingOrderItem.getOrderId())
|
| 823 |
.stream().map(x -> x.getStatus()).collect(Collectors.toList());
|
824 |
.stream().map(x -> x.getStatus()).collect(Collectors.toList());
|
| 824 |
|
825 |
|
| 825 |
if (!status.contains(OrderStatus.PENDING) && !status.contains(OrderStatus.PROCESSING)
|
826 |
if (!status.contains(OrderStatus.PENDING) && !status.contains(OrderStatus.PROCESSING)
|