From a2e4c2286f1a7ed296c6f7fd391943307192496c Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Tue, 28 May 2024 17:39:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8C=85=E8=AE=A2=E5=8D=95=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E6=9D=83=E7=9B=8A=E8=AF=A6=E6=83=85=20=E4=B8=AD1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/dao/orderServicePackageProduct.go | 5 ++---
 api/dto/OrderServicePackage.go        | 6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

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