1010import com .sookmyung .concon .Order .exception .OrderInProgressException ;
1111import com .sookmyung .concon .Order .repository .OrderRepository ;
1212import com .sookmyung .concon .Order .repository .OrderRequestRedisRepository ;
13+ import com .sookmyung .concon .Photo .service .PhotoFacade ;
1314import com .sookmyung .concon .Photo .service .PhotoService ;
1415import com .sookmyung .concon .User .Entity .User ;
1516import com .sookmyung .concon .User .Jwt .JwtUtil ;
@@ -43,6 +44,7 @@ public class TransactionService {
4344 private final UserFacade userFacade ;
4445 private final CouponFacade couponFacade ;
4546 private final OrderFacade orderFacade ;
47+ private final PhotoFacade photoFacade ;
4648
4749
4850 // order 아이디로 거래 찾기
@@ -108,7 +110,7 @@ private OrderDetailResponseDto toOrderDetailDto(Orders order) {
108110
109111 // 거래 요청 시 바로 거래 중으로 변경
110112 @ Transactional
111- public OrderDetailResponseDto requestOrder (Long orderId , String token ) {
113+ public OrderRequestResponseDto requestOrder (Long orderId , String token ) {
112114 Orders orders = findOrdersById (orderId );
113115 User buyer = userFacade .findUserByToken (token );
114116 if (orders .getStatus () != OrderStatus .AVAILABLE ) {
@@ -122,12 +124,14 @@ public OrderDetailResponseDto requestOrder(Long orderId, String token) {
122124 Long sellerId = orders .getSeller ().getId ();
123125 OrderEventAlarmDto response = OrderEventAlarmDto .toDto (orders , buyer );
124126 eventPublisher .publishEvent (sellerId , ORDER_REQUESTED , response );
125- return toOrderDetailDto (orders );
127+
128+ String userQRPhotoUrl = photoFacade .getUserQRPhotoUrl (orders .getBuyer ());
129+ return OrderRequestResponseDto .toDto (orders , buyer , userQRPhotoUrl );
126130 }
127131
128132 // 거래 중 취소
129133 @ Transactional
130- public OrderDetailResponseDto cancelTransaction (Long orderId ) {
134+ public void cancelTransaction (Long orderId ) {
131135 Orders order = findOrdersById (orderId );
132136 User buyer = order .getBuyer ();
133137 order .setBuyer (null );
@@ -137,8 +141,6 @@ public OrderDetailResponseDto cancelTransaction(Long orderId) {
137141 List <Long > userIds = List .of (order .getSeller ().getId (), buyer .getId ());
138142 OrderEventAlarmDto response = OrderEventAlarmDto .toDto (order , buyer );
139143 eventPublisher .publishEventToMultipleUsers (userIds , ORDER_CANCELED , response );
140-
141- return toOrderDetailDto (order );
142144 }
143145
144146 // 거래 완료
0 commit comments