diff --git a/api/dao/orderServicePackageProduct.go b/api/dao/orderServicePackageProduct.go index 0cc789d..c5dde9e 100644 --- a/api/dao/orderServicePackageProduct.go +++ b/api/dao/orderServicePackageProduct.go @@ -29,9 +29,8 @@ func (r *OrderServicePackageProductDao) GetOrderServicePackageProductPreloadById } // GetOrderServicePackageProductPreloadByOrderServiceId 获取数据 -func (r *OrderServicePackageProductDao) GetOrderServicePackageProductPreloadByOrderServiceId(orderServiceId int64) (m []*model. - OrderServicePackageProduct, err error) { - err = global.Db.Where("order_service_id = ?", orderServiceId).Find(&m).Error +func (r *OrderServicePackageProductDao) GetOrderServicePackageProductPreloadByOrderServiceId(orderServiceId int64) (m []*model.OrderServicePackageProduct, err error) { + err = global.Db.Preload(clause.Associations).Where("order_service_id = ?", orderServiceId).Find(&m).Error if err != nil { return nil, err } diff --git a/api/dto/OrderServicePackage.go b/api/dto/OrderServicePackage.go index 8901f88..2de95e5 100644 --- a/api/dto/OrderServicePackage.go +++ b/api/dto/OrderServicePackage.go @@ -231,10 +231,10 @@ func (r *OrderServicePackageDetailInfoDto) LoadOrderServicePackageProduct(m []*m if len(m) > 0 { responses := make([]*OrderProductDto, len(m)) - for i, inquiry := range m { - if inquiry.OrderProduct != nil { + for i, product := range m { + if product.OrderProduct != nil { // 将转换后的结构体添加到新切片中 - response := GetOrderProductDto(inquiry.OrderProduct) + response := GetOrderProductDto(product.OrderProduct) // 将转换后的结构体添加到新切片中 responses[i] = response