diff --git a/internal/logic/bundleLogic.go b/internal/logic/bundleLogic.go index c45ff65..e303451 100644 --- a/internal/logic/bundleLogic.go +++ b/internal/logic/bundleLogic.go @@ -71,6 +71,7 @@ func SaveBundle(req *bundle.BundleProfile) (res *bundle.SaveResponse, err error) Content: req.Content, Price: req.Price, PriceType: req.PriceType, + Contract: "https://e-cdn.fontree.cn/fonchain-main/prod/file/saas/contract/template-25032801.pdf", BgImg1: req.BgImg1, BgImg2: req.BgImg2, ShelfStatus: 2, //默认初始状态为2-下架 @@ -309,7 +310,7 @@ func BundleDetailV2(req *bundle.BundleDetailRequest) (res *bundle.BundleDetailRe res = new(bundle.BundleDetailResponseV2) bundleProfile := &bundle.BundleProfile{} bundleProfileLangs := make([]*bundle.BundleProfileLang, 0) - selectValueAddService := make([]*bundle.SelectValueAddService, 0) //已选增值服务 + selectValueAddServices := make([]*bundle.SelectValueAddService, 0) //已选增值服务 if req.Uuid == "" { return res, errors.New("uuid不能为空") } @@ -333,6 +334,15 @@ func BundleDetailV2(req *bundle.BundleDetailRequest) (res *bundle.BundleDetailRe bundleProfile.CreatedAt = detail.CreatedAt.Format("2006-01-02 15:04:05") bundleProfile.UpdatedAt = detail.UpdatedAt.Format("2006-01-02 15:04:05") bundleProfile.Contract = detail.Contract + if detail.BundleToValueAddService != nil && len(detail.BundleToValueAddService) > 0 { + for _, valueAddService := range detail.BundleToValueAddService { + selectValueAddService := &bundle.SelectValueAddService{ + ValueAddUuid: valueAddService.ValueUid, + IsDisplay: valueAddService.IsDisplay, + } + selectValueAddServices = append(selectValueAddServices, selectValueAddService) + } + } for _, lang := range detail.BundleProfileLang { bundleProfileLang := &bundle.BundleProfileLang{ Uuid: lang.UUID, @@ -345,39 +355,39 @@ func BundleDetailV2(req *bundle.BundleDetailRequest) (res *bundle.BundleDetailRe 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, - }) - } - } + // 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 selectValueAddService != nil && len(selectValueAddService) > 0 { - bundleProfile.SelectValueAddService = selectValueAddService + if selectValueAddServices != nil && len(selectValueAddServices) > 0 { + bundleProfile.SelectValueAddService = selectValueAddServices } bundleProfile.BundleProfileLang = bundleProfileLangs res.Bundle = bundleProfile