gdxz/hospital-admin-api
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修正 获取服务包订单服务权益详情 中

Browse Source
This commit is contained in:
wucongxing8150 2024-05-28 14:59:04 +08:00
parent 061c91c686
commit 3e381fdd43
2 changed files with 49 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
api/dto/OrderServicePackage.go
View File

@ -62,8 +62,8 @@ type OrderServicePackageDetailInfoDto struct {
StartTime model.LocalTime `json:"start_time"` // 开始服务时间 StartTime model.LocalTime `json:"start_time"` // 开始服务时间
FinishTime model.LocalTime `json:"finish_time"` // 结束服务时间 FinishTime model.LocalTime `json:"finish_time"` // 结束服务时间
CreatedAt model.LocalTime `json:"created_at"` // 创建时间 CreatedAt model.LocalTime `json:"created_at"` // 创建时间
OrderServicePackageProduct []*OrderServicePackageProductDto `json:"order_service_package_product"` // 关联商品订单 OrderProduct []*OrderProductDto `json:"order_product"` // 关联商品订单
OrderServicePackageInquiry []*OrderServicePackageInquiryDto `json:"order_service_package_inquiry"` // 关联问诊订单 OrderInquiry []*OrderInquiryDto `json:"order_inquiry"` // 关联问诊订单
UserCoupon []*UserCouponDto `json:"user_coupon"` // 关联优惠卷 UserCoupon []*UserCouponDto `json:"user_coupon"` // 关联优惠卷
OrderServicePackageDetail *OrderServicePackageDetailDto `json:"order_service_package_detail"` // 服务包订单详情 OrderServicePackageDetail *OrderServicePackageDetailDto `json:"order_service_package_detail"` // 服务包订单详情
CurrentMonthStartDate string `json:"current_month_start_date"` // 当月开始时间 CurrentMonthStartDate string `json:"current_month_start_date"` // 当月开始时间
@ -229,9 +229,19 @@ func (r *OrderServicePackageDto) LoadMaskOrderServicePackageCase(m *model.OrderS
// LoadOrderServicePackageProduct 加载关联商品订单 // LoadOrderServicePackageProduct 加载关联商品订单
func (r *OrderServicePackageDetailInfoDto) LoadOrderServicePackageProduct(m []*model.OrderServicePackageProduct) *OrderServicePackageDetailInfoDto { func (r *OrderServicePackageDetailInfoDto) LoadOrderServicePackageProduct(m []*model.OrderServicePackageProduct) *OrderServicePackageDetailInfoDto {
if len(m) > 0 { if len(m) > 0 {
d := GetOrderServicePackageProductListDto(m) responses := make([]*OrderProductDto, len(m))
r.OrderServicePackageProduct = d for i, inquiry := range m {
if inquiry.OrderProduct != nil {
// 将转换后的结构体添加到新切片中
response := GetOrderProductDto(inquiry.OrderProduct)
// 将转换后的结构体添加到新切片中
responses[i] = response
}
}
r.OrderProduct = responses
} }
return r return r
} }
@ -239,9 +249,19 @@ func (r *OrderServicePackageDetailInfoDto) LoadOrderServicePackageProduct(m []*m
// LoadOrderServicePackageInquiry 加载关联问诊订单 // LoadOrderServicePackageInquiry 加载关联问诊订单
func (r *OrderServicePackageDetailInfoDto) LoadOrderServicePackageInquiry(m []*model.OrderServicePackageInquiry) *OrderServicePackageDetailInfoDto { func (r *OrderServicePackageDetailInfoDto) LoadOrderServicePackageInquiry(m []*model.OrderServicePackageInquiry) *OrderServicePackageDetailInfoDto {
if len(m) > 0 { if len(m) > 0 {
d := GetOrderServicePackageInquiryListDto(m) responses := make([]*OrderInquiryDto, len(m))
r.OrderServicePackageInquiry = d for i, inquiry := range m {
if inquiry.OrderInquiry != nil {
// 将转换后的结构体添加到新切片中
response := GetOrderInquiryDto(inquiry.OrderInquiry)
// 将转换后的结构体添加到新切片中
responses[i] = response
}
}
r.OrderInquiry = responses
} }
return r return r
} }

2
api/service/orderServicePackage.go
View File

@ -78,7 +78,9 @@ func (r *OrderServicePackageService) GetOrderServicePackageDetailInfo(orderServi
g = dto.GetOrderServicePackageDetailInfoDto(orderServicePackage) g = dto.GetOrderServicePackageDetailInfoDto(orderServicePackage)
// 加载关联问诊订单数据 // 加载关联问诊订单数据
if len(orderServicePackageInquiry) > 0 {
g.LoadOrderServicePackageInquiry(orderServicePackageInquiry) g.LoadOrderServicePackageInquiry(orderServicePackageInquiry)
}
// 加载服务包订单详情数据 // 加载服务包订单详情数据
g.LoadOrderServicePackageDetail(orderServicePackageDetail) g.LoadOrderServicePackageDetail(orderServicePackageDetail)