update Order History
This commit is contained in:
@@ -83,7 +83,7 @@ func (r *OrderRepository) Update(ctx context.Context, order *entity.Order) (*ent
|
||||
return order, nil
|
||||
}
|
||||
|
||||
func (b *OrderRepository) GetAllHystoryOrders(ctx context.Context, claims entity.JWTAuthClaims, req entity.HistoryOrderSearch) (entity.HistoryOrderList, int, error) {
|
||||
func (b *OrderRepository) GetAllHystoryOrders(ctx context.Context, req entity.HistoryOrderSearch) (entity.HistoryOrderList, int, error) {
|
||||
var orders []*entity.HistoryOrderDB
|
||||
var total int64
|
||||
|
||||
@@ -94,8 +94,8 @@ func (b *OrderRepository) GetAllHystoryOrders(ctx context.Context, claims entity
|
||||
Joins("left join partners on orders.partner_id = partners.id").
|
||||
Joins("left join sites on partners.id = sites.partner_id")
|
||||
|
||||
if claims.Role == 3 {
|
||||
query = query.Where("orders.partner_id = ?", claims.PartnerID)
|
||||
if !req.IsAdmin {
|
||||
query = query.Where("orders.partner_id = ?", req.PartnerID)
|
||||
}
|
||||
|
||||
query = query.Group("orders.id, users.name, sites.name, orders.created_at, orders.payment_type, orders.status")
|
||||
|
||||
@@ -130,7 +130,7 @@ type Order interface {
|
||||
FindByID(ctx context.Context, id int64) (*entity.Order, error)
|
||||
Update(ctx context.Context, order *entity.Order) (*entity.Order, error)
|
||||
SetOrderStatus(ctx context.Context, db *gorm.DB, orderID int64, status string) error
|
||||
GetAllHystoryOrders(ctx context.Context, claims entity.JWTAuthClaims, req entity.HistoryOrderSearch) (entity.HistoryOrderList, int, error)
|
||||
GetAllHystoryOrders(ctx context.Context, req entity.HistoryOrderSearch) (entity.HistoryOrderList, int, error)
|
||||
}
|
||||
|
||||
type OSSRepository interface {
|
||||
|
||||
Reference in New Issue
Block a user