diff --git a/src/main/java/com/pos/app/model/response/ResListOrder.java b/src/main/java/com/pos/app/model/response/ResListOrder.java index 2fd1436..df6086a 100644 --- a/src/main/java/com/pos/app/model/response/ResListOrder.java +++ b/src/main/java/com/pos/app/model/response/ResListOrder.java @@ -25,5 +25,7 @@ public class ResListOrder { private BigInteger totalTransaction; private String customerName; private BigInteger totalItems; + private Long createdDate; + private String createdBy; } diff --git a/src/main/java/com/pos/app/service/impl/OrderServiceImpl.java b/src/main/java/com/pos/app/service/impl/OrderServiceImpl.java index 2ad1588..84f42bf 100644 --- a/src/main/java/com/pos/app/service/impl/OrderServiceImpl.java +++ b/src/main/java/com/pos/app/service/impl/OrderServiceImpl.java @@ -142,6 +142,8 @@ public Page getOrderList(Pageable pageable) { .isPayment(order.getIsPayment()) .totalTransaction(totalTransaction) .totalItems(totalItems) + .createdDate(order.getCreatedDate()) + .createdBy(accountService.getCurrentAccount(order.getCreatedBy()).getName()) .build(); }).toList(); try {