Merge branch 'feat-hjj-QuestionnaireSurvey' into dev

internal/dao/questionnaire_survey.go

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