diff --git a/backend/src/main/java/com/petshop/backend/controller/AuthController.java b/backend/src/main/java/com/petshop/backend/controller/AuthController.java index 4e9939c8..693d0171 100644 --- a/backend/src/main/java/com/petshop/backend/controller/AuthController.java +++ b/backend/src/main/java/com/petshop/backend/controller/AuthController.java @@ -267,7 +267,8 @@ public class AuthController { user.getRole().name(), customerId, primaryStore != null ? primaryStore.getStoreId() : null, - primaryStore != null ? primaryStore.getStoreName() : null + primaryStore != null ? primaryStore.getStoreName() : null, + user.getLoyaltyPoints() ); } diff --git a/backend/src/main/java/com/petshop/backend/dto/auth/UserInfoResponse.java b/backend/src/main/java/com/petshop/backend/dto/auth/UserInfoResponse.java index e88c272d..74dbc039 100644 --- a/backend/src/main/java/com/petshop/backend/dto/auth/UserInfoResponse.java +++ b/backend/src/main/java/com/petshop/backend/dto/auth/UserInfoResponse.java @@ -15,11 +15,12 @@ public class UserInfoResponse { private Long customerId; private Long storeId; private String storeName; + private Integer loyaltyPoints; public UserInfoResponse() { } - public UserInfoResponse(Long id, String username, String firstName, String lastName, String email, String fullName, String phone, String avatarUrl, String role, Long customerId, Long storeId, String storeName) { + public UserInfoResponse(Long id, String username, String firstName, String lastName, String email, String fullName, String phone, String avatarUrl, String role, Long customerId, Long storeId, String storeName, Integer loyaltyPoints) { this.id = id; this.username = username; this.firstName = firstName; @@ -32,6 +33,7 @@ public class UserInfoResponse { this.customerId = customerId; this.storeId = storeId; this.storeName = storeName; + this.loyaltyPoints = loyaltyPoints; } public Long getId() { @@ -131,6 +133,14 @@ public class UserInfoResponse { this.storeName = storeName; } + public Integer getLoyaltyPoints() { + return loyaltyPoints; + } + + public void setLoyaltyPoints(Integer loyaltyPoints) { + this.loyaltyPoints = loyaltyPoints; + } + @Override public boolean equals(Object o) { if (this == o) return true; diff --git a/web/app/cart/page.js b/web/app/cart/page.js index f2eb897b..f13d2901 100644 --- a/web/app/cart/page.js +++ b/web/app/cart/page.js @@ -74,7 +74,7 @@ function PaymentForm({ clientSecret, totalAmount, onSuccess, onCancel }) { } export default function CartPage() { - const { user, loading: authLoading } = useAuth(); + const { user, loading: authLoading, refreshUser } = useAuth(); const { cart, cartLoading, @@ -373,6 +373,12 @@ export default function CartPage() { )} + {user?.role === "CUSTOMER" && ( +