Merge branch 'feature-pay_picture-wxy-20241216' into test

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"`
 }

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)

app/mix/service/apiservice.go

@@ -4942,7 +4942,7 @@ func (s *Service) ApiGetOriginalImage(ctx *gin.Context, req *previewsproto.ApiOr
 	}
 
 	data := &previewsproto.ApiOriginalImageData{
-		Images: images,
+		ToCImage: images[0],
 	}
 
 	return data, err, ec