internal/logic/bundleLogic.go

@@ -405,28 +405,25 @@ func HandleShelf(req *bundle.HandShelfRequest) (res *bundle.CommonResponse, err
 	if req.ShelfStatus != 1 && req.ShelfStatus != 2 {
 		return res, errors.New("状态值无效")
 	}
-	if req.ShelfStatus == 1 {
+	valueAddUuids, err := dao.GetValueAddServiceUuidsByBundleUuid(res.Uuid)
-		valueAddUuids, err := dao.GetValueAddServiceUuidsByBundleUuid(req.Uuid)
+	if err != nil {
+		return res, errors.New("查询增值服务失败")
+	}
+	//判断时长类型是否存在
+	isExist := false
+	for _, valueUid := range valueAddUuids {
+		detail, err := dao.ValueAddServiceDetail(valueUid)
 		if err != nil {
 			return res, errors.New("查询增值服务失败")
 		}
-		//判断时长类型是否存在
+		if detail.ServiceType == 5 {
-		isExist := false
+			isExist = true
-		for _, valueUid := range valueAddUuids {
+			break
-			detail, err := dao.ValueAddServiceDetail(valueUid)
-			if err != nil {
-				return res, errors.New("查询增值服务失败")
-			}
-			if detail.ServiceType == 5 {
-				isExist = true
-				break
-			}
-		}
-		if !isExist {
-			return res, errors.New("缺失可用时长服务类型")
 		}
 	}
-
+	if !isExist {
+		return res, errors.New("缺失可用时长服务类型")
+	}
 	res, err = dao.HandShelf(req.Uuid, req.ShelfStatus)
 	if err != nil {
 		return res, errors.New("更新套餐状态失败")