[#45] 주문기능 제작

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

@@ -48,7 +48,7 @@ public long getItemsBill(HttpSession session, @RequestBody List<OrderItemDTO> it
    * @param orderId 주문번호
    * @return
    */
-  @GetMapping("orderBill/{orderId}")
+  @GetMapping("{orderId}/bill")
   @MemberLoginCheck
   public OrderBillDTO orderInfo(@PathVariable("orderId") Long orderId) {
     return orderService.getPreOrderBill(orderId);

src/main/java/com/delfood/dto/address/Position.java

@@ -0,0 +1,29 @@
+package com.delfood.dto.address;
+
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor
+public class Position {
+  private double xPos;
+  private double yPos;
+
+  @Builder
+  public Position(double xPos, double yPos) {
+    this.xPos = xPos;
+    this.yPos = yPos;
+  }
+
+  /**
+   * 대상 위치와의 거리를 계산한다.
+   * @author jun
+   * @param position 거리를 계산할 위치
+   * @return
+   */
+  public double distanceMeter(Position position) {
+    return Math.sqrt(
+        Math.pow(this.xPos - position.getXPos(), 2) + Math.pow(this.yPos - position.getYPos(), 2));
+  }
+}

src/main/java/com/delfood/error/ErrorController.java

@@ -71,10 +71,5 @@ public ErrorMsg handleIllegalArgumentException(IllegalArgumentException e) {
   public ErrorMsg handleCannotShopException(RuntimeException e) {
     return new ErrorMsg(e.getLocalizedMessage(), getSimpleName(e));
   }
-
-  @ResponseStatus(HttpStatus.BAD_REQUEST)
-  @ExceptionHandler(TotalPriceMismatchException.class)
-  public ErrorMsg handleTotalPriceMismatchException(TotalPriceMismatchException e) {
-    return new ErrorMsg(e.getLocalizedMessage(), getSimpleName(e));
-  }
+
 }

src/main/java/com/delfood/error/exception/order/TotalPriceMismatchException.java

@@ -1,6 +1,6 @@
 package com.delfood.error.exception.order;
 
-public class TotalPriceMismatchException extends RuntimeException{
+public class TotalPriceMismatchException extends IllegalArgumentException {
   public TotalPriceMismatchException(String msg) {
     super(msg);
   }

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

@@ -3,6 +3,7 @@
 import com.delfood.controller.reqeust.GetAddressByZipRequest;
 import com.delfood.controller.reqeust.GetAddressesByRoadRequest;
 import com.delfood.dto.AddressDTO;
+import com.delfood.dto.address.Position;
 import java.util.List;
 import org.springframework.stereotype.Repository;
 
@@ -14,7 +15,9 @@ public interface AddressMapper {
 
   public List<AddressDTO> findByRoadName(GetAddressesByRoadRequest searchInfo);
 
-  public double findDistanceMeterByAddressCode(String startAddressCode, String endAddressCode);
+  public Position findPositionByMemberId(String memberId);
 
-  public double findDistancemeterByMemberIdAndShopId(String memberId, Long shopId);
+  public Position findPositionByShopId(Long shopId);
+
+  public Position findPositionByAddressCode(String addressCode);
 }

src/main/java/com/delfood/service/AddressService.java

@@ -3,6 +3,7 @@
 import com.delfood.controller.reqeust.GetAddressByZipRequest;
 import com.delfood.controller.reqeust.GetAddressesByRoadRequest;
 import com.delfood.dto.AddressDTO;
+import com.delfood.dto.address.Position;
 import com.delfood.mapper.AddressMapper;
 import lombok.extern.log4j.Log4j2;
 import java.util.List;
@@ -35,8 +36,17 @@ public List<AddressDTO> getAddressByRoadName(GetAddressesByRoadRequest searchInf
     return addressMapper.findByRoadName(searchInfo);
   }
 
+  /**
+   * 주소코드를 이용하여 거리를 계산한다.
+   * @param startAddressCode 시작 주소코드
+   * @param endAddressCode 도착 주소코드
+   * @return
+   */
   public double getDistanceMeter(String startAddressCode, String endAddressCode) {
-    return addressMapper.findDistanceMeterByAddressCode(startAddressCode, endAddressCode);
+    Position startPosition = addressMapper.findPositionByAddressCode(startAddressCode);
+    Position endPosition = addressMapper.findPositionByAddressCode(endAddressCode);
+
+    return startPosition.distanceMeter(endPosition);
   }
 
   /**
@@ -58,8 +68,16 @@ public long deliveryPrice(double distanceMeter) {
     return deliveryCost + extraCharge;
   }
 
+  /**
+   * 회원과 매장의 아이디를 기준으로 배달료를 계산한다.
+   * @param memberId 회원 id
+   * @param shopId 매장 id
+   * @return
+   */
   public long deliveryPrice(String memberId, Long shopId) {
-    double distanceMeter = addressMapper.findDistancemeterByMemberIdAndShopId(memberId, shopId);
+    Position memberPosition = addressMapper.findPositionByMemberId(memberId);
+    Position shopPosition = addressMapper.findPositionByShopId(shopId);    
+    double distanceMeter = memberPosition.distanceMeter(shopPosition);
     return deliveryPrice(distanceMeter);
   }
 }

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

@@ -74,24 +74,26 @@
         ORDER BY building_management_number
         LIMIT   10
     </select>
-
-    <select id="findDistanceMeterByAddressCode" resultType="double">
-        SELECT SQRT(POW(a.building_center_point_x_coordinate - b.building_center_point_x_coordinate, 2) 
-                  + POW(a.building_center_point_y_coordinate - b.building_center_point_y_coordinate, 2)) as distanceKilometer
-        FROM   ADDRESS a, ADDRESS b
-        WHERE  a.building_management_number = #{startAddressCode}
-        AND    b.building_management_number = #{endAddressCode}
+
+    <select id="findPositionByMemberId" resultType="com.delfood.dto.address.Position">
+        SELECT building_center_point_x_coordinate xPos, building_center_point_y_coordinate yPos
+        FROM   ADDRESS
+        WHERE  building_management_number = (SELECT MEMBER.address_code
+                                             FROM   MEMBER
+                                             WHERE  MEMBER.id = #{memberId})
+    </select>
+
+    <select id="findPositionByShopId" resultType="com.delfood.dto.address.Position">
+        SELECT building_center_point_x_coordinate xPos, building_center_point_y_coordinate yPos
+        FROM   ADDRESS
+        WHERE  building_management_number = (SELECT SHOP.address_code
+                                             FROM   SHOP
+                                             WHERE  SHOP.id = #{shopId})
     </select>
 
-    <select id="findDistancemeterByMemberIdAndShopId" resultType="double">
-        SELECT SQRT(POW(a.building_center_point_x_coordinate - b.building_center_point_x_coordinate, 2) 
-                  + POW(a.building_center_point_y_coordinate - b.building_center_point_y_coordinate, 2)) as distanceKilometer
-        FROM   ADDRESS a, ADDRESS b
-        WHERE  a.building_management_number = (SELECT m.address_code
-                                               FROM   MEMBER m
-                                               WHERE  m.id = #{memberId})
-        AND    b.building_management_number = (SELECT s.address_code
-                                                FROM   SHOP s
-                                                WHERE  s.id = #{shopId})
+    <select id="findPositionByAddressCode" resultType="com.delfood.dto.address.Position">
+        SELECT building_center_point_x_coordinate xPos, building_center_point_y_coordinate yPos
+        FROM   ADDRESS
+        WHERE  building_management_number = #{addressCode} 
     </select>
 </mapper>

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

@@ -126,6 +126,7 @@
                shop.id shopId,
                shop.name shopName,
                item.id itemId,
+               menu.id menuId,
                menu.name menuName,
                menu.price menuPrice,
                item.count itemCount,
@@ -221,7 +222,7 @@
         <collection property="options" ofType="com.delfood.dto.ItemsBillDTO$MenuInfo$OptionInfo">
             <id property="id" column="optionId"/>
             <result property="name" column="optionName"/>
-            <result property="price" column="opti`onPrice"/>
+            <result property="price" column="optionPrice"/>
         </collection>
     </resultMap>