Skip to content

Commit 92846db

Browse files
committed
✨ feat: 장바구니 조회 시 team Price도 리턴하게 추가
1 parent 99a384a commit 92846db

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

src/main/java/com/jajaja/domain/cart/dto/CartProductResponseDto.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@ public record CartProductResponseDto(
1515
String optionName,
1616
int quantity,
1717
String productThumbnail,
18-
int unitPrice,
18+
int individualPrice,
19+
int teamPrice,
1920
int totalPrice,
2021
boolean teamAvailable
2122
) {
22-
public static CartProductResponseDto of(CartProduct cartProduct, boolean isTeamAvailable) {
23+
public static CartProductResponseDto of(CartProduct cartProduct, int teamPrice, boolean isTeamAvailable) {
2324
Product product = cartProduct.getProduct();
2425
ProductOption option = cartProduct.getProductOption();
2526

@@ -36,7 +37,8 @@ public static CartProductResponseDto of(CartProduct cartProduct, boolean isTeamA
3637
.optionName(optionName)
3738
.quantity(cartProduct.getQuantity())
3839
.productThumbnail(product.getThumbnailUrl())
39-
.unitPrice(price)
40+
.individualPrice(price)
41+
.teamPrice(teamPrice)
4042
.totalPrice(cartProduct.getUnitPrice() * cartProduct.getQuantity())
4143
.teamAvailable(isTeamAvailable)
4244
.build();

src/main/java/com/jajaja/domain/cart/service/CartQueryServiceImpl.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.jajaja.domain.cart.dto.CartProductResponseDto;
55
import com.jajaja.domain.cart.dto.CartResponseDto;
66
import com.jajaja.domain.cart.entity.Cart;
7+
import com.jajaja.domain.product.service.ProductCommonService;
78
import com.jajaja.global.common.dto.PriceInfoDto;
89
import com.jajaja.domain.coupon.service.CouponCommonService;
910
import com.jajaja.domain.team.entity.enums.TeamStatus;
@@ -25,6 +26,7 @@ public class CartQueryServiceImpl implements CartQueryService {
2526
private final CartCommonService cartCommonService;
2627
private final TeamCommandRepository teamRepository;
2728
private final CouponCommonService couponCommonService;
29+
private final ProductCommonService productCommonService;
2830

2931
@Override
3032
public CartResponseDto getCart(Long memberId) {
@@ -43,7 +45,7 @@ public CartResponseDto getCart(Long memberId) {
4345
List<CartProductResponseDto> itemInfos = cart.getCartProducts().stream()
4446
.map( cartProduct -> {
4547
boolean isTeamAvailable = teamRepository.existsByProductIdAndStatus(cartProduct.getProduct().getId(), TeamStatus.MATCHING);
46-
return CartProductResponseDto.of(cartProduct, isTeamAvailable);
48+
return CartProductResponseDto.of(cartProduct, productCommonService.calculateDiscountedPrice(cartProduct.getUnitPrice(), cartProduct.getProduct().getDiscountRate()), isTeamAvailable);
4749
})
4850
.collect(Collectors.toList());
4951

0 commit comments

Comments
 (0)