[#70] 배달 매칭 서비스

src/main/java/com/delfood/controller/RiderController.java

@@ -8,6 +8,7 @@
 import com.delfood.dto.rider.DeliveryRiderDTO;
 import com.delfood.dto.rider.AcceptDeliveryRequestDTO.RequestResult;
 import com.delfood.dto.rider.DeliveryInfoDTO;
+import com.delfood.dto.rider.DeliveryOrderInfo;
 import com.delfood.dto.rider.RiderDTO;
 import com.delfood.error.exception.DuplicateException;
 import com.delfood.error.exception.TargetNotFoundException;
@@ -17,9 +18,11 @@
 import com.delfood.utils.SessionUtil;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Objects;
 import javax.servlet.http.HttpSession;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.extern.log4j.Log4j2;
@@ -241,6 +244,22 @@ public DeliveryInfoDTO getCurrentDelivery(HttpSession session) {
     return currentDelivery;
   }
 
+  /**
+   * 오늘 배달한 배달료를 조회한다.
+   * @param session 현제 세션
+   * @return
+   */
+  @GetMapping("delivery/bills/today")
+  @LoginCheck(type = UserType.RIDER)
+  public TodayDeliveryBillsResponse getTodayDeliveyBills(HttpSession session) {
+    String riderId = SessionUtil.getLoginRiderId(session);
+    List<DeliveryOrderInfo> todayDeliveryBills = deliveryService.getTodayDeliveryBills(riderId);
+    return TodayDeliveryBillsResponse.builder()
+        .deliveries(todayDeliveryBills)
+        .riderId(riderId)
+        .build();
+  }
+
   // Request
   @Getter
   private static class SignInRequest {
@@ -280,5 +299,24 @@ private static class DeliveryCompleteRequest {
     private Long orderId;
   }
 
+  @Getter
+  private static class TodayDeliveryBillsResponse {
+    private List<DeliveryOrderInfo> deliveries;
+    private long totalCost;
+    private String riderId;
+
+    @Builder
+    public TodayDeliveryBillsResponse(@NonNull List<DeliveryOrderInfo> deliveries,
+        @NonNull String riderId) {
+      this.deliveries = deliveries;
+      this.riderId = riderId;
+      initCost();
+    }
+
+    private void initCost() {
+      this.totalCost = deliveries.stream().mapToLong(e -> e.getDeliveryCost()).sum();
+    }
+  }
+
 
 }

src/main/java/com/delfood/dto/rider/DeliveryOrderInfo.java

@@ -1,7 +1,9 @@
 package com.delfood.dto.rider;
 
 import com.delfood.dto.OrderDTO.OrderStatus;
+import lombok.Getter;
 
+@Getter
 public class DeliveryOrderInfo {
   private Long orderId;
   private Long deliveryCost;

src/main/java/com/delfood/mapper/DeliveryMapper.java

@@ -1,13 +1,17 @@
 package com.delfood.mapper;
 
+import java.time.LocalDate;
 import java.util.List;
 import org.springframework.stereotype.Repository;
 import com.delfood.dto.rider.DeliveryInfoDTO;
+import com.delfood.dto.rider.DeliveryOrderInfo;
 
 @Repository
 public interface DeliveryMapper {
 
   List<DeliveryInfoDTO> findByRiderId(String riderId, Long lastViewedOrderId);
 
   DeliveryInfoDTO findCurrentDeliveryByRiderId(String riderId);
+
+  List<DeliveryOrderInfo> findTodayBillsByRiderId(String riderId, LocalDate today);
 }

src/main/java/com/delfood/service/delivery/DeliveryService.java

@@ -6,12 +6,14 @@
 import com.delfood.dto.push.PushMessage;
 import com.delfood.dto.rider.AcceptDeliveryRequestDTO;
 import com.delfood.dto.rider.DeliveryInfoDTO;
+import com.delfood.dto.rider.DeliveryOrderInfo;
 import com.delfood.dto.rider.DeliveryRiderDTO;
 import com.delfood.mapper.DeliveryMapper;
 import com.delfood.mapper.RiderInfoMapper;
 import com.delfood.service.OrderService;
 import com.delfood.service.PushService;
 import lombok.NonNull;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 import javax.annotation.Nullable;
@@ -144,4 +146,9 @@ public DeliveryInfoDTO getCurrentDelivery(String riderId) {
     return deliveryMapper.findCurrentDeliveryByRiderId(riderId);
   }
 
+  public List<DeliveryOrderInfo> getTodayDeliveryBills(String riderId) {
+    LocalDate today = LocalDate.now();
+    return deliveryMapper.findTodayBillsByRiderId(riderId, today);
+  }
+
 }

src/main/resources/mybatis/mapper/delivery.xml

@@ -73,4 +73,11 @@
       AND     odr.status = 'IN_DELIVERY'
       ORDER BY odr.id DESC
     </select>
+
+    <select id="findTodayBillsByRiderId" resultType="com.delfood.dto.rider.DeliveryOrderInfo">
+      SELECT odr.id orderId, odr.delivery_cost deliveryCost, odr.order_status orderStatus
+      FROM   ORDER odr INNER JOIN PAYMENT pay ON (odr.id = pay.order_id)
+      WHERE  odr.rider_id = #{riderId}
+      AND    start_time >= #{today}
+    </select>
 </mapper>