diff --git a/src/main/java/com/codepatissier/keki/common/BaseResponseStatus.java b/src/main/java/com/codepatissier/keki/common/BaseResponseStatus.java
index c865cde..7151496 100644
--- a/src/main/java/com/codepatissier/keki/common/BaseResponseStatus.java
+++ b/src/main/java/com/codepatissier/keki/common/BaseResponseStatus.java
@@ -53,6 +53,10 @@ public enum BaseResponseStatus {
     INVALID_DESERT_PRICE(false, 3303, "디저트 가격은 0원 이상이어야 합니다."),
     NULL_DESSERT_DESCRIPTION(false, 3304, "디저트 설명을 입력해주세요."),
     DELETED_DESSERT(false, 3305, "이미 삭제된 디저트입니다."),
+    NULL_OPTION(false, 3306, "옵션을 입력해주세요."),
+    NULL_OPTION_IDX(false, 3307, "optionIdx를 입력해주세요."),
+    NULL_OPTION_DESCRIPTION(false, 3308, "옵션명을 입력해주세요."),
+    NULL_OPTION_PRICE(false, 3309, "옵션 가격을 입력해주세요."),
 
     // calendars(2400~2499)
     NULL_TITLE(false, 2400, "캘린더 제목을 입력해주세요."),
@@ -61,6 +65,10 @@ public enum BaseResponseStatus {
     NULL_TAG(false, 2403, "태그를 입력해주세요"),
 
     // histories(2500~2599)
+    // cs(2600-2699)
+    // order(2700~2799)
+    NULL_ORDER_IDX(false, 2700, "주문 아이디를 입력해주세요."),
+    NULL_ORDER_STATUS(false, 2701, "주문 상태를 선택해주세요."),
 
 
     /**
@@ -71,8 +79,9 @@ public enum BaseResponseStatus {
     EXIST_NICKNAME(false, 3001, "이미 사용 중인 닉네임입니다."),
     INVALID_EMAIL(false, 3002, "존재하지 않는 이메일입니다."),
     NO_STORE_ROLE(false, 3003, "판매자가 아닙니다."),
-    INVALID_USER_STATUS(false, 3004, "비활성화된 사용자입니다."),
-    EXPIRED_TOKEN(false, 3005, "만료된 토큰 값입니다."),
+    NO_CUSTOMER_ROLE(false, 3004, "구매자가 아닙니다."),
+    INVALID_USER_STATUS(false, 3005, "비활성화된 사용자입니다."),
+    EXPIRED_TOKEN(false, 3006, "만료된 토큰 값입니다."),
 
     // stores(3100~3199)
     INVALID_STORE_IDX(false, 3100, "존재하지 않는 스토어입니다."),
@@ -83,6 +92,7 @@ public enum BaseResponseStatus {
 
     // desserts(3300~3399)
     INVALID_DESSERT_IDX(false, 3300, "존재하지 않는 디저트입니다."),
+    INVALID_OPTION_IDX(false, 3301, "존재하지 않는 옵션입니다."),
 
     // calendars(3400~3499)
     INVALID_CALENDAR_TAG(false, 3400, "캘린더 TAG를 찾을 수 없습니다."),
@@ -100,6 +110,12 @@ public enum BaseResponseStatus {
     NO_NOTICE(false, 3600, "공지사항이 없습니다."),
     INVALID_NOTICE_IDX(false, 3601, "존재하지 않는 공지사항 입니다."),
 
+    // order(3700~3799)
+    INVALID_ORDER_IDX(false, 3700, "존재하지 않는 주문 입니다."),
+    NO_MATCH_ORDER_USER(false, 3701, "주문에 접근할 수 있는 사용자가 아닙니다."),
+    NO_MATCH_ORDER_STATUS(false, 3702, "가능한 주문 상태가 아닙니다."),
+    INVALID_ORDER_STATUS(false, 3703, "존재하지 않는 주문 상태 입니다."),
+
     /**
      * 4000: DB, Server 오류
      */
diff --git a/src/main/java/com/codepatissier/keki/dessert/dto/GetDessertRes.java b/src/main/java/com/codepatissier/keki/dessert/dto/GetDessertRes.java
index 8ea4f63..bc52da5 100644
--- a/src/main/java/com/codepatissier/keki/dessert/dto/GetDessertRes.java
+++ b/src/main/java/com/codepatissier/keki/dessert/dto/GetDessertRes.java
@@ -16,6 +16,7 @@ public class GetDessertRes {
     private Integer dessertPrice;
     private String dessertDescription;
     private List<Image> images;
+    private List<OptionDTO> options;
 
     @Getter
     @AllArgsConstructor
diff --git a/src/main/java/com/codepatissier/keki/dessert/dto/GetStoreDessertRes.java b/src/main/java/com/codepatissier/keki/dessert/dto/GetStoreDessertRes.java
index 617c81d..37d50f4 100644
--- a/src/main/java/com/codepatissier/keki/dessert/dto/GetStoreDessertRes.java
+++ b/src/main/java/com/codepatissier/keki/dessert/dto/GetStoreDessertRes.java
@@ -4,6 +4,8 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
@@ -13,4 +15,5 @@ public class GetStoreDessertRes {
     private String dessertName;
     private Integer dessertPrice;
     private String dessertDescription;
+    private List<OptionDTO> options;
 }
\ No newline at end of file
diff --git a/src/main/java/com/codepatissier/keki/dessert/dto/OptionDTO.java b/src/main/java/com/codepatissier/keki/dessert/dto/OptionDTO.java
index 79b4280..d2d9874 100644
--- a/src/main/java/com/codepatissier/keki/dessert/dto/OptionDTO.java
+++ b/src/main/java/com/codepatissier/keki/dessert/dto/OptionDTO.java
@@ -8,6 +8,7 @@
 @AllArgsConstructor
 @NoArgsConstructor
 public class OptionDTO {
-        private String optionDescription;
-        private Integer optionPrice;
-}
+    private Long optionIdx;
+    private String optionDescription;
+    private Integer optionPrice;
+}
\ No newline at end of file
diff --git a/src/main/java/com/codepatissier/keki/dessert/dto/PatchDessertReq.java b/src/main/java/com/codepatissier/keki/dessert/dto/PatchDessertReq.java
index 743355f..dc1f378 100644
--- a/src/main/java/com/codepatissier/keki/dessert/dto/PatchDessertReq.java
+++ b/src/main/java/com/codepatissier/keki/dessert/dto/PatchDessertReq.java
@@ -1,11 +1,16 @@
 package com.codepatissier.keki.dessert.dto;
 
 import lombok.Data;
+import lombok.Getter;
+
+import java.util.List;
 
 @Data
+@Getter
 public class PatchDessertReq {
     private String dessertImg;
     private String dessertName;
     private Integer dessertPrice;
     private String dessertDescription;
+    private List<OptionDTO> options;
 }
\ No newline at end of file
diff --git a/src/main/java/com/codepatissier/keki/dessert/entity/Option.java b/src/main/java/com/codepatissier/keki/dessert/entity/Option.java
index b910bfc..8f1ad87 100644
--- a/src/main/java/com/codepatissier/keki/dessert/entity/Option.java
+++ b/src/main/java/com/codepatissier/keki/dessert/entity/Option.java
@@ -35,4 +35,12 @@ public Option(Dessert dessert, String description, Integer price) {
         this.description = description;
         this.price = price;
     }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public void setPrice(Integer price) {
+        this.price = price;
+    }
 }
diff --git a/src/main/java/com/codepatissier/keki/dessert/repository/OptionRepository.java b/src/main/java/com/codepatissier/keki/dessert/repository/OptionRepository.java
index af47ef7..9008996 100644
--- a/src/main/java/com/codepatissier/keki/dessert/repository/OptionRepository.java
+++ b/src/main/java/com/codepatissier/keki/dessert/repository/OptionRepository.java
@@ -6,8 +6,10 @@
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Optional;
 
 @Repository
 public interface OptionRepository extends JpaRepository<Option, Long> {
     List<Option> findByDessertAndStatusOrderByOptionIdx(Dessert dessert, String activeStatus);
+    Optional<Option> findByOptionIdxAndStatus(Long optionIdx, String activeStatus);
 }
diff --git a/src/main/java/com/codepatissier/keki/dessert/service/DessertService.java b/src/main/java/com/codepatissier/keki/dessert/service/DessertService.java
index db73244..6d0f274 100644
--- a/src/main/java/com/codepatissier/keki/dessert/service/DessertService.java
+++ b/src/main/java/com/codepatissier/keki/dessert/service/DessertService.java
@@ -89,8 +89,10 @@ public GetDessertRes getDessert(Long dessertIdx) throws BaseException {
             ArrayList<GetDessertRes.Image> postImgList = getPostImgList(dessert);
             imgList.addAll(postImgList);
 
-            // nickname, dessertName, dessertPrice, dessertDescription, imgList(상품 상세 이미지 1장+피드 이미지 4장)
-            return new GetDessertRes(dessert.getStore().getUser().getNickname(), dessert.getDessertName(), dessert.getDessertPrice(), dessert.getDessertDescription(), imgList);
+            List<OptionDTO> optionList = getOptionList(dessert);
+
+            // nickname, dessertName, dessertPrice, dessertDescription, imgList(상품 상세 이미지 1장, 피드 이미지 4장), optionList(description, price)
+            return new GetDessertRes(dessert.getStore().getUser().getNickname(), dessert.getDessertName(), dessert.getDessertPrice(), dessert.getDessertDescription(), imgList, optionList);
         } catch (BaseException e) {
             throw e;
         } catch (Exception e) {
@@ -113,10 +115,10 @@ private String representPostImgUrl(List<PostImg> postImages){
         return postImages.isEmpty() ? null : postImages.get(0).getImgUrl();
     }
 
-//    private List<GetDessertRes.Option> getOptionList(Dessert dessert) {
-//        return optionRepository.findByDessertAndStatusOrderByOptionIdx(dessert, ACTIVE_STATUS).stream()
-//                .map(option -> new GetDessertRes.Option(option.getDescription(), option.getPrice())).collect(Collectors.toList());
-//    }
+    private List<OptionDTO> getOptionList(Dessert dessert) {
+        return optionRepository.findByDessertAndStatusOrderByOptionIdx(dessert, ACTIVE_STATUS).stream()
+                .map(option -> new OptionDTO(option.getOptionIdx(), option.getDescription(), option.getPrice())).collect(Collectors.toList());
+    }
 
     /**
      * [판매자] 상품 등록
@@ -165,10 +167,11 @@ public void deleteDessert(Long userIdx, Long dessertIdx) throws BaseException {
      * [판매자] 상품 수정
      * 상품 이미지, 이름, 가격, 소개
      */
+    @Transactional(rollbackFor = Exception.class)
     public void modifyDessert(PatchDessertReq patchDessertReq, Long dessertIdx, Long userIdx) throws BaseException {
         try {
             checkStore(userIdx);
-            Dessert dessert = dessertRepository.findByDessertIdxAndStatus(dessertIdx, ACTIVE_STATUS).orElseThrow(() -> new BaseException(INVALID_DESSERT_IDX));
+            Dessert dessert = dessertRepository.findByDessertIdxAndStatus(dessertIdx,ACTIVE_STATUS).orElseThrow(() -> new BaseException(INVALID_DESSERT_IDX));
 
             if (patchDessertReq.getDessertImg() != null) {
                 if (!patchDessertReq.getDessertImg().equals("") && !patchDessertReq.getDessertImg().equals(" "))
@@ -193,6 +196,32 @@ public void modifyDessert(PatchDessertReq patchDessertReq, Long dessertIdx, Long
                     dessert.setDessertDescription(patchDessertReq.getDessertDescription());
                 else throw new BaseException(NULL_DESSERT_DESCRIPTION);
             }
+
+            if (!patchDessertReq.getOptions().isEmpty() && !(patchDessertReq.getOptions() == null)) {
+                for (OptionDTO optionDTO : patchDessertReq.getOptions()) {
+                    if(optionDTO.getOptionIdx() == null)
+                        throw new BaseException(NULL_OPTION_IDX);
+                    if(optionDTO.getOptionDescription() == null)
+                        throw new BaseException(NULL_OPTION_DESCRIPTION);
+                    if(optionDTO.getOptionPrice() == null)
+                        throw new BaseException(NULL_OPTION_PRICE);
+                }
+
+                List<Long> optionIdxList = new ArrayList<>();
+                for (OptionDTO optionDTO : patchDessertReq.getOptions()) {
+                    optionIdxList.add(optionDTO.getOptionIdx());
+                }
+
+                for (Long optionIdx : optionIdxList) {
+                    Option option = optionRepository.findByOptionIdxAndStatus(optionIdx, ACTIVE_STATUS).orElseThrow(() -> new BaseException(INVALID_OPTION_IDX));
+
+                    for(OptionDTO modifiedOption : patchDessertReq.getOptions()) {
+                        option.setDescription(modifiedOption.getOptionDescription());
+                        option.setPrice(modifiedOption.getOptionPrice());
+                    }
+                    optionRepository.save(option);
+                }
+            }
             dessertRepository.save(dessert);
         } catch (BaseException e) {
             throw e;
@@ -203,14 +232,15 @@ public void modifyDessert(PatchDessertReq patchDessertReq, Long dessertIdx, Long
 
     /**
      * [판매자] 상품 상세 조회
-     * 상품 이미지, 이름, 가격, 소개
+     * 가게 이름, 상품 이미지, 상품명, 상품 가격, 상품 설명, 옵션(optionIdx, 옵션명, 옵션 가격)
      */
     public GetStoreDessertRes getStoreDessert(Long userIdx, Long dessertIdx) throws BaseException {
         try {
             checkStore(userIdx);
             Dessert dessert = dessertRepository.findByDessertIdxAndStatus(dessertIdx, ACTIVE_STATUS).orElseThrow(() -> new BaseException(INVALID_DESSERT_IDX));
 
-            return new GetStoreDessertRes(dessert.getStore().getUser().getNickname(), dessert.getDessertImg(), dessert.getDessertName(), dessert.getDessertPrice(), dessert.getDessertDescription());
+            List<OptionDTO> optionList = getOptionList(dessert);
+            return new GetStoreDessertRes(dessert.getStore().getUser().getNickname(), dessert.getDessertImg(), dessert.getDessertName(), dessert.getDessertPrice(), dessert.getDessertDescription(), optionList);
         } catch (BaseException e) {
             throw e;
         } catch (Exception e) {
diff --git a/src/main/java/com/codepatissier/keki/order/controller/OrderController.java b/src/main/java/com/codepatissier/keki/order/controller/OrderController.java
index 2c413c5..fba4999 100644
--- a/src/main/java/com/codepatissier/keki/order/controller/OrderController.java
+++ b/src/main/java/com/codepatissier/keki/order/controller/OrderController.java
@@ -1,15 +1,152 @@
 package com.codepatissier.keki.order.controller;
 
+import com.codepatissier.keki.common.BaseException;
+import com.codepatissier.keki.common.BaseResponse;
+
+import com.codepatissier.keki.order.dto.*;
+import com.codepatissier.keki.order.dto.PatchOrderStatusReq;
+import com.codepatissier.keki.order.dto.OrderReq;
+import com.codepatissier.keki.order.entity.OrderStatus;
+
+import com.codepatissier.keki.order.service.OrderService;
+import com.codepatissier.keki.user.service.AuthService;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
+
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.PatchMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import org.springframework.web.bind.annotation.*;
+
+
+import java.util.Objects;
+
+import static com.codepatissier.keki.common.BaseResponseStatus.*;
+import static com.codepatissier.keki.order.entity.OrderStatus.getOrderStatusByName;
+
 @SecurityRequirement(name = "Bearer")
 @Tag(name = "orders", description = "주문 API")
 @RestController
 @RequestMapping(value = "/orders")
 @RequiredArgsConstructor
 public class OrderController {
+
+    private final AuthService authService;
+    private final OrderService orderService;
+
+
+    /**
+     * 주문하기 API
+     * [POST] /orders
+     */
+    @PostMapping("")
+    public BaseResponse<String> makeOrder(@RequestBody OrderReq orderReq){
+        try {
+            orderService.makeOrder(authService.getUserIdx(), orderReq);
+            return new BaseResponse<>(SUCCESS);
+        } catch (BaseException e) {
+            return new BaseResponse<>(e.getStatus());
+        }
+    }
+
+    /**
+     * 주문수정 API
+     * [PATCH] /orders/:orderIdx
+     */
+    @PatchMapping("{orderIdx}")
+    public BaseResponse<String> editOrder(@PathVariable("orderIdx") Long orderIdx, @RequestBody OrderReq orderReq){
+        try {
+            orderService.editOrder(authService.getUserIdx(), orderIdx, orderReq);
+            return new BaseResponse<>(SUCCESS);
+        } catch (BaseException e) {
+            return new BaseResponse<>(e.getStatus());
+        }
+    }
+
+    /**
+     * [구매자/판매자] 주문 상세 조회 API
+     * @param orderIdx
+     * @return GetOrder
+     */
+    @GetMapping("{orderIdx}")
+    public BaseResponse<GetOrder> getOrder(@PathVariable("orderIdx") Long orderIdx){
+        try {
+            return new BaseResponse<>(orderService.getOrderReturn(authService.getUserIdx(), orderIdx));
+        } catch (BaseException e) {
+            return new BaseResponse<>(e.getStatus());
+        }
+    }
+
+    /**
+     * 주문 내역 조회 API
+     * @param getOrderHistoryReq(orderStatus)
+     */
+    @GetMapping("/history")
+    public BaseResponse<GetOrderHistoryRes> getOrderHistory(GetOrderHistoryReq getOrderHistoryReq){
+        try {
+            return new BaseResponse<>(orderService.getOrderHistory(authService.getUserIdx(), getOrderHistoryReq));
+        } catch (BaseException e) {
+            return new BaseResponse<>(e.getStatus());
+        }
+    }
+
+    /**
+     * 주문 취소 API
+     * @param orderIdx
+     */
+    @PatchMapping("/cancel/{orderIdx}")
+    public BaseResponse<?> cancelOrder(@PathVariable("orderIdx") Long orderIdx) {
+        try{
+            orderService.cancelOrder(authService.getUserIdx(), orderIdx);
+            return new BaseResponse<>(SUCCESS);
+        }catch (BaseException e){
+            return new BaseResponse<>(e.getStatus());
+        }
+    }
+
+    /**
+     * [판매자] 주문 상태 변경
+     * @param patchOrderStatusReq(orderIdx, orderStatus)
+     */
+    @PatchMapping("/status")
+    public BaseResponse<?> changeOrderStatus(PatchOrderStatusReq patchOrderStatusReq) {
+        try{
+            if(Objects.isNull(patchOrderStatusReq.getOrderIdx())) throw new BaseException(NULL_ORDER_IDX);
+            String orderStatus = patchOrderStatusReq.getOrderStatus();
+            if(!StringUtils.hasText(orderStatus)) throw new BaseException(NULL_ORDER_STATUS);
+            if(Objects.isNull(getOrderStatusByName(orderStatus)) || getOrderStatusByName(orderStatus) == OrderStatus.CANCELED) throw new BaseException(INVALID_ORDER_STATUS);
+            orderService.changeOrderStatus(authService.getUserIdx(), patchOrderStatusReq);
+            return new BaseResponse<>(SUCCESS);
+        }catch (BaseException e){
+            return new BaseResponse<>(e.getStatus());
+        }
+    }
+
+    /**
+     * 주문 화면 조회
+     */
+    @GetMapping("/view/{storeIdx}")
+    public BaseResponse<GetOrderStore> getStoreDessertsAndOptions(@PathVariable("storeIdx") Long storeIdx){
+        try{
+            return new BaseResponse<>(this.orderService.getStoreDessertsAndOptions(storeIdx));
+        }catch (BaseException e){
+            return new BaseResponse<>(e.getStatus());
+        }
+    }
+
+    /**
+     * 주문 수정 화면 조회
+     */
+    @GetMapping("/{orderIdx}/editView")
+    public BaseResponse<GetEditOrder> getEditOrderView(@PathVariable("orderIdx") Long orderIdx){
+        try {
+            return new BaseResponse<>(this.orderService.getEditOrderView(orderIdx, authService.getUserIdx()));
+        } catch (BaseException e) {
+            return new BaseResponse<>(e.getStatus());
+        }
+    }
 }
diff --git a/src/main/java/com/codepatissier/keki/order/dto/GetEditOrder.java b/src/main/java/com/codepatissier/keki/order/dto/GetEditOrder.java
new file mode 100644
index 0000000..c6e62bc
--- /dev/null
+++ b/src/main/java/com/codepatissier/keki/order/dto/GetEditOrder.java
@@ -0,0 +1,18 @@
+package com.codepatissier.keki.order.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.util.List;
+
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+public class GetEditOrder {
+    GetOrder getOrder;
+    List<GetStoreDessertAndOptions> getStoreDessertAndOptions;
+
+}
diff --git a/src/main/java/com/codepatissier/keki/order/dto/GetOptionOrder.java b/src/main/java/com/codepatissier/keki/order/dto/GetOptionOrder.java
new file mode 100644
index 0000000..40d366b
--- /dev/null
+++ b/src/main/java/com/codepatissier/keki/order/dto/GetOptionOrder.java
@@ -0,0 +1,16 @@
+package com.codepatissier.keki.order.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+public class GetOptionOrder {
+    Long optionOrderIdx;
+    String optionDescription;
+    Integer optionPrice;
+}
diff --git a/src/main/java/com/codepatissier/keki/order/dto/GetOrder.java b/src/main/java/com/codepatissier/keki/order/dto/GetOrder.java
new file mode 100644
index 0000000..54ea8d2
--- /dev/null
+++ b/src/main/java/com/codepatissier/keki/order/dto/GetOrder.java
@@ -0,0 +1,40 @@
+package com.codepatissier.keki.order.dto;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+public class GetOrder {
+    Long orderIdx;
+    String orderStatus;
+    Long dessertIdx;
+    String dessertName;
+
+    // 주문 금액
+    Integer dessertPrice;
+    Integer optionPrice;
+    Integer totalPrice;
+    
+    // 요청 사항
+    String request;
+    LocalDateTime pickupDate;
+
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    GetStoreInfo storeInfo;
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    GetUserInfo userInfo;
+
+    // 이미지, 옵션 추가
+    List<GetOrderImg> orderImgs;
+    List<GetOptionOrder> optionOrders;
+
+}
diff --git a/src/main/java/com/codepatissier/keki/order/dto/GetOrderHistory.java b/src/main/java/com/codepatissier/keki/order/dto/GetOrderHistory.java
new file mode 100644
index 0000000..b47164c
--- /dev/null
+++ b/src/main/java/com/codepatissier/keki/order/dto/GetOrderHistory.java
@@ -0,0 +1,18 @@
+package com.codepatissier.keki.order.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+
+import java.time.LocalDateTime;
+
+@AllArgsConstructor
+@Data
+public class GetOrderHistory {
+    private Long orderIdx;
+    private String userName;
+    private String userProfileImg;
+    private int totalPrice;
+    private String dessertName;
+    private LocalDateTime pickupDate;
+}
diff --git a/src/main/java/com/codepatissier/keki/order/dto/GetOrderHistoryReq.java b/src/main/java/com/codepatissier/keki/order/dto/GetOrderHistoryReq.java
new file mode 100644
index 0000000..c480cf7
--- /dev/null
+++ b/src/main/java/com/codepatissier/keki/order/dto/GetOrderHistoryReq.java
@@ -0,0 +1,8 @@
+package com.codepatissier.keki.order.dto;
+
+import lombok.Data;
+
+@Data
+public class GetOrderHistoryReq {
+    private String orderStatus;
+}
diff --git a/src/main/java/com/codepatissier/keki/order/dto/GetOrderHistoryRes.java b/src/main/java/com/codepatissier/keki/order/dto/GetOrderHistoryRes.java
new file mode 100644
index 0000000..ff97c6a
--- /dev/null
+++ b/src/main/java/com/codepatissier/keki/order/dto/GetOrderHistoryRes.java
@@ -0,0 +1,16 @@
+package com.codepatissier.keki.order.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.util.List;
+
+@AllArgsConstructor
+@Data
+public class GetOrderHistoryRes {
+    private int orderWaiting;
+    private int progressing;
+    private int pickupWaiting;
+    private int allOrderHistory;
+    private List<GetOrderHistory> orderHistory;
+}
diff --git a/src/main/java/com/codepatissier/keki/order/dto/GetOrderImg.java b/src/main/java/com/codepatissier/keki/order/dto/GetOrderImg.java
new file mode 100644
index 0000000..aa1b939
--- /dev/null
+++ b/src/main/java/com/codepatissier/keki/order/dto/GetOrderImg.java
@@ -0,0 +1,16 @@
+package com.codepatissier.keki.order.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+public class GetOrderImg {
+    Long orderImgIdx;
+    String orderImgUrl;
+
+}
diff --git a/src/main/java/com/codepatissier/keki/order/dto/GetOrderStore.java b/src/main/java/com/codepatissier/keki/order/dto/GetOrderStore.java
new file mode 100644
index 0000000..6be5a81
--- /dev/null
+++ b/src/main/java/com/codepatissier/keki/order/dto/GetOrderStore.java
@@ -0,0 +1,20 @@
+package com.codepatissier.keki.order.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.util.List;
+
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+public class GetOrderStore {
+    Long storeIdx;
+    String storeName;
+    String accountName;
+    String storeAccount;
+    List<GetStoreDessertAndOptions> getStoreDessertsAndOptions;
+}
diff --git a/src/main/java/com/codepatissier/keki/order/dto/GetStoreDessertAndOptions.java b/src/main/java/com/codepatissier/keki/order/dto/GetStoreDessertAndOptions.java
new file mode 100644
index 0000000..7b6d5dc
--- /dev/null
+++ b/src/main/java/com/codepatissier/keki/order/dto/GetStoreDessertAndOptions.java
@@ -0,0 +1,21 @@
+package com.codepatissier.keki.order.dto;
+
+import com.codepatissier.keki.dessert.dto.OptionDTO;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.util.List;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class GetStoreDessertAndOptions {
+
+    Long dessertIdx;
+    String dessertName;
+    Integer dessertPrice;
+    List<OptionDTO> options;
+}
diff --git a/src/main/java/com/codepatissier/keki/order/dto/GetStoreInfo.java b/src/main/java/com/codepatissier/keki/order/dto/GetStoreInfo.java
new file mode 100644
index 0000000..30a9db8
--- /dev/null
+++ b/src/main/java/com/codepatissier/keki/order/dto/GetStoreInfo.java
@@ -0,0 +1,18 @@
+package com.codepatissier.keki.order.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+public class GetStoreInfo {
+    // 판매자 정보
+    Long storeIdx;
+    String storeName;
+    String accountName;
+    String storeAccount;
+}
diff --git a/src/main/java/com/codepatissier/keki/order/dto/GetUserInfo.java b/src/main/java/com/codepatissier/keki/order/dto/GetUserInfo.java
new file mode 100644
index 0000000..ad1c2c3
--- /dev/null
+++ b/src/main/java/com/codepatissier/keki/order/dto/GetUserInfo.java
@@ -0,0 +1,17 @@
+package com.codepatissier.keki.order.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+public class GetUserInfo {
+    // 구매자 정보
+    Long userIdx;
+    String userName;
+    String phone;
+}
diff --git a/src/main/java/com/codepatissier/keki/order/dto/NumOfOrder.java b/src/main/java/com/codepatissier/keki/order/dto/NumOfOrder.java
new file mode 100644
index 0000000..94fc646
--- /dev/null
+++ b/src/main/java/com/codepatissier/keki/order/dto/NumOfOrder.java
@@ -0,0 +1,15 @@
+package com.codepatissier.keki.order.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class NumOfOrder {
+    private int orderWaiting;
+    private int progressing;
+    private int pickupWaiting;
+    private int allOrderHistory;
+}
diff --git a/src/main/java/com/codepatissier/keki/order/dto/OrderReq.java b/src/main/java/com/codepatissier/keki/order/dto/OrderReq.java
new file mode 100644
index 0000000..caf16b7
--- /dev/null
+++ b/src/main/java/com/codepatissier/keki/order/dto/OrderReq.java
@@ -0,0 +1,25 @@
+package com.codepatissier.keki.order.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+public class OrderReq {
+    private String customerName;
+    private String customerPhone;
+    private Long dessertIdx;
+    private List<Long> options;
+    private LocalDateTime pickupDate;
+    private String request;
+    private List<String> imgUrls;
+    private Integer extraPrice;
+    private Integer totalPrice;
+}
diff --git a/src/main/java/com/codepatissier/keki/order/dto/PatchOrderStatusReq.java b/src/main/java/com/codepatissier/keki/order/dto/PatchOrderStatusReq.java
new file mode 100644
index 0000000..8af3bb4
--- /dev/null
+++ b/src/main/java/com/codepatissier/keki/order/dto/PatchOrderStatusReq.java
@@ -0,0 +1,9 @@
+package com.codepatissier.keki.order.dto;
+
+import lombok.Data;
+
+@Data
+public class PatchOrderStatusReq {
+    private Long orderIdx;
+    private String orderStatus;
+}
diff --git a/src/main/java/com/codepatissier/keki/order/entity/OptionOrder.java b/src/main/java/com/codepatissier/keki/order/entity/OptionOrder.java
index 3defbb2..bf555d2 100644
--- a/src/main/java/com/codepatissier/keki/order/entity/OptionOrder.java
+++ b/src/main/java/com/codepatissier/keki/order/entity/OptionOrder.java
@@ -1,6 +1,8 @@
 package com.codepatissier.keki.order.entity;
 
+import com.codepatissier.keki.common.BaseEntity;
 import com.codepatissier.keki.dessert.entity.Option;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.DynamicInsert;
@@ -11,7 +13,7 @@
 @Entity
 @NoArgsConstructor
 @DynamicInsert
-public class OptionOrder {
+public class OptionOrder extends BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long optionOrderIdx;
@@ -23,4 +25,10 @@ public class OptionOrder {
     @ManyToOne
     @JoinColumn(nullable = false, name = "optionIdx")
     private Option option;
+
+    @Builder
+    public OptionOrder(Order order, Option option){
+        this.order = order;
+        this.option = option;
+    }
 }
diff --git a/src/main/java/com/codepatissier/keki/order/entity/Order.java b/src/main/java/com/codepatissier/keki/order/entity/Order.java
index 86402fb..d6169ee 100644
--- a/src/main/java/com/codepatissier/keki/order/entity/Order.java
+++ b/src/main/java/com/codepatissier/keki/order/entity/Order.java
@@ -1,6 +1,7 @@
 package com.codepatissier.keki.order.entity;
 
 import com.codepatissier.keki.dessert.entity.Dessert;
+import com.codepatissier.keki.order.dto.OrderReq;
 import com.codepatissier.keki.store.entity.Store;
 import com.codepatissier.keki.user.entity.User;
 import lombok.Builder;
@@ -58,10 +59,10 @@ public class Order {
     private String request;
 
     @OneToMany(fetch = FetchType.EAGER, mappedBy = "order", orphanRemoval = true)
-    private List<OptionOrder> options = new ArrayList<>();
+    private List<OrderImg> images = new ArrayList<>();
 
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "order", orphanRemoval = true)
-    private List<OrderImg> imgs = new ArrayList<>();
+    @OneToMany(fetch = FetchType.EAGER, mappedBy = "order", orphanRemoval = true)
+    private List<OptionOrder> options = new ArrayList<>();
 
     @Builder
     public Order(User user, Store store, Dessert dessert, LocalDateTime pickupDate, String customerName, String customerPhone, int extraPrice, int totalPrice, String request) {
@@ -76,4 +77,49 @@ public Order(User user, Store store, Dessert dessert, LocalDateTime pickupDate,
         this.request = request;
     }
 
+    public void cancelOrder() {
+        this.orderStatus = OrderStatus.CANCELED;
+    }
+
+    public void changeOrderStatus(OrderStatus orderStatus) {
+        this.orderStatus = orderStatus;
+    }
+
+    public void editOrder(Dessert dessert, OrderReq orderReq){
+        this.setDessert(dessert);
+        this.setCustomerName(orderReq.getCustomerName());
+        this.setCustomerPhone(orderReq.getCustomerPhone());
+        this.setRequest(orderReq.getRequest());
+        this.setPickupDate(orderReq.getPickupDate());
+        this.setExtraPrice(orderReq.getExtraPrice());
+        this.setTotalPrice(orderReq.getTotalPrice());
+    }
+
+    public void setDessert(Dessert dessert) {
+        this.dessert = dessert;
+    }
+
+    public void setPickupDate(LocalDateTime pickupDate) {
+        this.pickupDate = pickupDate;
+    }
+
+    public void setCustomerName(String customerName) {
+        this.customerName = customerName;
+    }
+
+    public void setCustomerPhone(String customerPhone) {
+        this.customerPhone = customerPhone;
+    }
+
+    public void setExtraPrice(int extraPrice) {
+        this.extraPrice = extraPrice;
+    }
+
+    public void setTotalPrice(int totalPrice) {
+        this.totalPrice = totalPrice;
+    }
+
+    public void setRequest(String request) {
+        this.request = request;
+    }
 }
diff --git a/src/main/java/com/codepatissier/keki/order/entity/OrderImg.java b/src/main/java/com/codepatissier/keki/order/entity/OrderImg.java
index 8885ee7..de36b54 100644
--- a/src/main/java/com/codepatissier/keki/order/entity/OrderImg.java
+++ b/src/main/java/com/codepatissier/keki/order/entity/OrderImg.java
@@ -1,5 +1,7 @@
 package com.codepatissier.keki.order.entity;
 
+import com.codepatissier.keki.common.BaseEntity;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.DynamicInsert;
@@ -10,7 +12,7 @@
 @Entity
 @NoArgsConstructor
 @DynamicInsert
-public class OrderImg {
+public class OrderImg extends BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long orderImgIdx;
@@ -21,4 +23,10 @@ public class OrderImg {
 
     @Column(nullable = false, length = 300)
     private String imgUrl;
+
+    @Builder
+    public OrderImg(Order order, String imgUrl){
+        this.order = order;
+        this.imgUrl = imgUrl;
+    }
 }
diff --git a/src/main/java/com/codepatissier/keki/order/entity/OrderStatus.java b/src/main/java/com/codepatissier/keki/order/entity/OrderStatus.java
index 9337a31..b1177fc 100644
--- a/src/main/java/com/codepatissier/keki/order/entity/OrderStatus.java
+++ b/src/main/java/com/codepatissier/keki/order/entity/OrderStatus.java
@@ -24,4 +24,5 @@ public static OrderStatus getOrderStatusByName(String name){
                 .filter(r -> r.getName().equals(name))
                 .findAny().orElse(null);
     }
+
 }
diff --git a/src/main/java/com/codepatissier/keki/order/repository/OptionOrderRepository.java b/src/main/java/com/codepatissier/keki/order/repository/OptionOrderRepository.java
new file mode 100644
index 0000000..0082cd3
--- /dev/null
+++ b/src/main/java/com/codepatissier/keki/order/repository/OptionOrderRepository.java
@@ -0,0 +1,16 @@
+package com.codepatissier.keki.order.repository;
+
+import com.codepatissier.keki.dessert.entity.Option;
+import com.codepatissier.keki.order.entity.OptionOrder;
+import com.codepatissier.keki.order.entity.Order;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Optional;
+
+@Repository
+public interface OptionOrderRepository extends JpaRepository<OptionOrder, Long> {
+    List<OptionOrder> findByOrderAndStatusEquals(Order order, String activeStatus);
+    OptionOrder findByOrderAndOption(Order order, Option option);
+}
diff --git a/src/main/java/com/codepatissier/keki/order/repository/OrderImgRepository.java b/src/main/java/com/codepatissier/keki/order/repository/OrderImgRepository.java
new file mode 100644
index 0000000..6d42757
--- /dev/null
+++ b/src/main/java/com/codepatissier/keki/order/repository/OrderImgRepository.java
@@ -0,0 +1,15 @@
+package com.codepatissier.keki.order.repository;
+
+import com.codepatissier.keki.order.entity.Order;
+import com.codepatissier.keki.order.entity.OrderImg;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface OrderImgRepository extends JpaRepository<OrderImg, Long> {
+    List<OrderImg> findByOrderAndStatusEquals(Order order, String activeStatus);
+
+    OrderImg findByOrderAndImgUrl(Order order, String url);
+}
diff --git a/src/main/java/com/codepatissier/keki/order/repository/OrderRepository.java b/src/main/java/com/codepatissier/keki/order/repository/OrderRepository.java
index 4c204a5..8347e5c 100644
--- a/src/main/java/com/codepatissier/keki/order/repository/OrderRepository.java
+++ b/src/main/java/com/codepatissier/keki/order/repository/OrderRepository.java
@@ -1,9 +1,23 @@
 package com.codepatissier.keki.order.repository;
 
 import com.codepatissier.keki.order.entity.Order;
+import com.codepatissier.keki.order.entity.OrderStatus;
+import com.codepatissier.keki.store.entity.Store;
+import com.codepatissier.keki.user.entity.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+import java.util.Optional;
+
 @Repository
 public interface OrderRepository extends JpaRepository<Order, Long> {
+    Optional<List<Order>> findAllByUserAndOrderStatusEqualsOrderByPickupDateDesc(User user, OrderStatus orderStatus);
+    Optional<List<Order>> findAllByUserOrderByPickupDateDesc(User user);
+    Optional<List<Order>> findAllByStore_UserOrderByPickupDateDesc(User user);
+    Optional<List<Order>> findAllByStore_UserAndOrderStatusEqualsOrderByPickupDateDesc(User user, OrderStatus orderStatus);
+    int countByUserAndOrderStatusEquals(User user, OrderStatus orderWaiting);
+    int countAllByUser(User user);
+    int countByStore_UserAndOrderStatusEquals(User user, OrderStatus orderWaiting);
+    int countAllByStore_User(User user);
 }
diff --git a/src/main/java/com/codepatissier/keki/order/service/OrderService.java b/src/main/java/com/codepatissier/keki/order/service/OrderService.java
index e5fccfb..b3d92c7 100644
--- a/src/main/java/com/codepatissier/keki/order/service/OrderService.java
+++ b/src/main/java/com/codepatissier/keki/order/service/OrderService.java
@@ -1,9 +1,293 @@
 package com.codepatissier.keki.order.service;
 
+import com.codepatissier.keki.common.BaseException;
+
+import com.codepatissier.keki.common.Role;
+import com.codepatissier.keki.dessert.entity.Dessert;
+import com.codepatissier.keki.dessert.entity.Option;
+import com.codepatissier.keki.dessert.repository.DessertRepository;
+import com.codepatissier.keki.dessert.repository.OptionRepository;
+import com.codepatissier.keki.order.dto.*;
+import com.codepatissier.keki.dessert.dto.OptionDTO;
+
+import com.codepatissier.keki.order.entity.OptionOrder;
+import com.codepatissier.keki.order.entity.Order;
+import com.codepatissier.keki.order.entity.OrderImg;
+import com.codepatissier.keki.order.entity.OrderStatus;
+import com.codepatissier.keki.order.repository.OptionOrderRepository;
+import com.codepatissier.keki.order.repository.OrderImgRepository;
+import com.codepatissier.keki.order.repository.OrderRepository;
+import com.codepatissier.keki.store.entity.Store;
+import com.codepatissier.keki.store.repository.StoreRepository;
+import com.codepatissier.keki.user.entity.User;
+import com.codepatissier.keki.user.repository.UserRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import static com.codepatissier.keki.common.BaseResponseStatus.*;
+import static com.codepatissier.keki.common.Constant.ACTIVE_STATUS;
+import static com.codepatissier.keki.common.Constant.INACTIVE_STATUS;
+import static com.codepatissier.keki.order.entity.OrderStatus.getOrderStatusByName;
+import static com.codepatissier.keki.common.Role.*;
+import static com.codepatissier.keki.order.entity.OrderStatus.*;
 
 @Service
 @RequiredArgsConstructor
 public class OrderService {
+
+    private final OrderRepository orderRepository;
+    private final UserRepository userRepository;
+    private final OrderImgRepository orderImgRepository;
+    private final OptionOrderRepository optionOrderRepository;
+    private final DessertRepository dessertRepository;
+    private final StoreRepository storeRepository;
+    private final OptionRepository optionRepository;
+
+    /**
+     * 주문하기
+     */
+    @Transactional(rollbackFor= Exception.class)
+    public void makeOrder(Long userIdx, OrderReq orderReq) throws BaseException{
+        User user = this.userRepository.findByUserIdxAndStatusEquals(userIdx, ACTIVE_STATUS).orElseThrow(()-> new BaseException(INVALID_USER_AND_STATUS));
+        if (!Role.getRoleByName(user.getRole()).equals(Role.CUSTOMER))
+            throw new BaseException(NO_CUSTOMER_ROLE);
+
+        Dessert dessert = this.dessertRepository.findByDessertIdxAndStatus(orderReq.getDessertIdx(),ACTIVE_STATUS).orElseThrow(()-> new BaseException(INVALID_DESSERT_IDX));
+
+        Order order = saveOrder(orderReq, user, dessert);
+        saveOrderImgs(orderReq, order);
+        saveOptionOrders(orderReq, order);
+    }
+
+    private void saveOptionOrders(OrderReq orderReq, Order order) throws BaseException {
+        List<OptionOrder> optionOrders = new ArrayList<>();
+        for(Long optionIdx : orderReq.getOptions()) {
+            optionOrders.add(OptionOrder.builder()
+                    .order(order)
+                    .option(this.optionRepository.findById(optionIdx)
+                            .orElseThrow(()->new BaseException(INVALID_OPTION_IDX)))
+                    .build());
+        }
+        this.optionOrderRepository.saveAll(optionOrders);
+    }
+
+    private void saveOrderImgs(OrderReq orderReq, Order order) {
+        List<OrderImg> orderImgs = orderReq.getImgUrls().stream()
+                .map(url -> OrderImg.builder()
+                        .order(order)
+                        .imgUrl(url)
+                        .build())
+                .collect(Collectors.toList());
+        this.orderImgRepository.saveAll(orderImgs);
+    }
+
+    private Order saveOrder(OrderReq orderReq, User user, Dessert dessert) {
+        Order order = Order.builder()
+                .user(user)
+                .store(dessert.getStore())
+                .dessert(dessert)
+                .request(orderReq.getRequest())
+                .pickupDate(orderReq.getPickupDate())
+                .customerName(orderReq.getCustomerName())
+                .customerPhone(orderReq.getCustomerPhone())
+                .extraPrice(orderReq.getExtraPrice())
+                .totalPrice(orderReq.getTotalPrice())
+                .build();
+        this.orderRepository.save(order);
+        return order;
+    }
+
+    /**
+     * 주문수정
+     */
+    @Transactional(rollbackFor= Exception.class)
+    public void editOrder(Long userIdx, Long orderIdx, OrderReq orderReq) throws BaseException{
+        User user = this.userRepository.findByUserIdxAndStatusEquals(userIdx, ACTIVE_STATUS).orElseThrow(()-> new BaseException(INVALID_USER_AND_STATUS));
+        if (!Role.getRoleByName(user.getRole()).equals(Role.CUSTOMER))
+            throw new BaseException(NO_CUSTOMER_ROLE);
+        Order order = orderRepository.findById(orderIdx).orElseThrow(() -> new BaseException(INVALID_ORDER_IDX));
+
+        Dessert dessert = this.dessertRepository.findByDessertIdxAndStatus(orderReq.getDessertIdx(),ACTIVE_STATUS)
+                .orElseThrow(()-> new BaseException(INVALID_DESSERT_IDX));
+        if(!dessert.getStore().equals(order.getStore())) throw new BaseException(INVALID_ORDER_IDX);
+
+        order.editOrder(dessert, orderReq);
+
+        order.getOptions().forEach(option -> option.setStatus(INACTIVE_STATUS));
+        List<OptionOrder> optionOrders = new ArrayList<>();
+        for(Long optionIdx : orderReq.getOptions()){
+            Option option = this.optionRepository.findById(optionIdx)
+                    .orElseThrow(()->new BaseException(INVALID_OPTION_IDX));
+            OptionOrder optionOrder = this.optionOrderRepository.findByOrderAndOption(order, option);
+            if(optionOrder != null) optionOrder.setStatus(ACTIVE_STATUS);
+            else optionOrders.add(OptionOrder.builder()
+                    .order(order)
+                    .option(option)
+                    .build());
+        }
+        this.optionOrderRepository.saveAll(optionOrders);
+
+        order.getImages().forEach(img -> img.setStatus(INACTIVE_STATUS));
+        List<OrderImg> orderImgs = new ArrayList<>();
+        for(String imgUrl : orderReq.getImgUrls()){
+            OrderImg orderImg = this.orderImgRepository.findByOrderAndImgUrl(order, imgUrl);
+            if(orderImg != null) orderImg.setStatus(ACTIVE_STATUS);
+            else orderImgs.add(OrderImg.builder()
+                    .order(order)
+                    .imgUrl(imgUrl)
+                    .build());
+        }
+        this.orderImgRepository.saveAll(orderImgs);
+
+        this.orderRepository.save(order);
+    }
+
+    // 주문 취소
+    public void cancelOrder(Long userIdx, Long orderIdx) throws BaseException{
+        User user = userRepository.findByUserIdxAndStatusEquals(userIdx, ACTIVE_STATUS).orElseThrow(() -> new BaseException(INVALID_USER_IDX));
+        Order order = orderRepository.findById(orderIdx).orElseThrow(() -> new BaseException(INVALID_ORDER_IDX));
+
+        if(!order.getUser().equals(user)) throw new BaseException(NO_MATCH_ORDER_USER);
+        if(!order.getOrderStatus().equals(OrderStatus.ORDER_WAITING)) throw new BaseException(NO_MATCH_ORDER_STATUS);
+        order.cancelOrder();
+        orderRepository.save(order);
+    }
+
+
+    // [판매자] 주문 상태 변경
+    public void changeOrderStatus(Long userIdx, PatchOrderStatusReq patchOrderStatusReq) throws BaseException{
+        User user = userRepository.findByUserIdxAndStatusEquals(userIdx, ACTIVE_STATUS).orElseThrow(() -> new BaseException(INVALID_USER_IDX));
+        Order order = orderRepository.findById(patchOrderStatusReq.getOrderIdx()).orElseThrow(() -> new BaseException(INVALID_ORDER_IDX));
+
+        if(!order.getStore().getUser().equals(user)) throw new BaseException(NO_MATCH_ORDER_USER);
+        order.changeOrderStatus(getOrderStatusByName(patchOrderStatusReq.getOrderStatus()));
+        orderRepository.save(order);
+    }
+
+    // 주문 상세 return 값
+    public GetOrder getOrderReturn(Long userIdx, Long orderIdx) throws BaseException{
+        User user = userRepository.findByUserIdxAndStatusEquals(userIdx, ACTIVE_STATUS).orElseThrow(() -> new BaseException(INVALID_USER_IDX));
+        Order order = orderRepository.findById(orderIdx).orElseThrow(() -> new BaseException(INVALID_ORDER_IDX));
+        if(user.getRole().equals(CUSTOMER.getName())){
+            if(!order.getUser().equals(user)) throw new BaseException(NO_MATCH_ORDER_USER);
+            return getOrderByUser(order);
+        }else if (user.getRole().equals(STORE.getName())){
+            if(!order.getStore().getUser().equals(user)) throw new BaseException(NO_MATCH_ORDER_USER);
+            return getOrderByStore(order);
+        }else throw new BaseException(INVALID_USER_IDX);
+    }
+
+    // 판매자 주문 상세 조회
+    private GetOrder getOrderByStore(Order order) throws BaseException{
+        List<GetOrderImg> orderImgs = getOrderImgs(order);
+        List<GetOptionOrder> optionOrders = getOptionOrders(order);
+
+        // TODO: 아직 판매자 계좌 번호 저장 이전
+        return new GetOrder(order.getOrderIdx(), order.getOrderStatus().getName(), order.getDessert().getDessertIdx(), order.getDessert().getDessertName(),
+                order.getDessert().getDessertPrice(), order.getExtraPrice(), order.getTotalPrice(), order.getRequest(), order.getPickupDate(),
+                null, new GetUserInfo(order.getUser().getUserIdx(), order.getCustomerName(), order.getCustomerPhone()), orderImgs, optionOrders);
+    }
+
+    // 구매자 주문 상세 조회
+    private GetOrder getOrderByUser(Order order) {
+        List<GetOrderImg> orderImgs = getOrderImgs(order);
+        List<GetOptionOrder> optionOrders = getOptionOrders(order);
+
+        // TODO: 아직 판매자 계좌 번호 저장 이전
+        return new GetOrder(order.getOrderIdx(), order.getOrderStatus().getName(), order.getDessert().getDessertIdx(), order.getDessert().getDessertName(),
+                order.getDessert().getDessertPrice(), order.getExtraPrice(), order.getTotalPrice(), order.getRequest(), order.getPickupDate(),
+                new GetStoreInfo(order.getStore().getStoreIdx(), order.getStore().getUser().getNickname(), null, order.getStore().getAddress()), null, orderImgs, optionOrders);
+    }
+
+    // 주문 이미지 불러오기
+    private List<GetOrderImg> getOrderImgs(Order order) {
+        List<GetOrderImg> orderImgs = orderImgRepository.findByOrderAndStatusEquals(order, ACTIVE_STATUS).stream()
+                .map(getOrder -> new GetOrderImg(getOrder.getOrderImgIdx(), getOrder.getImgUrl())).collect(Collectors.toList());
+        return orderImgs;
+    }
+
+    // 주문 옵션 불러오기
+    private List<GetOptionOrder> getOptionOrders(Order order) {
+        List<GetOptionOrder> optionOrders = optionOrderRepository.findByOrderAndStatusEquals(order, ACTIVE_STATUS).stream()
+                .map(getOptionOrder -> new GetOptionOrder(getOptionOrder.getOption().getOptionIdx(), getOptionOrder.getOption().getDescription(), getOptionOrder.getOption().getPrice())).collect(Collectors.toList());
+        return optionOrders;
+    }
+
+    // 주문 조회
+    public GetOrderStore getStoreDessertsAndOptions(Long storeIdx) throws BaseException{
+        Store store = this.storeRepository.findByStoreIdxAndStatus(storeIdx, ACTIVE_STATUS).orElseThrow(() -> new BaseException(INVALID_STORE_IDX));
+        // TODO: 아직 판매자 계좌 번호 저장 이전
+        return new GetOrderStore(store.getStoreIdx(), store.getUser().getNickname(),
+                null, store.getAddress(),getStoreDessertAndOptionList(store));
+     }
+
+     // 판매자 디저트 + 옵션 불러오기
+    private List<GetStoreDessertAndOptions> getStoreDessertAndOptionList(Store store) throws BaseException{
+        List<Dessert> desserts = this.dessertRepository.findByStoreAndStatusOrderByDessertIdx(store, ACTIVE_STATUS);
+        List<GetStoreDessertAndOptions> dessertsAndOptions = new ArrayList<>();
+        // 디저트 별의 option 들을 찾아서 한번에 저장하는 것이 필요함.
+        for (Dessert dessert: desserts){
+            dessertsAndOptions.add(new GetStoreDessertAndOptions(dessert.getDessertIdx(), dessert.getDessertName(), dessert.getDessertPrice(),
+                    this.optionRepository.findByDessertAndStatusOrderByOptionIdx(dessert, ACTIVE_STATUS).stream()
+                            .map(option -> new OptionDTO(option.getOptionIdx(), option.getDescription(), option.getPrice())).collect(Collectors.toList())));
+        }
+        return dessertsAndOptions;
+    }
+
+    // 주문 내역 조회
+    public GetOrderHistoryRes getOrderHistory(Long userIdx, GetOrderHistoryReq orderStatusReq) throws BaseException {
+        User user = userRepository.findByUserIdxAndStatusEquals(userIdx, ACTIVE_STATUS).orElseThrow(() -> new BaseException(INVALID_USER_IDX));
+        Role role = getRoleByName(user.getRole());
+        OrderStatus orderStatus = getOrderStatusByName(orderStatusReq.getOrderStatus());
+        Optional<List<Order>> orders = null;
+        List<GetOrderHistory> orderHistories = null;
+        NumOfOrder numOfOrder = getCountByOrderStatus(user);
+
+        if (role == CUSTOMER) {
+            if (orderStatus == null) orders = orderRepository.findAllByUserOrderByPickupDateDesc(user);
+            else orders = orderRepository.findAllByUserAndOrderStatusEqualsOrderByPickupDateDesc(user, orderStatus);
+            orderHistories = orders.orElseThrow(null).stream().map(oH -> new GetOrderHistory(oH.getOrderIdx(), oH.getStore().getUser().getNickname(), oH.getStore().getUser().getProfileImg(),
+                    oH.getTotalPrice(), oH.getDessert().getDessertName(), oH.getPickupDate())).collect(Collectors.toList());
+        } else if (role == STORE) {
+            if (orderStatus == null) orders = orderRepository.findAllByStore_UserOrderByPickupDateDesc(user);
+            else orders = orderRepository.findAllByStore_UserAndOrderStatusEqualsOrderByPickupDateDesc(user, orderStatus);
+            orderHistories = orders.orElseThrow(null).stream().map(oH -> new GetOrderHistory(oH.getOrderIdx(), oH.getUser().getNickname(), oH.getUser().getProfileImg(),
+                    oH.getTotalPrice(), oH.getDessert().getDessertName(), oH.getPickupDate())).collect(Collectors.toList());
+        } else throw new BaseException(INVALID_USER_IDX);
+
+        return new GetOrderHistoryRes(numOfOrder.getOrderWaiting(), numOfOrder.getProgressing(), numOfOrder.getPickupWaiting(), numOfOrder.getAllOrderHistory(), orderHistories);
+    }
+
+    // 주문 상태 별 주문 수
+    public NumOfOrder getCountByOrderStatus(User user) throws BaseException{
+        NumOfOrder numOfOrder = new NumOfOrder();
+        if (getRoleByName(user.getRole()) == CUSTOMER) {
+            numOfOrder.setOrderWaiting(orderRepository.countByUserAndOrderStatusEquals(user, ORDER_WAITING));
+            numOfOrder.setProgressing(orderRepository.countByUserAndOrderStatusEquals(user, PROGRESSING));
+            numOfOrder.setPickupWaiting(orderRepository.countByUserAndOrderStatusEquals(user, PICKUP_WAITING));
+            numOfOrder.setAllOrderHistory(orderRepository.countAllByUser(user));
+        } else if (getRoleByName(user.getRole()) == STORE) {
+            numOfOrder.setOrderWaiting(orderRepository.countByStore_UserAndOrderStatusEquals(user, ORDER_WAITING));
+            numOfOrder.setProgressing(orderRepository.countByStore_UserAndOrderStatusEquals(user, PROGRESSING));
+            numOfOrder.setPickupWaiting(orderRepository.countByStore_UserAndOrderStatusEquals(user, PICKUP_WAITING));
+            numOfOrder.setAllOrderHistory(orderRepository.countAllByStore_User(user));
+        } else throw new BaseException(INVALID_USER_IDX);
+        return numOfOrder;
+    }
+
+    // 주문 수정 조회
+    public GetEditOrder getEditOrderView(Long orderIdx, Long userIdx) throws BaseException{
+        User user = userRepository.findByUserIdxAndStatusEquals(userIdx, ACTIVE_STATUS).orElseThrow(() -> new BaseException(INVALID_USER_IDX));
+        Order order = orderRepository.findById(orderIdx).orElseThrow(() -> new BaseException(INVALID_ORDER_IDX));
+        if(!order.getUser().equals(user)) throw new BaseException(NO_MATCH_ORDER_USER);
+        if(!order.getOrderStatus().equals(ORDER_WAITING)) throw new BaseException(NO_MATCH_ORDER_STATUS);
+
+        return new GetEditOrder(this.getOrderByUser(order), this.getStoreDessertAndOptionList(order.getStore()));
+    }
 }
diff --git a/src/main/java/com/codepatissier/keki/user/dto/GetProfileRes.java b/src/main/java/com/codepatissier/keki/user/dto/GetProfileRes.java
index 98396f5..19adbdf 100644
--- a/src/main/java/com/codepatissier/keki/user/dto/GetProfileRes.java
+++ b/src/main/java/com/codepatissier/keki/user/dto/GetProfileRes.java
@@ -1,7 +1,10 @@
 package com.codepatissier.keki.user.dto;
 
 
+import com.codepatissier.keki.order.dto.NumOfOrder;
+import com.codepatissier.keki.user.entity.User;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import lombok.RequiredArgsConstructor;
 
 @Data
@@ -10,11 +13,16 @@ public class GetProfileRes {
     private String email;
     private String nickname;
     private String profileImg;
+    private int orderWaiting;
+    private int progressing;
+    private int pickupWaiting;
 
-
-    public GetProfileRes(String email, String nickname, String profileImg) {
-        this.email = email;
-        this.nickname = nickname;
-        this.profileImg = profileImg;
+    public GetProfileRes(User user, NumOfOrder numOfOrder) {
+        this.email = user.getEmail();
+        this.nickname = user.getNickname();
+        this.profileImg = user.getProfileImg();
+        this.orderWaiting = numOfOrder.getOrderWaiting();
+        this.progressing = numOfOrder.getProgressing();
+        this.pickupWaiting = numOfOrder.getPickupWaiting();
     }
 }
diff --git a/src/main/java/com/codepatissier/keki/user/service/UserService.java b/src/main/java/com/codepatissier/keki/user/service/UserService.java
index bbfe8e9..8a31165 100644
--- a/src/main/java/com/codepatissier/keki/user/service/UserService.java
+++ b/src/main/java/com/codepatissier/keki/user/service/UserService.java
@@ -4,6 +4,8 @@
 import com.codepatissier.keki.common.BaseResponseStatus;
 import com.codepatissier.keki.common.Constant;
 import com.codepatissier.keki.common.Role;
+import com.codepatissier.keki.order.dto.NumOfOrder;
+import com.codepatissier.keki.order.service.OrderService;
 import com.codepatissier.keki.user.dto.*;
 import com.codepatissier.keki.user.entity.Provider;
 import com.codepatissier.keki.user.entity.User;
@@ -22,6 +24,7 @@
 public class UserService {
     private final UserRepository userRepository;
     private final AuthService authService;
+    private final OrderService orderService;
 
     // 로그인
     public PostUserRes login(String email, String provider) throws BaseException{
@@ -84,7 +87,9 @@ public void checkNickname(PostNicknameReq postNicknameReq) throws BaseException{
     public GetProfileRes getProfile() throws BaseException {
         Long userIdx = authService.getUserIdx();
         User user = userRepository.findByUserIdxAndStatusEquals(userIdx, ACTIVE_STATUS).orElseThrow(() -> new BaseException(INVALID_USER_IDX));
-        return new GetProfileRes(user.getEmail(), user.getNickname(), user.getProfileImg());}
+        NumOfOrder numOfOrder = orderService.getCountByOrderStatus(user);
+        return new GetProfileRes(user, numOfOrder);
+    }
 
     // 구매자 프로필 수정
     @Transactional