diff --git a/internal/entity/order.go b/internal/entity/order.go index f94dc7a..5b14663 100644 --- a/internal/entity/order.go +++ b/internal/entity/order.go @@ -227,6 +227,7 @@ type PaymentTypeDistribution struct { type OrderPrintDetail struct { ID int64 `gorm:"column:id"` + Logo string `gorm:"logo"` PartnerName string `gorm:"column:partner_name"` OrderID string `gorm:"column:order_id"` VisitDate time.Time `gorm:"column:visit_date"` diff --git a/internal/handlers/http/order/order.go b/internal/handlers/http/order/order.go index 8d7ad24..5114add 100644 --- a/internal/handlers/http/order/order.go +++ b/internal/handlers/http/order/order.go @@ -466,5 +466,6 @@ func MapOrderToPrintDetailResponse(order *entity.OrderPrintDetail, casherName st OrderItems: orderItems, CasheerName: casherName, PartnerName: order.PartnerName, + Logo: order.Logo, } } diff --git a/internal/handlers/response/order.go b/internal/handlers/response/order.go index 51b38c5..b009b5a 100644 --- a/internal/handlers/response/order.go +++ b/internal/handlers/response/order.go @@ -98,6 +98,7 @@ type CreateOrderResponse struct { type PrintDetailResponse struct { ID int64 `json:"id"` + Logo string `json:"logo"` OrderID string `json:"order_id"` PartnerName string `json:"partner_name"` Total float64 `json:"total"` diff --git a/internal/repository/orders/order.go b/internal/repository/orders/order.go index c046945..afedceb 100644 --- a/internal/repository/orders/order.go +++ b/internal/repository/orders/order.go @@ -69,7 +69,7 @@ func (r *OrderRepository) FindPrintDetailByID(ctx context.Context, id int64) (*e err := r.db.WithContext(ctx). Table("orders"). - Select("orders.id, partners.name as partner_name, orders.ref_id as order_id, "+ + Select("orders.id, partners.name as partner_name, partners.logo as logo, orders.ref_id as order_id, "+ "orders.visit_date, orders.payment_type, orders.source, "+ "orders.ticket_status, orders.total, orders.fee"). Joins("JOIN partners ON partners.id = orders.partner_id").