From ea97628dedaeaa4e7b14009e5d82a2b155f0e476 Mon Sep 17 00:00:00 2001
From: wangxinyu <wangxinyu4585@163.com>
Date: Fri, 20 Dec 2024 17:11:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=9A=E5=91=98=E7=9C=8B=E5=8E=9F?=
 =?UTF-8?q?=E5=9B=BE=EF=BC=8C=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=84=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/proto/previews/proto/image_api.go | 4 ++--
 app/mix/controller/image.go           | 8 ++++++++
 app/mix/service/apiservice.go         | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/api/proto/previews/proto/image_api.go b/api/proto/previews/proto/image_api.go
index 1b6fac6a..11218582 100644
--- a/api/proto/previews/proto/image_api.go
+++ b/api/proto/previews/proto/image_api.go
@@ -11,10 +11,10 @@ type ApiOriginalImageReq struct {
 }
 
 type ApiOriginalImageData struct {
-	Images []*dbstruct.ToCImage `json:"images"`
+	*dbstruct.ToCImage
 }
 
 type ApiOriginalImageResp struct {
 	base.BaseResponse
-	*ApiOriginalImageData `json:"data"`
+	Data *ApiOriginalImageData `json:"data"`
 }
diff --git a/app/mix/controller/image.go b/app/mix/controller/image.go
index 39426369..db6b50ad 100644
--- a/app/mix/controller/image.go
+++ b/app/mix/controller/image.go
@@ -14,12 +14,20 @@ func ApiGetOriginalImage(ctx *gin.Context) {
 	if req.ImageId <= 0 {
 		logger.Error(" ApiGetOriginalImage, invalid param, req: %v", util.ToJson(req))
 		ReplyErrCodeMsg(ctx, errcode.ErrCodeBadParam)
+		return
 	}
 
 	data, err, ec := service.DefaultService.ApiGetOriginalImage(ctx, req)
 	if err != nil {
 		logger.Error("image ApiGetOriginalImage ApiGetOriginalImage err, req: %v", util.ToJson(req))
 		ReplyErrCodeMsg(ctx, ec)
+		return
+	}
+
+	if ec == errcode.ErrCodeImageOriginalVipView {
+		logger.Info("ApiGetOriginalImage user is not vip, req: %v", util.ToJson(req))
+		ReplyErrCodeMsg(ctx, errcode.ErrCodeImageOriginalVipView)
+		return
 	}
 
 	ReplyOk(ctx, data)
diff --git a/app/mix/service/apiservice.go b/app/mix/service/apiservice.go
index 8ef603d2..c94d2145 100644
--- a/app/mix/service/apiservice.go
+++ b/app/mix/service/apiservice.go
@@ -4497,7 +4497,7 @@ func (s *Service) ApiGetOriginalImage(ctx *gin.Context, req *previewsproto.ApiOr
 	}
 
 	data := &previewsproto.ApiOriginalImageData{
-		Images: images,
+		ToCImage: images[0],
 	}
 
 	return data, err, ec