修复店铺名不存在的问题
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 7m29s
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 7m29s
This commit is contained in:
@@ -35,7 +35,11 @@ func (s *RefundStore) Create(ctx context.Context, req *model.RefundRequest) erro
|
||||
// GetByID 根据 ID 查询退款申请(含数据权限过滤)
|
||||
func (s *RefundStore) GetByID(ctx context.Context, id uint) (*model.RefundRequest, error) {
|
||||
var req model.RefundRequest
|
||||
query := s.db.WithContext(ctx).Where("id = ?", id)
|
||||
query := s.db.WithContext(ctx).
|
||||
Model(&model.RefundRequest{}).
|
||||
Select("tb_refund_request.*, tb_shop.shop_name AS shop_name").
|
||||
Joins("LEFT JOIN tb_shop ON tb_shop.id = tb_refund_request.shop_id AND tb_shop.deleted_at IS NULL").
|
||||
Where("tb_refund_request.id = ?", id)
|
||||
query = middleware.ApplyShopFilter(ctx, query)
|
||||
if err := query.First(&req).Error; err != nil {
|
||||
return nil, err
|
||||
@@ -61,18 +65,21 @@ func (s *RefundStore) List(ctx context.Context, opts *store.QueryOptions, filter
|
||||
var requests []*model.RefundRequest
|
||||
var total int64
|
||||
|
||||
query := s.db.WithContext(ctx).Model(&model.RefundRequest{})
|
||||
query := s.db.WithContext(ctx).
|
||||
Model(&model.RefundRequest{}).
|
||||
Select("tb_refund_request.*, tb_shop.shop_name AS shop_name").
|
||||
Joins("LEFT JOIN tb_shop ON tb_shop.id = tb_refund_request.shop_id AND tb_shop.deleted_at IS NULL")
|
||||
query = middleware.ApplyShopFilter(ctx, query)
|
||||
|
||||
if filters != nil {
|
||||
if filters.Status != nil {
|
||||
query = query.Where("status = ?", *filters.Status)
|
||||
query = query.Where("tb_refund_request.status = ?", *filters.Status)
|
||||
}
|
||||
if filters.OrderID != nil {
|
||||
query = query.Where("order_id = ?", *filters.OrderID)
|
||||
query = query.Where("tb_refund_request.order_id = ?", *filters.OrderID)
|
||||
}
|
||||
if filters.ShopID != nil {
|
||||
query = query.Where("shop_id = ?", *filters.ShopID)
|
||||
query = query.Where("tb_refund_request.shop_id = ?", *filters.ShopID)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -92,7 +99,7 @@ func (s *RefundStore) List(ctx context.Context, opts *store.QueryOptions, filter
|
||||
if opts.OrderBy != "" {
|
||||
query = query.Order(opts.OrderBy)
|
||||
} else {
|
||||
query = query.Order("created_at DESC")
|
||||
query = query.Order("tb_refund_request.created_at DESC")
|
||||
}
|
||||
|
||||
if err := query.Find(&requests).Error; err != nil {
|
||||
|
||||
Reference in New Issue
Block a user