From b041c5ce2dac5e0bf301555283766d03e6f4248b Mon Sep 17 00:00:00 2001 From: "jiaji.H" Date: Wed, 11 Mar 2026 19:50:06 +0800 Subject: [PATCH] =?UTF-8?q?Updata=EF=BC=9A=E6=9B=B4=E6=96=B0=E6=95=B0?= =?UTF-8?q?=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/dao/questionnaire_survey.go | 2 +- internal/logic/questionnaire_survey.go | 16 ++++++++-------- internal/model/questionnaire_survey.go | 1 - 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/internal/dao/questionnaire_survey.go b/internal/dao/questionnaire_survey.go index 5775179..34647f8 100644 --- a/internal/dao/questionnaire_survey.go +++ b/internal/dao/questionnaire_survey.go @@ -23,7 +23,7 @@ func SendQuestionnaireSurvey(req *bundle.SendQuestionnaireSurveyRequest) (resp * mau.tel_num as user_tel, marn.name as user_name from `+"`micro-account`.`user`"+` as mau - left join `+"`micro-account`.`real_name`"+` as marn on marn.id = mau.real_name_id and marn.deleted_at is null + left join `+"`micro-account`.`real_name`"+` as marn on marn.id = mau.real_name_id and marn.deleted_at = 0 where mau.deleted_at = 0 and mau.tel_num = ? `, req.UserTel).Scan(&userInfo).Error if err != nil { diff --git a/internal/logic/questionnaire_survey.go b/internal/logic/questionnaire_survey.go index d6baee5..5c97716 100644 --- a/internal/logic/questionnaire_survey.go +++ b/internal/logic/questionnaire_survey.go @@ -25,23 +25,23 @@ func GetQuestionnaireSurveyInfo(req *bundle.GetQuestionnaireSurveyInfoRequest) ( if err != nil { return nil, errors.New("获取问卷信息失败") } - bundleInfo := &model.DbBundleInfo{} + bundleInfo := &model.BundleInfo{} err = json.Unmarshal([]byte(data.BundleInfo), bundleInfo) if err != nil { return nil, errors.New("反序列化失败") } fmt.Println("获取套餐名称：", bundleInfo.BundleName) - resp.UserName = bundleInfo.UserName + resp.UserName = data.UserName resp.BundleInfo = &bundle.SurveyBundleInfo{} resp.BundleInfo.BundleName = bundleInfo.BundleName resp.BundleInfo.StartAt = bundleInfo.StartAt.Format("2006-01-02 15:04:05") resp.BundleInfo.ExpiredAt = bundleInfo.ExpiredAt.Format("2006-01-02 15:04:05") - resp.BundleInfo.BundleAccountNumber = bundleInfo.BundleAccountNumber - resp.BundleInfo.BundleVideoNumber = bundleInfo.BundleVideoNumber - resp.BundleInfo.IncreaseVideoNumber = bundleInfo.IncreaseVideoNumber - resp.BundleInfo.BundleImageNumber = bundleInfo.BundleImageNumber - resp.BundleInfo.BundleDataNumber = bundleInfo.BundleDataNumber - resp.BundleInfo.BundleCompetitiveNumber = bundleInfo.BundleCompetitiveNumber + resp.BundleInfo.BundleAccountNumber = int32(bundleInfo.BundleAccountNumber) + resp.BundleInfo.BundleVideoNumber = int32(bundleInfo.BundleVideoNumber) + resp.BundleInfo.IncreaseVideoNumber = int32(bundleInfo.IncreaseVideoNumber) + resp.BundleInfo.BundleImageNumber = int32(bundleInfo.BundleImageNumber) + resp.BundleInfo.BundleDataNumber = int32(bundleInfo.BundleDataNumber) + resp.BundleInfo.BundleCompetitiveNumber = int32(bundleInfo.BundleCompetitiveNumber) return resp, nil } diff --git a/internal/model/questionnaire_survey.go b/internal/model/questionnaire_survey.go index 9176b68..2032918 100644 --- a/internal/model/questionnaire_survey.go +++ b/internal/model/questionnaire_survey.go @@ -32,7 +32,6 @@ func (QuestionnaireSurvey) TableName() string { } type BundleInfo struct { - UserName string `gorm:"column:user_name;not null;comment:用户姓名" json:"user_name"` BundleName string `gorm:"column:bundle_name;not null;comment:套餐名称" json:"bundle_name"` StartAt time.Time `gorm:"column:start_at;type:datetime;comment:套餐开始时间"` ExpiredAt time.Time `gorm:"column:expired_at;type:datetime;comment:套餐过期时间"`