Merge branch 'feat-hjj-QuestionnaireSurvey' into dev

This commit is contained in:
jiaji.H 2026-03-11 19:33:54 +08:00
commit cfb603e94e
2 changed files with 13 additions and 12 deletions

View File

@ -31,11 +31,11 @@ func GetQuestionnaireSurveyInfo(req *bundle.GetQuestionnaireSurveyInfoRequest) (
return nil, errors.New("反序列化失败")
}
fmt.Println("获取套餐名称:", bundleInfo.BundleName)
resp.UserName = data.UserName
resp.UserName = bundleInfo.UserName
resp.BundleInfo = &bundle.SurveyBundleInfo{}
resp.BundleInfo.BundleName = bundleInfo.BundleName
resp.BundleInfo.StartAt = bundleInfo.StartAt
resp.BundleInfo.ExpiredAt = bundleInfo.ExpiredAt
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

View File

@ -62,9 +62,10 @@ type UserInfo struct {
}
type DbBundleInfo struct {
UserName string `json:"user_name"`
BundleName string `json:"bundle_name"`
StartAt string `json:"start_at"`
ExpiredAt string `json:"expired_at"`
StartAt time.Time `json:"start_at"`
ExpiredAt time.Time `json:"expired_at"`
BundleAccountNumber int32 `json:"bundle_account_number"`
BundleVideoNumber int32 `json:"bundle_video_number"`
IncreaseVideoNumber int32 `json:"increase_video_number"`