diff --git a/springcloud/apigateway-service/src/main/resources/application.yml b/springcloud/apigateway-service/src/main/resources/application.yml
index d6f4675d..b3bf703d 100644
--- a/springcloud/apigateway-service/src/main/resources/application.yml
+++ b/springcloud/apigateway-service/src/main/resources/application.yml
@@ -21,6 +21,10 @@ spring:
             preLogger: true
             postLogger: true
       routes:
+        - id: order-service
+          uri: lb://ORDER-SERVICE
+          predicates:
+            - Path=/order-service/**
         - id: catalog-service
           uri: lb://CATALOG-SERVICE
           predicates:
diff --git a/springcloud/catalog-service/src/main/java/com/example/catalogservice/entity/CatalogEntity.java b/springcloud/catalog-service/src/main/java/com/example/catalogservice/entity/CatalogEntity.java
index 8d854c5c..46a7ad64 100644
--- a/springcloud/catalog-service/src/main/java/com/example/catalogservice/entity/CatalogEntity.java
+++ b/springcloud/catalog-service/src/main/java/com/example/catalogservice/entity/CatalogEntity.java
@@ -12,7 +12,7 @@ import java.time.LocalDateTime;
 @Table(name = "catalog")
 public class CatalogEntity implements Serializable {
 
-    @Id @GeneratedValue(strategy = GenerationType.SEQUENCE)
+    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
     @Column(nullable = false, length = 120, unique = true)
diff --git a/springcloud/order-service/.gitignore b/springcloud/order-service/.gitignore
new file mode 100644
index 00000000..c2065bc2
--- /dev/null
+++ b/springcloud/order-service/.gitignore
@@ -0,0 +1,37 @@
+HELP.md
+.gradle
+build/
+!gradle/wrapper/gradle-wrapper.jar
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+bin/
+!**/src/main/**/bin/
+!**/src/test/**/bin/
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+out/
+!**/src/main/**/out/
+!**/src/test/**/out/
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+
+### VS Code ###
+.vscode/
diff --git a/springcloud/order-service/build.gradle b/springcloud/order-service/build.gradle
new file mode 100644
index 00000000..83a9507f
--- /dev/null
+++ b/springcloud/order-service/build.gradle
@@ -0,0 +1,48 @@
+plugins {
+    id 'org.springframework.boot' version '2.5.4'
+    id 'io.spring.dependency-management' version '1.0.11.RELEASE'
+    id 'java'
+}
+
+group = 'com.example'
+version = '0.0.1-SNAPSHOT'
+sourceCompatibility = '1.8'
+
+configurations {
+    compileOnly {
+        extendsFrom annotationProcessor
+    }
+}
+
+repositories {
+    mavenCentral()
+}
+
+ext {
+    set('springCloudVersion', "2020.0.3")
+}
+
+dependencies {
+    implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+    implementation 'org.springframework.boot:spring-boot-starter-web'
+    implementation 'org.springframework.cloud:spring-cloud-starter-netflix-eureka-client'
+    compileOnly 'org.projectlombok:lombok'
+    developmentOnly 'org.springframework.boot:spring-boot-devtools'
+
+    implementation group: 'org.modelmapper', name: 'modelmapper', version: '2.4.4'
+
+    runtimeOnly group: 'com.h2database', name: 'h2', version: '1.3.176'
+
+    annotationProcessor 'org.projectlombok:lombok'
+    testImplementation 'org.springframework.boot:spring-boot-starter-test'
+}
+
+dependencyManagement {
+    imports {
+        mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
+    }
+}
+
+test {
+    useJUnitPlatform()
+}
diff --git a/springcloud/order-service/gradle/wrapper/gradle-wrapper.jar b/springcloud/order-service/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000..7454180f
Binary files /dev/null and b/springcloud/order-service/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/springcloud/order-service/gradle/wrapper/gradle-wrapper.properties b/springcloud/order-service/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000..05679dc3
--- /dev/null
+++ b/springcloud/order-service/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/springcloud/order-service/gradlew b/springcloud/order-service/gradlew
new file mode 100755
index 00000000..744e882e
--- /dev/null
+++ b/springcloud/order-service/gradlew
@@ -0,0 +1,185 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MSYS* | MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"
diff --git a/springcloud/order-service/gradlew.bat b/springcloud/order-service/gradlew.bat
new file mode 100644
index 00000000..ac1b06f9
--- /dev/null
+++ b/springcloud/order-service/gradlew.bat
@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/springcloud/order-service/settings.gradle b/springcloud/order-service/settings.gradle
new file mode 100644
index 00000000..e73a26b1
--- /dev/null
+++ b/springcloud/order-service/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'order-service'
diff --git a/springcloud/order-service/src/main/java/com/example/orderservice/OrderServiceApplication.java b/springcloud/order-service/src/main/java/com/example/orderservice/OrderServiceApplication.java
new file mode 100644
index 00000000..860df882
--- /dev/null
+++ b/springcloud/order-service/src/main/java/com/example/orderservice/OrderServiceApplication.java
@@ -0,0 +1,13 @@
+package com.example.orderservice;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class OrderServiceApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(OrderServiceApplication.class, args);
+    }
+
+}
diff --git a/springcloud/order-service/src/main/java/com/example/orderservice/controller/OrderController.java b/springcloud/order-service/src/main/java/com/example/orderservice/controller/OrderController.java
new file mode 100644
index 00000000..865c42a4
--- /dev/null
+++ b/springcloud/order-service/src/main/java/com/example/orderservice/controller/OrderController.java
@@ -0,0 +1,55 @@
+package com.example.orderservice.controller;
+
+import com.example.orderservice.dto.OrderDto;
+import com.example.orderservice.entity.OrderEntity;
+import com.example.orderservice.service.OrderService;
+import com.example.orderservice.vo.RequestOrder;
+import com.example.orderservice.vo.ResponseOrder;
+import lombok.RequiredArgsConstructor;
+import org.modelmapper.ModelMapper;
+import org.modelmapper.convention.MatchingStrategies;
+import org.springframework.core.env.Environment;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.PostConstruct;
+import java.util.ArrayList;
+import java.util.List;
+
+@RestController
+@RequestMapping("/order-service")
+@RequiredArgsConstructor
+public class OrderController {
+
+    private final Environment env;
+    private final OrderService orderService;
+    private final ModelMapper mapper = new ModelMapper();
+
+    @PostConstruct
+    public void setMapper() {
+        mapper.getConfiguration().setMatchingStrategy(MatchingStrategies.STRICT);
+    }
+    @PostMapping("/{userId}/orders")
+    public ResponseEntity<ResponseOrder> createOrder(@PathVariable("userId") String userId,
+                                                     @RequestBody RequestOrder requestOrder) {
+
+        OrderDto orderDto = mapper.map(requestOrder, OrderDto.class);
+        orderDto.setUserId(userId);
+        OrderDto createdOrder = orderService.createOrder(orderDto);
+
+        ResponseOrder responseOrder = mapper.map(createdOrder, ResponseOrder.class);
+
+        return ResponseEntity.status(HttpStatus.CREATED).body(responseOrder);
+    }
+
+    @GetMapping("/{userId}/orders")
+    public ResponseEntity<List<ResponseOrder>> getOrders(@PathVariable("userId") String userId) {
+        List<OrderEntity> orders = orderService.getOrdersByUserId(userId);
+        List<ResponseOrder> result = new ArrayList<>();
+
+        orders.forEach(orderEntity -> result.add(mapper.map(orderEntity, ResponseOrder.class)));
+
+        return ResponseEntity.status(HttpStatus.OK).body(result);
+    }
+}
diff --git a/springcloud/order-service/src/main/java/com/example/orderservice/dto/OrderDto.java b/springcloud/order-service/src/main/java/com/example/orderservice/dto/OrderDto.java
new file mode 100644
index 00000000..98b3e5fc
--- /dev/null
+++ b/springcloud/order-service/src/main/java/com/example/orderservice/dto/OrderDto.java
@@ -0,0 +1,17 @@
+package com.example.orderservice.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class OrderDto implements Serializable {
+
+    private String productId;
+    private Integer qty;
+    private Integer unitPrice;
+    private Integer totalPrice;
+
+    private String orderId;
+    private String userId;
+}
diff --git a/springcloud/order-service/src/main/java/com/example/orderservice/entity/OrderEntity.java b/springcloud/order-service/src/main/java/com/example/orderservice/entity/OrderEntity.java
new file mode 100644
index 00000000..8498739d
--- /dev/null
+++ b/springcloud/order-service/src/main/java/com/example/orderservice/entity/OrderEntity.java
@@ -0,0 +1,39 @@
+package com.example.orderservice.entity;
+
+import lombok.Data;
+import org.hibernate.annotations.ColumnDefault;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+@Table(name = "orders")
+@Entity
+public class OrderEntity implements Serializable {
+
+    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(nullable = false, length = 120, unique = true)
+    private String productId;
+
+    @Column(nullable = false)
+    private Integer qty;
+
+    @Column(nullable = false)
+    private Integer unitPrice;
+
+    @Column(nullable = false)
+    private Integer totalPrice;
+
+    @Column(nullable = false)
+    private String userId;
+
+    @Column(nullable = false, unique = true)
+    private String orderId;
+
+    @Column(nullable = false, updatable = false, insertable = false)
+    @ColumnDefault(value = "CURRENT_TIMESTAMP")
+    private LocalDateTime createdAt;
+}
diff --git a/springcloud/order-service/src/main/java/com/example/orderservice/repository/OrderRepository.java b/springcloud/order-service/src/main/java/com/example/orderservice/repository/OrderRepository.java
new file mode 100644
index 00000000..a0a0bc3b
--- /dev/null
+++ b/springcloud/order-service/src/main/java/com/example/orderservice/repository/OrderRepository.java
@@ -0,0 +1,13 @@
+package com.example.orderservice.repository;
+
+import com.example.orderservice.entity.OrderEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.List;
+import java.util.Optional;
+
+public interface OrderRepository extends JpaRepository<OrderEntity, Long> {
+
+    Optional<OrderEntity> findByOrderId(String orderId);
+    List<OrderEntity> findByUserId(String userId);
+}
diff --git a/springcloud/order-service/src/main/java/com/example/orderservice/service/OrderService.java b/springcloud/order-service/src/main/java/com/example/orderservice/service/OrderService.java
new file mode 100644
index 00000000..acaee24b
--- /dev/null
+++ b/springcloud/order-service/src/main/java/com/example/orderservice/service/OrderService.java
@@ -0,0 +1,13 @@
+package com.example.orderservice.service;
+
+import com.example.orderservice.dto.OrderDto;
+import com.example.orderservice.entity.OrderEntity;
+
+import java.util.List;
+
+public interface OrderService {
+
+    OrderDto createOrder(OrderDto orderDto);
+    OrderDto getOrderByOrderId(String orderId);
+    List<OrderEntity> getOrdersByUserId(String userId);
+}
diff --git a/springcloud/order-service/src/main/java/com/example/orderservice/service/OrderServiceImpl.java b/springcloud/order-service/src/main/java/com/example/orderservice/service/OrderServiceImpl.java
new file mode 100644
index 00000000..94dfe47a
--- /dev/null
+++ b/springcloud/order-service/src/main/java/com/example/orderservice/service/OrderServiceImpl.java
@@ -0,0 +1,44 @@
+package com.example.orderservice.service;
+
+import com.example.orderservice.dto.OrderDto;
+import com.example.orderservice.entity.OrderEntity;
+import com.example.orderservice.repository.OrderRepository;
+import lombok.RequiredArgsConstructor;
+import org.modelmapper.ModelMapper;
+import org.modelmapper.convention.MatchingStrategies;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.UUID;
+
+@Service
+@RequiredArgsConstructor
+public class OrderServiceImpl implements OrderService {
+
+    private final ModelMapper mapper = new ModelMapper();
+    private final OrderRepository orderRepository;
+
+    @Override
+    public OrderDto createOrder(OrderDto orderDto) {
+        orderDto.setOrderId(UUID.randomUUID().toString());
+        orderDto.setTotalPrice(orderDto.getQty() * orderDto.getUnitPrice());
+
+        mapper.getConfiguration().setMatchingStrategy(MatchingStrategies.STRICT);
+        OrderEntity orderEntity = mapper.map(orderDto, OrderEntity.class);
+
+        orderRepository.save(orderEntity);
+        return mapper.map(orderEntity, OrderDto.class);
+    }
+
+    @Override
+    public OrderDto getOrderByOrderId(String orderId) {
+        OrderEntity orderEntity = orderRepository.findByOrderId(orderId)
+                .orElseThrow(() -> new RuntimeException("order not found"));
+         return mapper.map(orderEntity, OrderDto.class);
+    }
+
+    @Override
+    public List<OrderEntity> getOrdersByUserId(String userId) {
+        return orderRepository.findByUserId(userId);
+    }
+}
diff --git a/springcloud/order-service/src/main/java/com/example/orderservice/vo/RequestOrder.java b/springcloud/order-service/src/main/java/com/example/orderservice/vo/RequestOrder.java
new file mode 100644
index 00000000..0e05702e
--- /dev/null
+++ b/springcloud/order-service/src/main/java/com/example/orderservice/vo/RequestOrder.java
@@ -0,0 +1,11 @@
+package com.example.orderservice.vo;
+
+import lombok.Data;
+
+@Data
+public class RequestOrder {
+
+    private String productId;
+    private Integer qty;
+    private Integer unitPrice;
+}
diff --git a/springcloud/order-service/src/main/java/com/example/orderservice/vo/ResponseOrder.java b/springcloud/order-service/src/main/java/com/example/orderservice/vo/ResponseOrder.java
new file mode 100644
index 00000000..8cb0353c
--- /dev/null
+++ b/springcloud/order-service/src/main/java/com/example/orderservice/vo/ResponseOrder.java
@@ -0,0 +1,19 @@
+package com.example.orderservice.vo;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ResponseOrder {
+
+    private String productId;
+    private Integer qty;
+    private Integer unitPrice;
+    private Integer totalPrice;
+    private LocalDateTime createdAt;
+
+    private String orderId;
+}
diff --git a/springcloud/order-service/src/main/resources/application.yml b/springcloud/order-service/src/main/resources/application.yml
new file mode 100644
index 00000000..7cf15c70
--- /dev/null
+++ b/springcloud/order-service/src/main/resources/application.yml
@@ -0,0 +1,35 @@
+server:
+  port: 0
+
+spring:
+  application:
+    name: order-service
+  h2:
+    console:
+      enabled: true
+      settings:
+        web-allow-others: true
+      path: /h2-console
+  jpa:
+    hibernate:
+      ddl-auto: update
+    show-sql: true
+    generate-ddl: true
+  datasource:
+    driver-class-name: org.h2.Driver
+    url: jdbc:h2:mem:testdb
+    username: sa
+    password:
+
+eureka:
+  instance:
+    instance-id: ${spring.application.name}:${spring.application.instance_id:${random.value}}
+  client:
+    register-with-eureka: true
+    fetch-registry: true
+    service-url:
+      defaultZone: http://127.0.0.1:8761/eureka
+
+logging:
+  level:
+    com.example.orderservice: debug
\ No newline at end of file
diff --git a/springcloud/order-service/src/test/java/com/example/orderservice/OrderServiceApplicationTests.java b/springcloud/order-service/src/test/java/com/example/orderservice/OrderServiceApplicationTests.java
new file mode 100644
index 00000000..c706cba6
--- /dev/null
+++ b/springcloud/order-service/src/test/java/com/example/orderservice/OrderServiceApplicationTests.java
@@ -0,0 +1,13 @@
+package com.example.orderservice;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+class OrderServiceApplicationTests {
+
+    @Test
+    void contextLoads() {
+    }
+
+}