internal/logic/bundleLogic.go

@@ -265,8 +265,7 @@ func BundleDetailV2(req *bundle.BundleDetailRequest) (res *bundle.BundleDetailRe
 	res = new(bundle.BundleDetailResponseV2)
 	bundleProfile := &bundle.BundleProfile{}
 	bundleProfileLangs := make([]*bundle.BundleProfileLang, 0)
-	selectValueAddServices := make([]*bundle.SelectValueAddService, 0)               //已选套餐服务
-	selectValueAdditionalServices := make([]*bundle.SelectValueAdditionalService, 0) //已选套餐可选附加服务
+	selectValueAddServices := make([]*bundle.SelectValueAddService, 0) //已选增值服务
 	if req.Uuid == "" {
 		return res, errors.New("缺少套餐UUID")
 	}
@@ -295,24 +294,13 @@ func BundleDetailV2(req *bundle.BundleDetailRequest) (res *bundle.BundleDetailRe
 				if err != nil {
 					return res, errors.New("查询增值服务失败")
 				}
-				switch valueAddService.BenefitsType {
-				case msg.Benefits:
-					selectValueAddService := &bundle.SelectValueAddService{
-						ValueAddUuid: valueAddService.ValueUid,
-						IsDisplay:    valueAddService.IsDisplay,
-						ServiceName:  valueAddDetail.ServiceName,
-						ServiceType:  valueAddDetail.ServiceType,
-					}
-					selectValueAddServices = append(selectValueAddServices, selectValueAddService)
-				case msg.OptionalBenefits:
-					selectValueAdditionalService := &bundle.SelectValueAdditionalService{
-						ValueAddUuid: valueAddService.ValueUid,
-						IsDisplay:    valueAddService.IsDisplay,
-						ServiceName:  valueAddDetail.ServiceName,
-						ServiceType:  valueAddDetail.ServiceType,
-					}
-					selectValueAdditionalServices = append(selectValueAdditionalServices, selectValueAdditionalService)
+				selectValueAddService := &bundle.SelectValueAddService{
+					ValueAddUuid: valueAddService.ValueUid,
+					IsDisplay:    valueAddService.IsDisplay,
+					ServiceName:  valueAddDetail.ServiceName,
+					ServiceType:  valueAddDetail.ServiceType,
 				}
+				selectValueAddServices = append(selectValueAddServices, selectValueAddService)
 			}
 		}
 		if len(detail.BundleProfileLang) > 0 {
@@ -341,9 +329,6 @@ func BundleDetailV2(req *bundle.BundleDetailRequest) (res *bundle.BundleDetailRe
 	if len(selectValueAddServices) > 0 {
 		bundleProfile.SelectValueAddService = selectValueAddServices
 	}
-	if len(selectValueAdditionalServices) > 0 {
-		bundleProfile.SelectValueAdditionalService = selectValueAdditionalServices
-	}
 	bundleProfile.BundleProfileLang = bundleProfileLangs
 	res.Bundle = bundleProfile
 	return