diff --git a/internal/logic/bundleLogic.go b/internal/logic/bundleLogic.go index 49eb791..79c979f 100644 --- a/internal/logic/bundleLogic.go +++ b/internal/logic/bundleLogic.go @@ -321,7 +321,7 @@ func BundleDetailV2(req *bundle.BundleDetailRequest) (res *bundle.BundleDetailRe if err != nil { res.Msg = err.Error() } - if detail != nil && detail.BundleProfileLang != nil && len(detail.BundleProfileLang) > 0 { + if detail != nil { bundleProfile.Uuid = detail.UUID bundleProfile.Name = detail.Name bundleProfile.Content = detail.Content @@ -343,46 +343,48 @@ func BundleDetailV2(req *bundle.BundleDetailRequest) (res *bundle.BundleDetailRe selectValueAddServices = append(selectValueAddServices, selectValueAddService) } } - for _, lang := range detail.BundleProfileLang { - bundleProfileLang := &bundle.BundleProfileLang{ - Uuid: lang.UUID, - Name: lang.Name, - Price: lang.Price, - PriceType: lang.PriceType, - Content: lang.Content, - Language: lang.Language, - CreatedAt: time.Unix(lang.CreatedAt, 0).Format("2006-01-02 15:04:05"), - UpdatedAt: time.Unix(int64(lang.UpdatedAt), 0).Format("2006-01-02 15:04:05"), + if detail.BundleProfileLang != nil && len(detail.BundleProfileLang) > 0 { + for _, lang := range detail.BundleProfileLang { + bundleProfileLang := &bundle.BundleProfileLang{ + Uuid: lang.UUID, + Name: lang.Name, + Price: lang.Price, + PriceType: lang.PriceType, + Content: lang.Content, + Language: lang.Language, + CreatedAt: time.Unix(lang.CreatedAt, 0).Format("2006-01-02 15:04:05"), + UpdatedAt: time.Unix(int64(lang.UpdatedAt), 0).Format("2006-01-02 15:04:05"), + } + // 通过中间表拼接增值服务数据 + // if detail.BundleToValueAddService != nil && len(detail.BundleToValueAddService) > 0 { + // for _, valueAddService := range detail.BundleToValueAddService { + // valueAddDeatilData, err := dao.ValueAddServiceDetailByUuidAndLanguage(valueAddService.ValueUid, bundleProfileLang.Language) + // if err != nil { + // return res, err + // } + //if valueAddService.IsDisplay{} + // ValueAddServiceLang := &bundle.ValueAddServiceLang{ + // Uuid: valueAddDeatilData.UUID, + // ServiceName: valueAddDeatilData.ServiceName, + // ServiceType: int32(valueAddDeatilData.ServiceType), + // PriceMode: int32(valueAddDeatilData.PriceMode), + // PriceType: int64(valueAddDeatilData.PriceType), + // OriginalPrice: fmt.Sprintf("%.2f", float32(valueAddDeatilData.OriginalPrice)), + // Unit: string(valueAddDeatilData.Unit), + // Language: valueAddDeatilData.Language, + // CreatedAt: time.Unix(valueAddDeatilData.CreatedAt, 0).Format("2006-01-02 15:04:05"), + // UpdatedAt: time.Unix(valueAddDeatilData.UpdatedAt, 0).Format("2006-01-02 15:04:05"), + // } + //bundleProfileLang.ValueAddServiceLang = append(bundleProfileLang.ValueAddServiceLang, ValueAddServiceLang) + // selectValueAddService = append(selectValueAddService, &bundle.SelectValueAddService{ + // ValueAddUuid: valueAddService.ValueUid, + // ServiceName: valueAddDeatilData.ServiceName, + // IsDisplay: valueAddService.IsDisplay, + // }) + // } + // } + bundleProfileLangs = append(bundleProfileLangs, bundleProfileLang) } - // 通过中间表拼接增值服务数据 - // if detail.BundleToValueAddService != nil && len(detail.BundleToValueAddService) > 0 { - // for _, valueAddService := range detail.BundleToValueAddService { - // valueAddDeatilData, err := dao.ValueAddServiceDetailByUuidAndLanguage(valueAddService.ValueUid, bundleProfileLang.Language) - // if err != nil { - // return res, err - // } - //if valueAddService.IsDisplay{} - // ValueAddServiceLang := &bundle.ValueAddServiceLang{ - // Uuid: valueAddDeatilData.UUID, - // ServiceName: valueAddDeatilData.ServiceName, - // ServiceType: int32(valueAddDeatilData.ServiceType), - // PriceMode: int32(valueAddDeatilData.PriceMode), - // PriceType: int64(valueAddDeatilData.PriceType), - // OriginalPrice: fmt.Sprintf("%.2f", float32(valueAddDeatilData.OriginalPrice)), - // Unit: string(valueAddDeatilData.Unit), - // Language: valueAddDeatilData.Language, - // CreatedAt: time.Unix(valueAddDeatilData.CreatedAt, 0).Format("2006-01-02 15:04:05"), - // UpdatedAt: time.Unix(valueAddDeatilData.UpdatedAt, 0).Format("2006-01-02 15:04:05"), - // } - //bundleProfileLang.ValueAddServiceLang = append(bundleProfileLang.ValueAddServiceLang, ValueAddServiceLang) - // selectValueAddService = append(selectValueAddService, &bundle.SelectValueAddService{ - // ValueAddUuid: valueAddService.ValueUid, - // ServiceName: valueAddDeatilData.ServiceName, - // IsDisplay: valueAddService.IsDisplay, - // }) - // } - // } - bundleProfileLangs = append(bundleProfileLangs, bundleProfileLang) } }