From 5fef6272c36b396fef76954ed661a981572e4a1c Mon Sep 17 00:00:00 2001 From: "jiaji.H" Date: Wed, 11 Mar 2026 19:31:13 +0800 Subject: [PATCH] =?UTF-8?q?Updata=EF=BC=9A=E5=A2=9E=E5=8A=A0=E4=B8=AD?= =?UTF-8?q?=E9=97=B4=E6=95=B0=E6=8D=AE=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/logic/questionnaire_survey.go | 6 ++++-- internal/model/questionnaire_survey.go | 12 ++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/internal/logic/questionnaire_survey.go b/internal/logic/questionnaire_survey.go index 236552f..7eae656 100644 --- a/internal/logic/questionnaire_survey.go +++ b/internal/logic/questionnaire_survey.go @@ -3,6 +3,7 @@ package logic import ( "encoding/json" "errors" + "fmt" "micro-bundle/internal/dao" "micro-bundle/internal/model" "micro-bundle/pb/bundle" @@ -24,13 +25,14 @@ func GetQuestionnaireSurveyInfo(req *bundle.GetQuestionnaireSurveyInfoRequest) ( if err != nil { return nil, errors.New("获取问卷信息失败") } - bundleInfo := &bundle.SurveyBundleInfo{} + bundleInfo := &model.DbBundleInfo{} err = json.Unmarshal([]byte(data.BundleInfo), bundleInfo) if err != nil { return nil, errors.New("反序列化失败") } + fmt.Println("获取套餐名称：", bundleInfo.BundleName) resp.UserName = data.UserName - resp.BundleInfo = bundleInfo + resp.BundleInfo = &bundle.SurveyBundleInfo{} resp.BundleInfo.BundleName = bundleInfo.BundleName resp.BundleInfo.StartAt = bundleInfo.StartAt resp.BundleInfo.ExpiredAt = bundleInfo.ExpiredAt diff --git a/internal/model/questionnaire_survey.go b/internal/model/questionnaire_survey.go index 9cc44f2..a1193c9 100644 --- a/internal/model/questionnaire_survey.go +++ b/internal/model/questionnaire_survey.go @@ -60,3 +60,15 @@ type UserInfo struct { UserName string `gorm:"column:user_name;not null;comment:用户姓名" json:"user_name"` UserTel string `gorm:"column:user_tel;not null;comment:用户电话" json:"user_tel"` } + +type DbBundleInfo struct { + BundleName string `json:"bundle_name"` + StartAt string `json:"start_at"` + ExpiredAt string `json:"expired_at"` + BundleAccountNumber int32 `json:"bundle_account_number"` + BundleVideoNumber int32 `json:"bundle_video_number"` + IncreaseVideoNumber int32 `json:"increase_video_number"` + BundleImageNumber int32 `json:"bundle_image_number"` + BundleDataNumber int32 `json:"bundle_data_number"` + BundleCompetitiveNumber int32 `json:"bundle_competitive_number"` +}