fiee/micro-bundle
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feat-hjj-QuestionnaireSurvey' into dev

Browse Source
This commit is contained in:
jiaji.H 2026-03-11 22:04:13 +08:00
commit 09bcb63de8
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
internal/dao/questionnaire_survey.go
View File

@ -36,6 +36,7 @@ func SendQuestionnaireSurvey(req *bundle.SendQuestionnaireSurveyRequest) (resp *
questionnaireInfo := &model.QuestionnaireSurvey{} questionnaireInfo := &model.QuestionnaireSurvey{}
err = app.ModuleClients.BundleDB.Model(&model.QuestionnaireSurvey{}). err = app.ModuleClients.BundleDB.Model(&model.QuestionnaireSurvey{}).
Where("user_tel = ? and deleted_at is null", req.UserTel). Where("user_tel = ? and deleted_at is null", req.UserTel).
Order("created_at desc").
First(&questionnaireInfo).Error First(&questionnaireInfo).Error
if err != nil { if err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) { if errors.Is(err, gorm.ErrRecordNotFound) {
@ -45,6 +46,10 @@ func SendQuestionnaireSurvey(req *bundle.SendQuestionnaireSurveyRequest) (resp *
} }
} }
if questionnaireInfo.UserId != 0 { if questionnaireInfo.UserId != 0 {
if questionnaireInfo.SurveyStatus == msg.QuestionnaireSent {
resp.Status = 0
return resp, nil
}
resp.Status = 2 resp.Status = 2
return resp, nil return resp, nil
} }
@ -54,6 +59,10 @@ func SendQuestionnaireSurvey(req *bundle.SendQuestionnaireSurveyRequest) (resp *
Order("created_at desc"). Order("created_at desc").
First(&orderRecord).Error First(&orderRecord).Error
if err != nil { if err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
resp.Status = 1
return resp, nil
}
return resp, err return resp, err
} }
@ -64,15 +73,20 @@ func SendQuestionnaireSurvey(req *bundle.SendQuestionnaireSurveyRequest) (resp *
Where("month = ?", month). Where("month = ?", month).
First(&bundleBalance).Error First(&bundleBalance).Error
if err != nil { if err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
resp.Status = 1
return resp, nil
}
return resp, err return resp, err
} }
bundleInfo := &model.BundleInfo{ bundleInfo := &model.BundleInfo{
BundleName: orderRecord.BundleName, BundleName: orderRecord.BundleName,
StartAt: bundleBalance.StartAt, StartAt: bundleBalance.StartAt,
ExpiredAt: bundleBalance.ExpiredAt, ExpiredAt: bundleBalance.ExpiredAt,
BundleAccountNumber: 3, BundleAccountNumber: 3,
BundleVideoNumber: bundleBalance.BundleLimitVideoConsumptionNumber, BundleVideoNumber: bundleBalance.BundleLimitVideoConsumptionNumber,
IncreaseVideoNumber: bundleBalance.IncreaseLimitVideoConsumptionNumber, IncreaseVideoNumber: bundleBalance.IncreaseVideoConsumptionNumber,
BundleImageNumber: bundleBalance.BundleLimitImageConsumptionNumber, BundleImageNumber: bundleBalance.BundleLimitImageConsumptionNumber,
BundleDataNumber: bundleBalance.BundleLimitDataAnalysisConsumptionNumber, BundleDataNumber: bundleBalance.BundleLimitDataAnalysisConsumptionNumber,
BundleCompetitiveNumber: bundleBalance.BundleLimitCompetitiveConsumptionNumber, BundleCompetitiveNumber: bundleBalance.BundleLimitCompetitiveConsumptionNumber,