FEAT:fixing

rivopelu · Nov 27, 2024 · 3f78080 · 3f78080
1 parent 7a4469f
commit 3f78080
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git 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
@@ -142,6 +142,8 @@ public Page<ResListOrder> getOrderList(Pageable pageable) {
                     .isPayment(order.getIsPayment())
                     .totalTransaction(totalTransaction)
                     .totalItems(totalItems)
+                    .createdDate(order.getCreatedDate())
+                    .createdBy(accountService.getCurrentAccount(order.getCreatedBy()).getName())
                     .build();
         }).toList();
         try {