diff --git a/internal/data/db.go b/internal/data/db.go
index 4ad1e3b..a18626a 100644
--- a/internal/data/db.go
+++ b/internal/data/db.go
@@ -17,5 +17,4 @@ func NewDb(db *GormDb) *Db {
 
 func (d *Db) DB(_ context.Context) *gorm.DB {
 	return d.db.Client
-	//return d.db.Client.WithContext(ctx)
 }
diff --git a/internal/service/cmb_order.go b/internal/service/cmb_order.go
index be46ae9..f641bf9 100644
--- a/internal/service/cmb_order.go
+++ b/internal/service/cmb_order.go
@@ -49,13 +49,16 @@ func (c *CmbService) OrderFail(ctx context.Context, err error) (*v1.CmbReply, er
 
 func (c *CmbService) Order(ctx context.Context, request *v1.CmbRequest) (*v1.CmbReply, error) {
 
-	orderNo, err := c.order(ctx, request)
+	ctx2, cancel := context.WithCancel(ctx)
+	defer cancel()
+
+	orderNo, err := c.order(ctx2, request)
 
 	if err != nil {
-		return c.OrderFail(ctx, err)
+		return c.OrderFail(ctx2, err)
 	}
 
-	return c.OrderSuccess(ctx, orderNo)
+	return c.OrderSuccess(ctx2, orderNo)
 }
 
 func (c *CmbService) order(ctx context.Context, request *v1.CmbRequest) (string, error) {