From 74183a033117afb615f04aa746bab17c85cc3785 Mon Sep 17 00:00:00 2001
From: Leufolium <Caeruscaemon@outlook.com>
Date: Thu, 18 Jul 2024 19:29:11 +0800
Subject: [PATCH 01/17] by Robin at 20240718

---
 api/errcode/errcode.go                        |   8 ++
 .../Raven_IQ_test/proto/Raven_IQ_test_api.go  |  35 ++++++++
 .../Raven_IQ_test/proto/Raven_IQ_test_op.go   |  66 ++++++++++++++
 .../proto/Raven_IQ_test_vo_api.go             |  41 +++++++++
 .../Raven_IQ_test/proto/not_null_def_api.go   |  19 ++++
 .../Raven_IQ_test_controller_center.go        |   8 ++
 app/mix/controller/Raven_IQ_test_op.go        |  71 +++++++++++++++
 app/mix/dao/mongo.go                          |  67 +++++++++++++++
 app/mix/dao/mongo_idseq.go                    |  27 ++++++
 app/mix/service/apiservice.go                 |  41 +++++++++
 app/mix/service/logic/RavenIQTest.go          |  81 ++++++++++++++++++
 app/mix/service/service.go                    |   2 +
 codecreate/codecreate.go                      |   8 +-
 codecreate/resource/EntityDefine.xlsx         | Bin 54764 -> 56015 bytes
 dbstruct/RavenIQTest.go                       |  73 ++++++++++++++++
 dbstruct/idSeq.go                             |   4 +
 16 files changed, 547 insertions(+), 4 deletions(-)
 create mode 100644 api/proto/Raven_IQ_test/proto/Raven_IQ_test_api.go
 create mode 100644 api/proto/Raven_IQ_test/proto/Raven_IQ_test_op.go
 create mode 100644 api/proto/Raven_IQ_test/proto/Raven_IQ_test_vo_api.go
 create mode 100644 api/proto/Raven_IQ_test/proto/not_null_def_api.go
 create mode 100644 app/mix/controller/Raven_IQ_test_controller_center.go
 create mode 100644 app/mix/controller/Raven_IQ_test_op.go
 create mode 100644 app/mix/service/logic/RavenIQTest.go
 create mode 100644 dbstruct/RavenIQTest.go

diff --git a/api/errcode/errcode.go b/api/errcode/errcode.go
index 53cd00c8..8f44644a 100644
--- a/api/errcode/errcode.go
+++ b/api/errcode/errcode.go
@@ -222,6 +222,9 @@ var ErrCodeMsgMap = map[ErrCode]string{
 	ErrCodeUnhandleableSingleDistributeStatus:   "无法处理的下发打款状态",
 
 	ErrCodeHvyogoSrvFail: "慧用工接口服务错误",
+
+	ErrCodeRavenIQTestSrvFail:  "瑞文智商测试表服务错误",
+	ErrCodeRavenIQTestNotExist: "瑞文智商测试表不存在",
 }
 
 const (
@@ -542,4 +545,9 @@ const (
 	// Websocket: 1xxxxx
 	ErrCodeHandleWsFail ErrCode = -100001 // 长链连接失败
 
+	// RavenIQTest: 101xxx
+	ErrCodeRavenIQTestSrvOk    ErrCode = ErrCodeOk
+	ErrCodeRavenIQTestSrvFail  ErrCode = -101001 // 瑞文智商测试表服务错误
+	ErrCodeRavenIQTestNotExist ErrCode = -101002 // 瑞文智商测试表不存在
+
 )
diff --git a/api/proto/Raven_IQ_test/proto/Raven_IQ_test_api.go b/api/proto/Raven_IQ_test/proto/Raven_IQ_test_api.go
new file mode 100644
index 00000000..b2fa0457
--- /dev/null
+++ b/api/proto/Raven_IQ_test/proto/Raven_IQ_test_api.go
@@ -0,0 +1,35 @@
+package proto
+
+import (
+	"service/api/base"
+	"service/dbstruct"
+)
+
+// op 创建
+type ApiCreateReq struct {
+	base.BaseRequest
+	*dbstruct.RavenIQTest
+}
+
+type ApiCreateData struct {
+}
+
+type ApiCreateResp struct {
+	base.BaseResponse
+	Data *ApiCreateData `json:"data"`
+}
+
+// op 列表
+type ApiListReq struct {
+	base.BaseRequest
+	Id *int64 `json:"id"`
+}
+
+type ApiListData struct {
+	*dbstruct.RavenIQTest
+}
+
+type ApiListResp struct {
+	base.BaseResponse
+	Data *ApiListData `json:"data"`
+}
diff --git a/api/proto/Raven_IQ_test/proto/Raven_IQ_test_op.go b/api/proto/Raven_IQ_test/proto/Raven_IQ_test_op.go
new file mode 100644
index 00000000..3f9c3601
--- /dev/null
+++ b/api/proto/Raven_IQ_test/proto/Raven_IQ_test_op.go
@@ -0,0 +1,66 @@
+package proto
+
+import (
+	"service/api/base"
+	"service/dbstruct"
+)
+
+// op 创建
+type OpCreateReq struct {
+	base.BaseRequest
+	*dbstruct.RavenIQTest
+}
+
+type OpCreateData struct {
+}
+
+type OpCreateResp struct {
+	base.BaseResponse
+	Data *OpCreateData `json:"data"`
+}
+
+// op 删除
+type OpDeleteReq struct {
+	base.BaseRequest
+	Id int64 `json:"id"`
+}
+
+type OpDeleteData struct {
+}
+
+type OpDeleteResp struct {
+	base.BaseResponse
+	Data *OpDeleteData `json:"data"`
+}
+
+// op 更新
+type OpUpdateReq struct {
+	base.BaseRequest
+	*dbstruct.RavenIQTest
+}
+
+type OpUpdateData struct {
+}
+
+type OpUpdateResp struct {
+	base.BaseResponse
+	Data *OpUpdateData `json:"data"`
+}
+
+// op 列表
+type OpListReq struct {
+	base.BaseRequest
+	Offset int `json:"offset"`
+	Limit  int `json:"limit"`
+}
+
+type OpListData struct {
+	List   []*dbstruct.RavenIQTest `json:"list"`
+	Offset int                 `json:"offset"`
+	More   int                 `json:"more"`
+}
+
+type OpListResp struct {
+	base.BaseResponse
+	Data *OpListData `json:"data"`
+}
diff --git a/api/proto/Raven_IQ_test/proto/Raven_IQ_test_vo_api.go b/api/proto/Raven_IQ_test/proto/Raven_IQ_test_vo_api.go
new file mode 100644
index 00000000..2511a7a7
--- /dev/null
+++ b/api/proto/Raven_IQ_test/proto/Raven_IQ_test_vo_api.go
@@ -0,0 +1,41 @@
+package proto
+
+import (
+	"service/dbstruct"
+)
+
+type ApiListVO struct {
+	Id             int64              `json:"id"`               // 瑞文智商测试表id
+	UserId         int64              `json:"user_id"`          // 用户id
+	Age            int64              `json:"age" `             // 年龄
+	TotalScores    int64              `json:"total_scores"`     // 总得分
+	IQ             float64            `json:"IQ"`               // 智商值
+	Percentile     int64              `json:"percentile"`       // 百分位
+	Description    string             `json:"description"`      // 描述
+	ClassScoreList []*ApiClassSocreVO `json:"class_score_list"` // 大类得分list
+}
+
+type ApiClassSocreVO struct {
+	ClassId     int64  `json:"class_id"`    // 大类id
+	Score       int64  `json:"score"`       // 得分
+	Suggestions string `json:"suggestions"` // 建议
+}
+
+func (vo *ApiListVO) CopyRavenIQTest(test *dbstruct.RavenIQTest) *ApiListVO {
+	if test == nil {
+		return vo
+	}
+	vo.Id = test.GetId()
+	vo.UserId = test.GetUserId()
+	vo.Age = test.GetAge()
+	vo.TotalScores = test.GetTotalScores()
+	vo.IQ = test.GetIQ()
+	vo.ClassScoreList = make([]*ApiClassSocreVO, 0)
+	for _, score := range test.ClassScoreList {
+		vo.ClassScoreList = append(vo.ClassScoreList, &ApiClassSocreVO{
+			ClassId: score.GetClassId(),
+			Score:   score.GetScore(),
+		})
+	}
+	return vo
+}
diff --git a/api/proto/Raven_IQ_test/proto/not_null_def_api.go b/api/proto/Raven_IQ_test/proto/not_null_def_api.go
new file mode 100644
index 00000000..3259bcad
--- /dev/null
+++ b/api/proto/Raven_IQ_test/proto/not_null_def_api.go
@@ -0,0 +1,19 @@
+package proto
+
+import (
+	"service/library/validator"
+)
+
+// api 查询
+func (p *ApiCreateReq) ProvideNotNullValue() (params []*validator.JsonParam) {
+	params = make([]*validator.JsonParam, 0)
+	params = append(params, validator.NewInt64PtrParam("请提供您的年龄！", p.Age))
+	return params
+}
+
+// api 经验增长
+func (p *ApiListReq) ProvideNotNullValue() (params []*validator.JsonParam) {
+	params = make([]*validator.JsonParam, 0)
+	params = append(params, validator.NewInt64PtrParam("请提供待查询的id！", p.Id))
+	return params
+}
diff --git a/app/mix/controller/Raven_IQ_test_controller_center.go b/app/mix/controller/Raven_IQ_test_controller_center.go
new file mode 100644
index 00000000..1bac47ec
--- /dev/null
+++ b/app/mix/controller/Raven_IQ_test_controller_center.go
@@ -0,0 +1,8 @@
+Raven_IQ_testproto "service/api/proto/Raven_IQ_test/proto"
+
+	// 瑞文智商测试表
+	opRavenIQTestGroup := r.Group("/api/Raven_IQ_test", PrepareToC())
+	opRavenIQTestGroup.POST("create", middleware.JSONParamValidator(Raven_IQ_testproto.OpCreateReq{}), middleware.JwtAuthenticator(), OpCreateRavenIQTest)
+	opRavenIQTestGroup.POST("update", middleware.JSONParamValidator(Raven_IQ_testproto.OpUpdateReq{}), middleware.JwtAuthenticator(), OpUpdateRavenIQTest)
+	opRavenIQTestGroup.POST("delete", middleware.JSONParamValidator(Raven_IQ_testproto.OpDeleteReq{}), middleware.JwtAuthenticator(), OpDeleteRavenIQTest)
+	opRavenIQTestGroup.POST("list", middleware.JSONParamValidator(Raven_IQ_testproto.OpListReq{}), middleware.JwtAuthenticator(), OpGetRavenIQTestList)
\ No newline at end of file
diff --git a/app/mix/controller/Raven_IQ_test_op.go b/app/mix/controller/Raven_IQ_test_op.go
new file mode 100644
index 00000000..b8c69f56
--- /dev/null
+++ b/app/mix/controller/Raven_IQ_test_op.go
@@ -0,0 +1,71 @@
+package controller
+
+import (
+	"github.com/gin-gonic/gin"
+	"service/api/errcode"
+	Raven_IQ_testproto "service/api/proto/Raven_IQ_test/proto"
+	"service/app/mix/service"
+	"service/bizcommon/util"
+	"service/library/logger"
+)
+
+func OpCreateRavenIQTest(ctx *gin.Context) {
+	req := ctx.MustGet("client_req").(*Raven_IQ_testproto.OpCreateReq)
+	ec := service.DefaultService.OpCreateRavenIQTest(ctx, req)
+	if ec != errcode.ErrCodeRavenIQTestSrvOk {
+		logger.Error("OpCreateRavenIQTest fail, req: %v, ec: %v", util.ToJson(req), ec)
+		ReplyErrorMsg(ctx, "server error")
+		return
+	}
+
+	ReplyOk(ctx, nil)
+}
+
+func OpUpdateRavenIQTest(ctx *gin.Context) {
+	req := ctx.MustGet("client_req").(*Raven_IQ_testproto.OpUpdateReq)
+	ec := service.DefaultService.OpUpdateRavenIQTest(ctx, req)
+	if ec != errcode.ErrCodeRavenIQTestSrvOk {
+		logger.Error("OpUpdateRavenIQTest fail, req: %v, ec: %v", util.ToJson(req), ec)
+		ReplyErrCodeMsg(ctx, ec)
+		return
+	}
+
+	ReplyOk(ctx, nil)
+}
+
+func OpDeleteRavenIQTest(ctx *gin.Context) {
+	req := ctx.MustGet("client_req").(*Raven_IQ_testproto.OpDeleteReq)
+	ec := service.DefaultService.OpDeleteRavenIQTest(ctx, req.Id)
+	if ec != errcode.ErrCodeRavenIQTestSrvOk {
+		logger.Error("OpDeleteRavenIQTest fail, req: %v, ec: %v", util.ToJson(req), ec)
+		ReplyErrCodeMsg(ctx, ec)
+		return
+	}
+
+	ReplyOk(ctx, nil)
+}
+
+func OpGetRavenIQTestList(ctx *gin.Context) {
+	req := ctx.MustGet("client_req").(*Raven_IQ_testproto.OpListReq)
+
+	//设置默认页长
+	if req.Limit == 0 {
+		req.Limit = consts.DefaultPageSize
+	}
+
+	list, ec := service.DefaultService.OpGetRavenIQTestList(ctx, req)
+	if ec != errcode.ErrCodeRavenIQTestSrvOk {
+		logger.Error("OpGetRavenIQTestList fail, req: %v, ec: %v", util.ToJson(req), ec)
+		ReplyErrCodeMsg(ctx, ec)
+		return
+	}
+
+	data := &Raven_IQ_testproto.OpListData{
+		List:   list,
+		Offset: req.Offset + len(list),
+	}
+	if len(list) >= req.Limit {
+		data.More = 1
+	}
+	ReplyOk(ctx, data)
+}
diff --git a/app/mix/dao/mongo.go b/app/mix/dao/mongo.go
index d79d0bb8..29f17d6b 100644
--- a/app/mix/dao/mongo.go
+++ b/app/mix/dao/mongo.go
@@ -17,6 +17,7 @@ import (
 	"go.mongodb.org/mongo-driver/bson"
 	options2 "go.mongodb.org/mongo-driver/mongo/options"
 
+	Raven_IQ_testproto "service/api/proto/Raven_IQ_test/proto"
 	accountproto "service/api/proto/account/proto"
 	account_cancellationproto "service/api/proto/account_cancellation/proto"
 	accountpunishmentproto "service/api/proto/accountpunishment/proto"
@@ -226,6 +227,9 @@ const (
 	DBSingleDistributeHis   = "single_distribute_his"
 	COLSingleDistributeHis  = "single_distribute_his"
 	COLSingleDistributeLock = "single_distribute_lock"
+
+	DBRavenIQTest  = "Raven_IQ_test"
+	COLRavenIQTest = "Raven_IQ_test"
 )
 
 // 商品表
@@ -577,6 +581,11 @@ func (m *Mongo) getColSingleDistributeLock() *qmgo.Collection {
 	return m.clientMix.Database(DBSingleDistributeHis).Collection(COLSingleDistributeLock)
 }
 
+// 瑞文智商测试表表
+func (m *Mongo) getColRavenIQTest() *qmgo.Collection {
+	return m.clientMix.Database(DBRavenIQTest).Collection(COLRavenIQTest)
+}
+
 // 商品相关
 func (m *Mongo) CreateProduct(ctx *gin.Context, product *dbstruct.Product) error {
 	col := m.getColProduct()
@@ -5554,3 +5563,61 @@ func (m *Mongo) GetSingleDistributeHisById(ctx *gin.Context, id string) (*dbstru
 	}
 	return one, err
 }
+
+// 瑞文智商测试表相关
+func (m *Mongo) CreateRavenIQTest(ctx *gin.Context, Raven_IQ_test *dbstruct.RavenIQTest) error {
+	col := m.getColRavenIQTest()
+	_, err := col.InsertOne(ctx, Raven_IQ_test)
+	return err
+}
+
+func (m *Mongo) UpdateRavenIQTest(ctx *gin.Context, Raven_IQ_test *dbstruct.RavenIQTest) error {
+	col := m.getColRavenIQTest()
+	set := util.EntityToM(Raven_IQ_test)
+	set["ut"] = time.Now().Unix()
+	up := qmgo.M{
+		"$set": set,
+	}
+	err := col.UpdateId(ctx, Raven_IQ_test.Id, up)
+	return err
+}
+
+func (m *Mongo) DeleteRavenIQTest(ctx *gin.Context, id int64) error {
+	col := m.getColRavenIQTest()
+	update := qmgo.M{
+		"$set": qmgo.M{
+			"del_flag": 1,
+		},
+	}
+	err := col.UpdateId(ctx, id, update)
+	return err
+}
+
+func (m *Mongo) GetRavenIQTestList(ctx *gin.Context, req *Raven_IQ_testproto.OpListReq) ([]*dbstruct.RavenIQTest, error) {
+	list := make([]*dbstruct.RavenIQTest, 0)
+	col := m.getColRavenIQTest()
+	query := qmgo.M{
+		"del_flag": 0,
+	}
+	err := col.Find(ctx, query).Sort("-ct").Skip(int64(req.Offset)).Limit(int64(req.Limit)).All(&list)
+	if err == qmgo.ErrNoSuchDocuments {
+		err = nil
+		return list, err
+	}
+	return list, err
+}
+
+func (m *Mongo) GetRavenIQTestById(ctx *gin.Context, id int64) (*dbstruct.RavenIQTest, error) {
+	test := &dbstruct.RavenIQTest{}
+	col := m.getColRavenIQTest()
+	query := qmgo.M{
+		"_id":      id,
+		"del_flag": 0,
+	}
+	err := col.Find(ctx, query).One(test)
+	if err == qmgo.ErrNoSuchDocuments {
+		err = nil
+		return test, err
+	}
+	return test, err
+}
diff --git a/app/mix/dao/mongo_idseq.go b/app/mix/dao/mongo_idseq.go
index ab01dc16..eeee723d 100644
--- a/app/mix/dao/mongo_idseq.go
+++ b/app/mix/dao/mongo_idseq.go
@@ -62,6 +62,9 @@ const (
 	COLImageAuditRTI      = "image_audit_rti"
 	COLTextAuditRTI       = "text_audit_rti"
 	COLVideoModerationRTI = "video_moderation_rti"
+
+	DBRavenIQTestIdSeq  = "Raven_IQ_test_id_seq"
+	COLRavenIQTestIdSeq = "Raven_IQ_test_id_seq"
 )
 
 // UserIdSeq序列表
@@ -159,6 +162,11 @@ func (m *Mongo) getColVideoModerationRTI() *qmgo.Collection {
 	return m.clientMix.Database(DBContentAuditRTI).Collection(COLVideoModerationRTI)
 }
 
+// AccountIdSeq序列表
+func (m *Mongo) getColRavenIQTestIdSeq() *qmgo.Collection {
+	return m.clientMix.Database(DBRavenIQTestIdSeq).Collection(COLRavenIQTestIdSeq)
+}
+
 // account_id发号器
 func (m *Mongo) GetAndUpdateAccountIdSeq(ctx *gin.Context) (accountIdSeq *dbstruct.AccountIdSeq, err error) {
 	col := m.getColAccountIdSeq()
@@ -569,3 +577,22 @@ func (m *Mongo) GetVideoModerationBatchId(ctx *gin.Context) (videoModerationBatc
 
 	return
 }
+
+// Raven_IQ_test_id发号器
+func (m *Mongo) GetAndUpdateRavenIQTestIdSeq(ctx *gin.Context) (Raven_IQ_testIdSeq *dbstruct.RavenIQTestIdSeq, err error) {
+	col := m.getColRavenIQTestIdSeq()
+
+	change := qmgo.Change{
+		Update:    qmgo.M{"$inc": qmgo.M{"seq": 1}},
+		Upsert:    true,
+		ReturnNew: false,
+	}
+
+	instance := dbstruct.RavenIQTestIdSeq{}
+	if err = col.Find(ctx, qmgo.M{"_id": "Raven_IQ_test_id_seq_id"}).Apply(change, &instance); err != nil {
+		logger.Error("change error : %v", err)
+		return
+	}
+
+	return &instance, err
+}
diff --git a/app/mix/service/apiservice.go b/app/mix/service/apiservice.go
index 2bff4b54..96709e1e 100644
--- a/app/mix/service/apiservice.go
+++ b/app/mix/service/apiservice.go
@@ -49,6 +49,8 @@ import (
 	"strings"
 	"time"
 
+	Raven_IQ_testproto "service/api/proto/Raven_IQ_test/proto"
+
 	"go.mongodb.org/mongo-driver/mongo"
 	goproto "google.golang.org/protobuf/proto"
 
@@ -3585,3 +3587,42 @@ func (s *Service) ApiHvyogoWorkerUpdate(ctx *gin.Context, req *hvyogoproto.ApiWo
 
 	return
 }
+
+// RavenIQTest
+func (s *Service) ApiCreateRavenIQTest(ctx *gin.Context, req *Raven_IQ_testproto.ApiCreateReq) (ec errcode.ErrCode) {
+	ec = errcode.ErrCodeRavenIQTestSrvOk
+	err := _DefaultRavenIQTest.OpCreate(ctx, &Raven_IQ_testproto.OpCreateReq{
+		BaseRequest: req.BaseRequest,
+		RavenIQTest: req.RavenIQTest,
+	})
+	if err != nil {
+		logger.Error("ApiCreate fail, req: %v, err: %v", util.ToJson(req), err)
+		ec = errcode.ErrCodeRavenIQTestSrvFail
+		return
+	}
+	return
+}
+
+func (s *Service) ApiGetRavenIQTestList(ctx *gin.Context, req *Raven_IQ_testproto.ApiListReq) (vo *Raven_IQ_testproto.ApiListVO, ec errcode.ErrCode) {
+	ec = errcode.ErrCodeRavenIQTestSrvOk
+
+	vo = &Raven_IQ_testproto.ApiListVO{}
+
+	test, err := _DefaultRavenIQTest.GetById(ctx, util.DerefInt64(req.Id))
+	if err != nil {
+		logger.Error("ApiGetRavenIQTest fail, req: %v, err: %v", util.ToJson(req), err)
+		ec = errcode.ErrCodeRavenIQTestSrvFail
+		return
+	}
+	if test == nil {
+		logger.Error("No RavenIQTest entity was found, req: %v", util.ToJson(req))
+		ec = errcode.ErrCodeRavenIQTestNotExist
+		return
+	}
+
+	vo.CopyRavenIQTest(test)
+
+	// 填充业务数据
+
+	return
+}
diff --git a/app/mix/service/logic/RavenIQTest.go b/app/mix/service/logic/RavenIQTest.go
new file mode 100644
index 00000000..b807ec52
--- /dev/null
+++ b/app/mix/service/logic/RavenIQTest.go
@@ -0,0 +1,81 @@
+package logic
+
+import (
+	"service/api/consts"
+	Raven_IQ_testproto "service/api/proto/Raven_IQ_test/proto"
+	"service/app/mix/dao"
+	"service/dbstruct"
+	"service/library/logger"
+	"time"
+
+	"github.com/gin-gonic/gin"
+	goproto "google.golang.org/protobuf/proto"
+)
+
+type RavenIQTest struct {
+	store *dao.Store
+}
+
+func NewRavenIQTest(store *dao.Store) (a *RavenIQTest) {
+	a = &RavenIQTest{
+		store: store,
+	}
+	return
+}
+
+func (p *RavenIQTest) OpCreate(ctx *gin.Context, req *Raven_IQ_testproto.OpCreateReq) error {
+
+	//产生mid
+	idSeq, err := p.store.GetAndUpdateRavenIQTestIdSeq(ctx)
+	if err != nil {
+		logger.Error("GetAndUpdateRavenIQTestIdSeq failed : %v", err)
+		return err
+	}
+
+	req.RavenIQTest.Id = goproto.Int64(idSeq.Seq)
+	req.RavenIQTest.Ct = goproto.Int64(time.Now().Unix())
+	req.RavenIQTest.Ut = goproto.Int64(time.Now().Unix())
+	req.RavenIQTest.DelFlag = goproto.Int64(consts.Exist)
+	err = p.store.CreateRavenIQTest(ctx, req.RavenIQTest)
+	if err != nil {
+		logger.Error("CreateRavenIQTest fail, err: %v", err)
+		return err
+	}
+	return nil
+}
+
+func (p *RavenIQTest) OpUpdate(ctx *gin.Context, req *Raven_IQ_testproto.OpUpdateReq) error {
+	err := p.store.UpdateRavenIQTest(ctx, req.RavenIQTest)
+	if err != nil {
+		logger.Error("UpdateRavenIQTest fail, err: %v", err)
+		return err
+	}
+	return nil
+}
+
+func (p *RavenIQTest) OpDelete(ctx *gin.Context, id int64) error {
+	err := p.store.DeleteRavenIQTest(ctx, id)
+	if err != nil {
+		logger.Error("DeleteRavenIQTest fail, err: %v", err)
+		return err
+	}
+	return nil
+}
+
+func (p *RavenIQTest) OpList(ctx *gin.Context, req *Raven_IQ_testproto.OpListReq) ([]*dbstruct.RavenIQTest, error) {
+	list, err := p.store.GetRavenIQTestList(ctx, req)
+	if err != nil {
+		logger.Error("GetRavenIQTestList fail, err: %v", err)
+		return make([]*dbstruct.RavenIQTest, 0), err
+	}
+	return list, nil
+}
+
+func (p *RavenIQTest) GetById(ctx *gin.Context, id int64) (*dbstruct.RavenIQTest, error) {
+	test, err := p.store.GetRavenIQTestById(ctx, id)
+	if err != nil {
+		logger.Error("GetRavenIQTestListByIds fail, id: %v, err: %v", id, err)
+		return nil, err
+	}
+	return test, nil
+}
diff --git a/app/mix/service/service.go b/app/mix/service/service.go
index 170a40cb..706ab7a7 100644
--- a/app/mix/service/service.go
+++ b/app/mix/service/service.go
@@ -140,6 +140,7 @@ var (
 	_DefaultStreamerScore                 *logic.StreamerScore
 	_DefaultWorkerId                      *logic.WorkerId
 	_DefaultSingleDistributeHis           *logic.SingleDistributeHis
+	_DefaultRavenIQTest                   *logic.RavenIQTest
 )
 
 type Service struct {
@@ -235,6 +236,7 @@ func (s *Service) Init(c any) (err error) {
 	_DefaultStreamerScore = logic.NewStreamerScore(store)
 	_DefaultWorkerId = logic.NewWorkerId(store)
 	_DefaultSingleDistributeHis = logic.NewSingleDistributeHis(store)
+	_DefaultRavenIQTest = logic.NewRavenIQTest(store)
 
 	_DefaultVas = logic.NewVas(store, _DefaultStreamer, _DefaultAccount, _DefaultZone, _DefaultZoneThirdPartner, _DefaultZoneCollaborator)
 	_DefaultStreamerAcct = logic.NewStreamerAcct(store)
diff --git a/codecreate/codecreate.go b/codecreate/codecreate.go
index 645bf5ac..723a640e 100644
--- a/codecreate/codecreate.go
+++ b/codecreate/codecreate.go
@@ -9,10 +9,10 @@ import (
 func main() {
 
 	genSource := &generator.GenSource{
-		EntityName:   "SingleDistributeHis",
-		ModuleName:   "single_distribute_his",
-		EntityCNName: "慧用工下发打款历史表",
-		ErrCodeSeq:   "42",
+		EntityName:   "RavenIQTest",
+		ModuleName:   "Raven_IQ_test",
+		EntityCNName: "瑞文智商测试表",
+		ErrCodeSeq:   "101",
 	}
 
 	generator.CreateFileDirectory(genSource)
diff --git a/codecreate/resource/EntityDefine.xlsx b/codecreate/resource/EntityDefine.xlsx
index d65c315b957abc52bc332ce4834123c5a9c3ab4c..45cf4458dbc3c7f54e5113ebd80f54ade2f49378 100644
GIT binary patch
delta 10052
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

delta 9016
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

diff --git a/dbstruct/RavenIQTest.go b/dbstruct/RavenIQTest.go
new file mode 100644
index 00000000..5f42b80a
--- /dev/null
+++ b/dbstruct/RavenIQTest.go
@@ -0,0 +1,73 @@
+package dbstruct
+
+type RavenIQTest struct {
+	Id             *int64                   `json:"id" bson:"_id"`                            // 瑞文智商测试表id
+	UserId         *int64                   `json:"user_id" bson:"user_id"`                   // 用户id
+	Age            *int64                   `json:"age" bson:"age"`                           // 年龄
+	TotalScores    *int64                   `json:"total_scores" bson:"total_scores"`         // 总得分
+	IQ             *float64                 `json:"IQ" bson:"IQ"`                             // 智商值
+	AnswerList     []*RavenIQTestAnswer     `json:"answer_list" bson:"answer_list"`           // 答案list
+	ClassScoreList []*RavenIQTestClassScore `json:"class_score_list" bson:"class_score_list"` // 大类得分list
+	Ct             *int64                   `json:"ct" bson:"ct"`                             // 创建时间
+	Ut             *int64                   `json:"ut" bson:"ut"`                             // 更新时间
+	DelFlag        *int64                   `json:"del_flag" bson:"del_flag"`                 // 删除标记
+}
+
+type RavenIQTestAnswer struct {
+	QuestionId     *int64 `json:"question_id" bson:"question_id"`         // 问题Id
+	SelectedOption *int64 `json:"selected_option" bson:"selected_option"` // 选择的选项
+}
+
+type RavenIQTestClassScore struct {
+	ClassId *int64 `json:"class_id" bson:"class_id"` // 大类id
+	Score   *int64 `json:"score" bson:"score"`       // 得分
+}
+
+func (p *RavenIQTest) GetId() int64 {
+	if p == nil || p.Id == nil {
+		return -1
+	}
+	return *p.Id
+}
+
+func (p *RavenIQTest) GetUserId() int64 {
+	if p == nil || p.UserId == nil {
+		return -1
+	}
+	return *p.UserId
+}
+
+func (p *RavenIQTest) GetAge() int64 {
+	if p == nil || p.UserId == nil {
+		return 0
+	}
+	return *p.Age
+}
+
+func (p *RavenIQTest) GetTotalScores() int64 {
+	if p == nil || p.TotalScores == nil {
+		return 0
+	}
+	return *p.TotalScores
+}
+
+func (p *RavenIQTest) GetIQ() float64 {
+	if p == nil || p.IQ == nil {
+		return 0
+	}
+	return *p.IQ
+}
+
+func (p *RavenIQTestClassScore) GetClassId() int64 {
+	if p == nil || p.ClassId == nil {
+		return 0
+	}
+	return *p.ClassId
+}
+
+func (p *RavenIQTestClassScore) GetScore() int64 {
+	if p == nil || p.Score == nil {
+		return 0
+	}
+	return *p.Score
+}
diff --git a/dbstruct/idSeq.go b/dbstruct/idSeq.go
index 6be66020..9c650a25 100644
--- a/dbstruct/idSeq.go
+++ b/dbstruct/idSeq.go
@@ -80,3 +80,7 @@ type TextAuditBatchId struct {
 type VideoModerationBatchId struct {
 	BatchId string `json:"batch_id" bson:"batch_id"` //视频审核批次号
 }
+
+type RavenIQTestIdSeq struct {
+	Seq int64 //用户Id序列号
+}

From 9b0b94369116863bedbd7522b6b203952f105f58 Mon Sep 17 00:00:00 2001
From: Leufolium <Caeruscaemon@outlook.com>
Date: Thu, 18 Jul 2024 22:02:31 +0800
Subject: [PATCH 02/17] 1

---
 app/mix/service/apiservice.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/mix/service/apiservice.go b/app/mix/service/apiservice.go
index 96709e1e..ceb03538 100644
--- a/app/mix/service/apiservice.go
+++ b/app/mix/service/apiservice.go
@@ -3591,6 +3591,9 @@ func (s *Service) ApiHvyogoWorkerUpdate(ctx *gin.Context, req *hvyogoproto.ApiWo
 // RavenIQTest
 func (s *Service) ApiCreateRavenIQTest(ctx *gin.Context, req *Raven_IQ_testproto.ApiCreateReq) (ec errcode.ErrCode) {
 	ec = errcode.ErrCodeRavenIQTestSrvOk
+
+	// 计算总得分
+
 	err := _DefaultRavenIQTest.OpCreate(ctx, &Raven_IQ_testproto.OpCreateReq{
 		BaseRequest: req.BaseRequest,
 		RavenIQTest: req.RavenIQTest,

From 98c6ef4f363fd55d2713b8c7f80f50e87f8ac958 Mon Sep 17 00:00:00 2001
From: Leufolium <Caeruscaemon@outlook.com>
Date: Fri, 19 Jul 2024 08:43:30 +0800
Subject: [PATCH 03/17] 1

---
 .../Raven_IQ_test/proto/Raven_IQ_test_api.go  |  2 +-
 app/mix/controller/Raven_IQ_test_api.go       | 39 ++++++++++
 .../Raven_IQ_test_controller_center.go        |  8 ---
 app/mix/controller/Raven_IQ_test_op.go        | 71 -------------------
 app/mix/controller/init.go                    |  6 ++
 5 files changed, 46 insertions(+), 80 deletions(-)
 create mode 100644 app/mix/controller/Raven_IQ_test_api.go
 delete mode 100644 app/mix/controller/Raven_IQ_test_controller_center.go
 delete mode 100644 app/mix/controller/Raven_IQ_test_op.go

diff --git a/api/proto/Raven_IQ_test/proto/Raven_IQ_test_api.go b/api/proto/Raven_IQ_test/proto/Raven_IQ_test_api.go
index b2fa0457..e9702a7b 100644
--- a/api/proto/Raven_IQ_test/proto/Raven_IQ_test_api.go
+++ b/api/proto/Raven_IQ_test/proto/Raven_IQ_test_api.go
@@ -26,7 +26,7 @@ type ApiListReq struct {
 }
 
 type ApiListData struct {
-	*dbstruct.RavenIQTest
+	*ApiListVO
 }
 
 type ApiListResp struct {
diff --git a/app/mix/controller/Raven_IQ_test_api.go b/app/mix/controller/Raven_IQ_test_api.go
new file mode 100644
index 00000000..e2eb67a8
--- /dev/null
+++ b/app/mix/controller/Raven_IQ_test_api.go
@@ -0,0 +1,39 @@
+package controller
+
+import (
+	"service/api/errcode"
+	Raven_IQ_testproto "service/api/proto/Raven_IQ_test/proto"
+	"service/app/mix/service"
+	"service/bizcommon/util"
+	"service/library/logger"
+
+	"github.com/gin-gonic/gin"
+)
+
+func ApiCreateRavenIQTest(ctx *gin.Context) {
+	req := ctx.MustGet("client_req").(*Raven_IQ_testproto.ApiCreateReq)
+	ec := service.DefaultService.ApiCreateRavenIQTest(ctx, req)
+	if ec != errcode.ErrCodeRavenIQTestSrvOk {
+		logger.Error("ApiCreateRavenIQTest fail, req: %v, ec: %v", util.ToJson(req), ec)
+		ReplyErrorMsg(ctx, "server error")
+		return
+	}
+
+	ReplyOk(ctx, nil)
+}
+
+func ApiGetRavenIQTestList(ctx *gin.Context) {
+	req := ctx.MustGet("client_req").(*Raven_IQ_testproto.ApiListReq)
+
+	vo, ec := service.DefaultService.ApiGetRavenIQTestList(ctx, req)
+	if ec != errcode.ErrCodeRavenIQTestSrvOk {
+		logger.Error("ApiGetRavenIQTestList fail, req: %v, ec: %v", util.ToJson(req), ec)
+		ReplyErrCodeMsg(ctx, ec)
+		return
+	}
+
+	data := &Raven_IQ_testproto.ApiListData{
+		ApiListVO: vo,
+	}
+	ReplyOk(ctx, data)
+}
diff --git a/app/mix/controller/Raven_IQ_test_controller_center.go b/app/mix/controller/Raven_IQ_test_controller_center.go
deleted file mode 100644
index 1bac47ec..00000000
--- a/app/mix/controller/Raven_IQ_test_controller_center.go
+++ /dev/null
@@ -1,8 +0,0 @@
-Raven_IQ_testproto "service/api/proto/Raven_IQ_test/proto"
-
-	// 瑞文智商测试表
-	opRavenIQTestGroup := r.Group("/api/Raven_IQ_test", PrepareToC())
-	opRavenIQTestGroup.POST("create", middleware.JSONParamValidator(Raven_IQ_testproto.OpCreateReq{}), middleware.JwtAuthenticator(), OpCreateRavenIQTest)
-	opRavenIQTestGroup.POST("update", middleware.JSONParamValidator(Raven_IQ_testproto.OpUpdateReq{}), middleware.JwtAuthenticator(), OpUpdateRavenIQTest)
-	opRavenIQTestGroup.POST("delete", middleware.JSONParamValidator(Raven_IQ_testproto.OpDeleteReq{}), middleware.JwtAuthenticator(), OpDeleteRavenIQTest)
-	opRavenIQTestGroup.POST("list", middleware.JSONParamValidator(Raven_IQ_testproto.OpListReq{}), middleware.JwtAuthenticator(), OpGetRavenIQTestList)
\ No newline at end of file
diff --git a/app/mix/controller/Raven_IQ_test_op.go b/app/mix/controller/Raven_IQ_test_op.go
deleted file mode 100644
index b8c69f56..00000000
--- a/app/mix/controller/Raven_IQ_test_op.go
+++ /dev/null
@@ -1,71 +0,0 @@
-package controller
-
-import (
-	"github.com/gin-gonic/gin"
-	"service/api/errcode"
-	Raven_IQ_testproto "service/api/proto/Raven_IQ_test/proto"
-	"service/app/mix/service"
-	"service/bizcommon/util"
-	"service/library/logger"
-)
-
-func OpCreateRavenIQTest(ctx *gin.Context) {
-	req := ctx.MustGet("client_req").(*Raven_IQ_testproto.OpCreateReq)
-	ec := service.DefaultService.OpCreateRavenIQTest(ctx, req)
-	if ec != errcode.ErrCodeRavenIQTestSrvOk {
-		logger.Error("OpCreateRavenIQTest fail, req: %v, ec: %v", util.ToJson(req), ec)
-		ReplyErrorMsg(ctx, "server error")
-		return
-	}
-
-	ReplyOk(ctx, nil)
-}
-
-func OpUpdateRavenIQTest(ctx *gin.Context) {
-	req := ctx.MustGet("client_req").(*Raven_IQ_testproto.OpUpdateReq)
-	ec := service.DefaultService.OpUpdateRavenIQTest(ctx, req)
-	if ec != errcode.ErrCodeRavenIQTestSrvOk {
-		logger.Error("OpUpdateRavenIQTest fail, req: %v, ec: %v", util.ToJson(req), ec)
-		ReplyErrCodeMsg(ctx, ec)
-		return
-	}
-
-	ReplyOk(ctx, nil)
-}
-
-func OpDeleteRavenIQTest(ctx *gin.Context) {
-	req := ctx.MustGet("client_req").(*Raven_IQ_testproto.OpDeleteReq)
-	ec := service.DefaultService.OpDeleteRavenIQTest(ctx, req.Id)
-	if ec != errcode.ErrCodeRavenIQTestSrvOk {
-		logger.Error("OpDeleteRavenIQTest fail, req: %v, ec: %v", util.ToJson(req), ec)
-		ReplyErrCodeMsg(ctx, ec)
-		return
-	}
-
-	ReplyOk(ctx, nil)
-}
-
-func OpGetRavenIQTestList(ctx *gin.Context) {
-	req := ctx.MustGet("client_req").(*Raven_IQ_testproto.OpListReq)
-
-	//设置默认页长
-	if req.Limit == 0 {
-		req.Limit = consts.DefaultPageSize
-	}
-
-	list, ec := service.DefaultService.OpGetRavenIQTestList(ctx, req)
-	if ec != errcode.ErrCodeRavenIQTestSrvOk {
-		logger.Error("OpGetRavenIQTestList fail, req: %v, ec: %v", util.ToJson(req), ec)
-		ReplyErrCodeMsg(ctx, ec)
-		return
-	}
-
-	data := &Raven_IQ_testproto.OpListData{
-		List:   list,
-		Offset: req.Offset + len(list),
-	}
-	if len(list) >= req.Limit {
-		data.More = 1
-	}
-	ReplyOk(ctx, data)
-}
diff --git a/app/mix/controller/init.go b/app/mix/controller/init.go
index 5a2f44e2..550a736e 100644
--- a/app/mix/controller/init.go
+++ b/app/mix/controller/init.go
@@ -19,6 +19,7 @@ import (
 	"service/api/base"
 	"service/api/consts"
 	"service/api/errcode"
+	Raven_IQ_testproto "service/api/proto/Raven_IQ_test/proto"
 	accountproto "service/api/proto/account/proto"
 	account_cancellationproto "service/api/proto/account_cancellation/proto"
 	accountpunishmentproto "service/api/proto/accountpunishment/proto"
@@ -269,6 +270,11 @@ func Init(r *gin.Engine) {
 	apiHvyogoGroup.POST("single_distribute", middleware.JSONParamValidator(hvyogoproto.ApiSingleDistributeReq{}), middleware.JwtAuthenticator(), middleware.RequestDecryptor(), ApiHvyogoSingleDistribute)
 	apiHvyogoGroup.POST("worker_update", middleware.JSONParamValidator(hvyogoproto.ApiWorkerUpdateReq{}), middleware.JwtAuthenticator(), middleware.RequestDecryptor(), ApiHvyogoWorkerUpdate)
 
+	// 瑞文智商测试表
+	apiRavenIQTestGroup := r.Group("/api/Raven_IQ_test", PrepareToC())
+	apiRavenIQTestGroup.POST("create", middleware.JSONParamValidator(Raven_IQ_testproto.ApiCreateReq{}), ApiCreateRavenIQTest)
+	apiRavenIQTestGroup.POST("list", middleware.JSONParamValidator(Raven_IQ_testproto.ApiListReq{}), ApiGetRavenIQTestList)
+
 	// =============================== 以下是服务，只允许内网调用 ===============================
 
 	// op相关，直接调用服务，不调用gateway

From de756dab19d0f19a55a579059b650c831659afe8 Mon Sep 17 00:00:00 2001
From: Leufolium <Caeruscaemon@outlook.com>
Date: Fri, 19 Jul 2024 17:46:58 +0800
Subject: [PATCH 04/17] 1

---
 api/consts/consts.go          |  2 ++
 api/consts/predicate.go       | 25 ++++++++++++++++++++++
 apollostruct/RavenIQtest.go   | 23 +++++++++++++++++++++
 app/mix/service/apiservice.go | 39 ++++++++++++++++++++++++++++++++++-
 bizcommon/util/util.go        | 36 ++++++++++++++++++++++++++++++++
 dbstruct/RavenIQTest.go       | 22 ++++++++++++++++----
 6 files changed, 142 insertions(+), 5 deletions(-)
 create mode 100644 apollostruct/RavenIQtest.go

diff --git a/api/consts/consts.go b/api/consts/consts.go
index 04fe0472..3c9f4f5f 100644
--- a/api/consts/consts.go
+++ b/api/consts/consts.go
@@ -57,6 +57,8 @@ const (
 	ZoneVIPConfigKey                          = "zone_vip_config"
 	StreamerScoreFormulaKey                   = "streamer_score_formula"
 	HvyogoSingleDistributeChargePercentageKey = "hvyogo_single_distribute_charge_percentage"
+	QuestionMapKey                            = "question_map"
+	AgeScore2IQResultMap                      = "age_score_2_IQ_result_map"
 )
 
 // del_flag
diff --git a/api/consts/predicate.go b/api/consts/predicate.go
index 58366d5c..380bc8c9 100644
--- a/api/consts/predicate.go
+++ b/api/consts/predicate.go
@@ -28,3 +28,28 @@ const (
 	ContactCustomerService_FromUser      = 0
 	ContactCustomerService_FromSupportor = 1
 )
+
+// Raven_IQ_test 年龄段谓词
+const (
+	Age1  = 1
+	Age2  = 2
+	Age3  = 3
+	Age4  = 4
+	Age5  = 5
+	Age6  = 6
+	Age7  = 7
+	Age8  = 8
+	Age9  = 9
+	Age10 = 10
+)
+
+// Raven_IQ_test 智商段谓词
+const (
+	IQSegment1 = 1
+	IQSegment2 = 2
+	IQSegment3 = 3
+	IQSegment4 = 4
+	IQSegment5 = 5
+	IQSegment6 = 6
+	IQSegment7 = 7
+)
diff --git a/apollostruct/RavenIQtest.go b/apollostruct/RavenIQtest.go
new file mode 100644
index 00000000..7afcec21
--- /dev/null
+++ b/apollostruct/RavenIQtest.go
@@ -0,0 +1,23 @@
+package apollostruct
+
+type QuestionMapCfg struct {
+	Map map[int64]*RavenIQTestQuestion `json:"map"`
+}
+
+type RavenIQTestQuestion struct {
+	QuestionId    int64 `json:"question_id" bson:"question_id"`       // 问题Id
+	ClassId       int64 `json:"class_id" bson:"class_id"`             // 大类id
+	CorrectOption int64 `json:"correct_option" bson:"correct_option"` // 正确选项
+}
+
+type IQResult struct {
+	IQBlockId   int64  `json:"IQ_Block_Id"` // IQ分段id
+	Percentile  int64  `json:"percentile"`  // 百分位
+	Description string `json:"description"` // 描述
+}
+
+type AgeScore2IQResultMapCfg struct {
+	AgeBlockIndex2ScoreBlockListMap map[int][]float64 `json:"age_block_index_2_score_block_list_map"` // 年龄分段到分数分布区域的映射map
+	AgeBlockList                    []int64           `json:"age_block_list"`                         // 年龄段区域，以年龄在该年龄段中第一次出现或最后一个比他小的位置作为年龄段索引
+	ScoreBlockIndex2IQResultMap     map[int]*IQResult `json:"score_block_index_2_IQ_result_map"`      // 分数分段到IQ结果的映射map
+}
diff --git a/app/mix/service/apiservice.go b/app/mix/service/apiservice.go
index ceb03538..bb00cb53 100644
--- a/app/mix/service/apiservice.go
+++ b/app/mix/service/apiservice.go
@@ -3593,8 +3593,45 @@ func (s *Service) ApiCreateRavenIQTest(ctx *gin.Context, req *Raven_IQ_testproto
 	ec = errcode.ErrCodeRavenIQTestSrvOk
 
 	// 计算总得分
+	questionMapcfg := apollostruct.QuestionMapCfg{}
+	err := apollo.GetJson(consts.QuestionMapKey, &questionMapcfg, apollo.ApolloOpts().SetNamespace("Raven_IQ_test"))
+	if err != nil {
+		logger.Error("Apollo read failed : %v", err)
+		return errcode.ErrCodeApolloReadFail
+	}
 
-	err := _DefaultRavenIQTest.OpCreate(ctx, &Raven_IQ_testproto.OpCreateReq{
+	classScoreMap := make(map[int64]int64)
+	for _, answer := range req.AnswerList {
+		if answer.GetSelectedOption() == questionMapcfg.Map[answer.GetQuestionId()].CorrectOption {
+			classScoreMap[answer.GetQuestionId()] += 1
+		}
+	}
+
+	req.ClassScoreList = make([]*dbstruct.RavenIQTestClassScore, 0)
+	totalScore := float64(0)
+	for classId, score := range classScoreMap {
+		req.ClassScoreList = append(req.ClassScoreList, &dbstruct.RavenIQTestClassScore{
+			ClassId: goproto.Int64(classId),
+			Score:   goproto.Int64(score),
+		})
+		totalScore += float64(score)
+	}
+	req.TotalScore = goproto.Float64(totalScore)
+
+	// 换算智商及百分位
+	cfg := apollostruct.AgeScore2IQResultMapCfg{}
+	err = apollo.GetJson(consts.AgeScore2IQResultMap, &cfg, apollo.ApolloOpts().SetNamespace("Raven_IQ_test"))
+	if err != nil {
+		logger.Error("Apollo read failed : %v", err)
+		ec = errcode.ErrCodeApolloReadFail
+		return
+	}
+	idx := util.GetLastLessOrEqualForInt64(cfg.AgeBlockList, req.GetAge())
+	list := cfg.AgeBlockIndex2ScoreBlockListMap[idx]
+	idx2 := util.GetLastLessOrEqualForFloat64(list, req.GetTotalScore())
+	IQResult := cfg.ScoreBlockIndex2IQResultMap[idx2]
+
+	err = _DefaultRavenIQTest.OpCreate(ctx, &Raven_IQ_testproto.OpCreateReq{
 		BaseRequest: req.BaseRequest,
 		RavenIQTest: req.RavenIQTest,
 	})
diff --git a/bizcommon/util/util.go b/bizcommon/util/util.go
index e08f3b6b..7e189fbd 100644
--- a/bizcommon/util/util.go
+++ b/bizcommon/util/util.go
@@ -217,3 +217,39 @@ func SortParam(argList []*message.JsonParamEntry) string {
 	}
 	return strings.Join(args, "&")
 }
+
+func GetLastLessOrEqualForInt64(arr []int64, target int64) int {
+	low, high := 0, len(arr)-1
+	result := -1
+
+	for low <= high {
+		mid := (low + high) / 2
+
+		if arr[mid] <= target {
+			result = mid  // 记录当前找到的索引
+			low = mid + 1 // 继续在右半部分查找
+		} else {
+			high = mid - 1 // 目标值在左半部分，缩小搜索范围
+		}
+	}
+
+	return result
+}
+
+func GetLastLessOrEqualForFloat64(arr []float64, target float64) int {
+	low, high := 0, len(arr)-1
+	result := -1
+
+	for low <= high {
+		mid := (low + high) / 2
+
+		if arr[mid] <= target {
+			result = mid  // 记录当前找到的索引
+			low = mid + 1 // 继续在右半部分查找
+		} else {
+			high = mid - 1 // 目标值在左半部分，缩小搜索范围
+		}
+	}
+
+	return result
+}
diff --git a/dbstruct/RavenIQTest.go b/dbstruct/RavenIQTest.go
index 5f42b80a..64efb754 100644
--- a/dbstruct/RavenIQTest.go
+++ b/dbstruct/RavenIQTest.go
@@ -4,7 +4,7 @@ type RavenIQTest struct {
 	Id             *int64                   `json:"id" bson:"_id"`                            // 瑞文智商测试表id
 	UserId         *int64                   `json:"user_id" bson:"user_id"`                   // 用户id
 	Age            *int64                   `json:"age" bson:"age"`                           // 年龄
-	TotalScores    *int64                   `json:"total_scores" bson:"total_scores"`         // 总得分
+	TotalScore     *float64                 `json:"total_score" bson:"total_score"`           // 总得分
 	IQ             *float64                 `json:"IQ" bson:"IQ"`                             // 智商值
 	AnswerList     []*RavenIQTestAnswer     `json:"answer_list" bson:"answer_list"`           // 答案list
 	ClassScoreList []*RavenIQTestClassScore `json:"class_score_list" bson:"class_score_list"` // 大类得分list
@@ -44,11 +44,11 @@ func (p *RavenIQTest) GetAge() int64 {
 	return *p.Age
 }
 
-func (p *RavenIQTest) GetTotalScores() int64 {
-	if p == nil || p.TotalScores == nil {
+func (p *RavenIQTest) GetTotalScore() float64 {
+	if p == nil || p.TotalScore == nil {
 		return 0
 	}
-	return *p.TotalScores
+	return *p.TotalScore
 }
 
 func (p *RavenIQTest) GetIQ() float64 {
@@ -58,6 +58,20 @@ func (p *RavenIQTest) GetIQ() float64 {
 	return *p.IQ
 }
 
+func (p *RavenIQTestAnswer) GetQuestionId() int64 {
+	if p == nil || p.QuestionId == nil {
+		return 0
+	}
+	return *p.QuestionId
+}
+
+func (p *RavenIQTestAnswer) GetSelectedOption() int64 {
+	if p == nil || p.SelectedOption == nil {
+		return 0
+	}
+	return *p.SelectedOption
+}
+
 func (p *RavenIQTestClassScore) GetClassId() int64 {
 	if p == nil || p.ClassId == nil {
 		return 0

From 2167befc4d623f1a91a0daa629abe2820227b369 Mon Sep 17 00:00:00 2001
From: Leufolium <Caeruscaemon@outlook.com>
Date: Fri, 19 Jul 2024 18:31:15 +0800
Subject: [PATCH 05/17] 1

---
 api/consts/consts.go                          |  3 ++-
 .../proto/Raven_IQ_test_vo_api.go             | 10 ++++-----
 apollostruct/RavenIQtest.go                   |  6 +++++-
 app/mix/service/apiservice.go                 | 21 ++++++++++++++-----
 dbstruct/RavenIQTest.go                       |  8 +++----
 5 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/api/consts/consts.go b/api/consts/consts.go
index 3c9f4f5f..acfed7d5 100644
--- a/api/consts/consts.go
+++ b/api/consts/consts.go
@@ -58,7 +58,8 @@ const (
 	StreamerScoreFormulaKey                   = "streamer_score_formula"
 	HvyogoSingleDistributeChargePercentageKey = "hvyogo_single_distribute_charge_percentage"
 	QuestionMapKey                            = "question_map"
-	AgeScore2IQResultMap                      = "age_score_2_IQ_result_map"
+	AgeScore2IQResultMapKey                   = "age_score_2_IQ_result_map"
+	IQResultMapKey                            = "IQ_result_map"
 )
 
 // del_flag
diff --git a/api/proto/Raven_IQ_test/proto/Raven_IQ_test_vo_api.go b/api/proto/Raven_IQ_test/proto/Raven_IQ_test_vo_api.go
index 2511a7a7..2e7c6aa6 100644
--- a/api/proto/Raven_IQ_test/proto/Raven_IQ_test_vo_api.go
+++ b/api/proto/Raven_IQ_test/proto/Raven_IQ_test_vo_api.go
@@ -7,9 +7,9 @@ import (
 type ApiListVO struct {
 	Id             int64              `json:"id"`               // 瑞文智商测试表id
 	UserId         int64              `json:"user_id"`          // 用户id
-	Age            int64              `json:"age" `             // 年龄
-	TotalScores    int64              `json:"total_scores"`     // 总得分
-	IQ             float64            `json:"IQ"`               // 智商值
+	Age            int64              `json:"age"`              // 年龄
+	TotalScore     float64            `json:"total_score"`      // 总得分
+	IQBlockId      int64              `json:"IQ_block_id"`      // 智商值
 	Percentile     int64              `json:"percentile"`       // 百分位
 	Description    string             `json:"description"`      // 描述
 	ClassScoreList []*ApiClassSocreVO `json:"class_score_list"` // 大类得分list
@@ -28,8 +28,8 @@ func (vo *ApiListVO) CopyRavenIQTest(test *dbstruct.RavenIQTest) *ApiListVO {
 	vo.Id = test.GetId()
 	vo.UserId = test.GetUserId()
 	vo.Age = test.GetAge()
-	vo.TotalScores = test.GetTotalScores()
-	vo.IQ = test.GetIQ()
+	vo.TotalScore = test.GetTotalScore()
+	vo.IQBlockId = test.GetIQBlockId()
 	vo.ClassScoreList = make([]*ApiClassSocreVO, 0)
 	for _, score := range test.ClassScoreList {
 		vo.ClassScoreList = append(vo.ClassScoreList, &ApiClassSocreVO{
diff --git a/apollostruct/RavenIQtest.go b/apollostruct/RavenIQtest.go
index 7afcec21..e16a63b0 100644
--- a/apollostruct/RavenIQtest.go
+++ b/apollostruct/RavenIQtest.go
@@ -19,5 +19,9 @@ type IQResult struct {
 type AgeScore2IQResultMapCfg struct {
 	AgeBlockIndex2ScoreBlockListMap map[int][]float64 `json:"age_block_index_2_score_block_list_map"` // 年龄分段到分数分布区域的映射map
 	AgeBlockList                    []int64           `json:"age_block_list"`                         // 年龄段区域，以年龄在该年龄段中第一次出现或最后一个比他小的位置作为年龄段索引
-	ScoreBlockIndex2IQResultMap     map[int]*IQResult `json:"score_block_index_2_IQ_result_map"`      // 分数分段到IQ结果的映射map
+	ScoreBlockIndex2IQBlockIdMap    map[int]int64     `json:"score_block_index_2_IQ_block_id_map"`    // 分数分段到IQ范围id的映射map
+}
+
+type IQResultMapCfg struct {
+	Map map[int64]*IQResult `json:"map"`
 }
diff --git a/app/mix/service/apiservice.go b/app/mix/service/apiservice.go
index bb00cb53..e84b4996 100644
--- a/app/mix/service/apiservice.go
+++ b/app/mix/service/apiservice.go
@@ -3620,16 +3620,17 @@ func (s *Service) ApiCreateRavenIQTest(ctx *gin.Context, req *Raven_IQ_testproto
 
 	// 换算智商及百分位
 	cfg := apollostruct.AgeScore2IQResultMapCfg{}
-	err = apollo.GetJson(consts.AgeScore2IQResultMap, &cfg, apollo.ApolloOpts().SetNamespace("Raven_IQ_test"))
+	err = apollo.GetJson(consts.AgeScore2IQResultMapKey, &cfg, apollo.ApolloOpts().SetNamespace("Raven_IQ_test"))
 	if err != nil {
 		logger.Error("Apollo read failed : %v", err)
 		ec = errcode.ErrCodeApolloReadFail
 		return
 	}
-	idx := util.GetLastLessOrEqualForInt64(cfg.AgeBlockList, req.GetAge())
-	list := cfg.AgeBlockIndex2ScoreBlockListMap[idx]
-	idx2 := util.GetLastLessOrEqualForFloat64(list, req.GetTotalScore())
-	IQResult := cfg.ScoreBlockIndex2IQResultMap[idx2]
+	ageBlockIdx := util.GetLastLessOrEqualForInt64(cfg.AgeBlockList, req.GetAge())
+	list := cfg.AgeBlockIndex2ScoreBlockListMap[ageBlockIdx]
+	scoreBlockIdx := util.GetLastLessOrEqualForFloat64(list, req.GetTotalScore())
+	IQBlockId := cfg.ScoreBlockIndex2IQBlockIdMap[scoreBlockIdx]
+	req.IQBlockId = goproto.Int64(IQBlockId)
 
 	err = _DefaultRavenIQTest.OpCreate(ctx, &Raven_IQ_testproto.OpCreateReq{
 		BaseRequest: req.BaseRequest,
@@ -3663,6 +3664,16 @@ func (s *Service) ApiGetRavenIQTestList(ctx *gin.Context, req *Raven_IQ_testprot
 	vo.CopyRavenIQTest(test)
 
 	// 填充业务数据
+	cfg := apollostruct.IQResultMapCfg{}
+	err = apollo.GetJson(consts.IQResultMapKey, &cfg, apollo.ApolloOpts().SetNamespace("Raven_IQ_test"))
+	if err != nil {
+		logger.Error("Apollo read failed : %v", err)
+		ec = errcode.ErrCodeApolloReadFail
+		return
+	}
+	IQResult := cfg.Map[vo.IQBlockId]
+	vo.Percentile = IQResult.Percentile
+	vo.Description = IQResult.Description
 
 	return
 }
diff --git a/dbstruct/RavenIQTest.go b/dbstruct/RavenIQTest.go
index 64efb754..30c03b9d 100644
--- a/dbstruct/RavenIQTest.go
+++ b/dbstruct/RavenIQTest.go
@@ -5,7 +5,7 @@ type RavenIQTest struct {
 	UserId         *int64                   `json:"user_id" bson:"user_id"`                   // 用户id
 	Age            *int64                   `json:"age" bson:"age"`                           // 年龄
 	TotalScore     *float64                 `json:"total_score" bson:"total_score"`           // 总得分
-	IQ             *float64                 `json:"IQ" bson:"IQ"`                             // 智商值
+	IQBlockId      *int64                   `json:"IQ_block_id" bson:"IQ_block_id"`           // 智商值key
 	AnswerList     []*RavenIQTestAnswer     `json:"answer_list" bson:"answer_list"`           // 答案list
 	ClassScoreList []*RavenIQTestClassScore `json:"class_score_list" bson:"class_score_list"` // 大类得分list
 	Ct             *int64                   `json:"ct" bson:"ct"`                             // 创建时间
@@ -51,11 +51,11 @@ func (p *RavenIQTest) GetTotalScore() float64 {
 	return *p.TotalScore
 }
 
-func (p *RavenIQTest) GetIQ() float64 {
-	if p == nil || p.IQ == nil {
+func (p *RavenIQTest) GetIQBlockId() int64 {
+	if p == nil || p.IQBlockId == nil {
 		return 0
 	}
-	return *p.IQ
+	return *p.IQBlockId
 }
 
 func (p *RavenIQTestAnswer) GetQuestionId() int64 {

From b283c34f44a383941c86e046db3dcbc2c0a6bd28 Mon Sep 17 00:00:00 2001
From: Leufolium <Caeruscaemon@outlook.com>
Date: Mon, 22 Jul 2024 09:17:49 +0800
Subject: [PATCH 06/17] by Robin at 20240722

---
 api/consts/consts.go                          |  2 +
 .../proto/Raven_IQ_test_vo_api.go             | 12 +++--
 apollostruct/RavenIQtest.go                   | 13 ++++++
 app/mix/service/apiservice.go                 | 46 +++++++++++++++----
 dbstruct/RavenIQTest.go                       | 12 ++++-
 5 files changed, 70 insertions(+), 15 deletions(-)

diff --git a/api/consts/consts.go b/api/consts/consts.go
index acfed7d5..01bc4720 100644
--- a/api/consts/consts.go
+++ b/api/consts/consts.go
@@ -59,7 +59,9 @@ const (
 	HvyogoSingleDistributeChargePercentageKey = "hvyogo_single_distribute_charge_percentage"
 	QuestionMapKey                            = "question_map"
 	AgeScore2IQResultMapKey                   = "age_score_2_IQ_result_map"
+	ClassScore2ClassResultMapKey              = "class_score_2_class_result_map"
 	IQResultMapKey                            = "IQ_result_map"
+	ClassResultMapKey                         = "class_result_map"
 )
 
 // del_flag
diff --git a/api/proto/Raven_IQ_test/proto/Raven_IQ_test_vo_api.go b/api/proto/Raven_IQ_test/proto/Raven_IQ_test_vo_api.go
index 2e7c6aa6..abd90fba 100644
--- a/api/proto/Raven_IQ_test/proto/Raven_IQ_test_vo_api.go
+++ b/api/proto/Raven_IQ_test/proto/Raven_IQ_test_vo_api.go
@@ -16,9 +16,10 @@ type ApiListVO struct {
 }
 
 type ApiClassSocreVO struct {
-	ClassId     int64  `json:"class_id"`    // 大类id
-	Score       int64  `json:"score"`       // 得分
-	Suggestions string `json:"suggestions"` // 建议
+	ClassId      int64  `json:"class_id"`       // 大类id
+	Score        int64  `json:"score"`          // 得分
+	ClassBlockId int64  `json:"class_block_id"` // 大类得分key
+	Suggestions  string `json:"suggestions"`    // 建议
 }
 
 func (vo *ApiListVO) CopyRavenIQTest(test *dbstruct.RavenIQTest) *ApiListVO {
@@ -33,8 +34,9 @@ func (vo *ApiListVO) CopyRavenIQTest(test *dbstruct.RavenIQTest) *ApiListVO {
 	vo.ClassScoreList = make([]*ApiClassSocreVO, 0)
 	for _, score := range test.ClassScoreList {
 		vo.ClassScoreList = append(vo.ClassScoreList, &ApiClassSocreVO{
-			ClassId: score.GetClassId(),
-			Score:   score.GetScore(),
+			ClassId:      score.GetClassId(),
+			Score:        score.GetScore(),
+			ClassBlockId: score.GetClassBlockId(),
 		})
 	}
 	return vo
diff --git a/apollostruct/RavenIQtest.go b/apollostruct/RavenIQtest.go
index e16a63b0..7d0efe66 100644
--- a/apollostruct/RavenIQtest.go
+++ b/apollostruct/RavenIQtest.go
@@ -22,6 +22,19 @@ type AgeScore2IQResultMapCfg struct {
 	ScoreBlockIndex2IQBlockIdMap    map[int]int64     `json:"score_block_index_2_IQ_block_id_map"`    // 分数分段到IQ范围id的映射map
 }
 
+type ClassScore2ClassResultMapCfg struct {
+	ClassId2ClassScoreBlockListMap map[int64][]int64 `json:"class_id_2_class_score_block_list_map" bson:"class_id_2_class_score_block_list_map"` // 大类Id到大类分数分布区域的映射map
+}
+
 type IQResultMapCfg struct {
 	Map map[int64]*IQResult `json:"map"`
 }
+
+type ClassResult struct {
+	ClassId     int64  `json:"class_id"`    // 大类id
+	Description string `json:"description"` // 描述
+}
+
+type ClassResultMapCfg struct {
+	Map map[int64]*ClassResult `json:"map"`
+}
diff --git a/app/mix/service/apiservice.go b/app/mix/service/apiservice.go
index e84b4996..b8d6eb95 100644
--- a/app/mix/service/apiservice.go
+++ b/app/mix/service/apiservice.go
@@ -3619,17 +3619,33 @@ func (s *Service) ApiCreateRavenIQTest(ctx *gin.Context, req *Raven_IQ_testproto
 	req.TotalScore = goproto.Float64(totalScore)
 
 	// 换算智商及百分位
-	cfg := apollostruct.AgeScore2IQResultMapCfg{}
-	err = apollo.GetJson(consts.AgeScore2IQResultMapKey, &cfg, apollo.ApolloOpts().SetNamespace("Raven_IQ_test"))
+	ageScore2IQResultMapCfg := apollostruct.AgeScore2IQResultMapCfg{}
+	err = apollo.GetJson(consts.AgeScore2IQResultMapKey, &ageScore2IQResultMapCfg, apollo.ApolloOpts().SetNamespace("Raven_IQ_test"))
 	if err != nil {
 		logger.Error("Apollo read failed : %v", err)
 		ec = errcode.ErrCodeApolloReadFail
 		return
 	}
-	ageBlockIdx := util.GetLastLessOrEqualForInt64(cfg.AgeBlockList, req.GetAge())
-	list := cfg.AgeBlockIndex2ScoreBlockListMap[ageBlockIdx]
+
+	classScore2ClassResultMapCfg := apollostruct.ClassScore2ClassResultMapCfg{}
+	err = apollo.GetJson(consts.ClassScore2ClassResultMapKey, &classScore2ClassResultMapCfg, apollo.ApolloOpts().SetNamespace("Raven_IQ_test"))
+	if err != nil {
+		logger.Error("Apollo read failed : %v", err)
+		ec = errcode.ErrCodeApolloReadFail
+		return
+	}
+
+	ageBlockIdx := util.GetLastLessOrEqualForInt64(ageScore2IQResultMapCfg.AgeBlockList, req.GetAge())
+	list := ageScore2IQResultMapCfg.AgeBlockIndex2ScoreBlockListMap[ageBlockIdx]
 	scoreBlockIdx := util.GetLastLessOrEqualForFloat64(list, req.GetTotalScore())
-	IQBlockId := cfg.ScoreBlockIndex2IQBlockIdMap[scoreBlockIdx]
+	IQBlockId := ageScore2IQResultMapCfg.ScoreBlockIndex2IQBlockIdMap[scoreBlockIdx]
+
+	for _, classScore := range req.ClassScoreList {
+		classScoreBlockList := classScore2ClassResultMapCfg.ClassId2ClassScoreBlockListMap[classScore.GetClassId()]
+		classScoreBlockIdx := util.GetLastLessOrEqualForInt64(classScoreBlockList, classScore.GetScore())
+		classScore.ClassBlockId = goproto.Int64(int64(classScoreBlockIdx))
+	}
+
 	req.IQBlockId = goproto.Int64(IQBlockId)
 
 	err = _DefaultRavenIQTest.OpCreate(ctx, &Raven_IQ_testproto.OpCreateReq{
@@ -3664,16 +3680,30 @@ func (s *Service) ApiGetRavenIQTestList(ctx *gin.Context, req *Raven_IQ_testprot
 	vo.CopyRavenIQTest(test)
 
 	// 填充业务数据
-	cfg := apollostruct.IQResultMapCfg{}
-	err = apollo.GetJson(consts.IQResultMapKey, &cfg, apollo.ApolloOpts().SetNamespace("Raven_IQ_test"))
+	IQResultMpcfg := apollostruct.IQResultMapCfg{}
+	err = apollo.GetJson(consts.IQResultMapKey, &IQResultMpcfg, apollo.ApolloOpts().SetNamespace("Raven_IQ_test"))
 	if err != nil {
 		logger.Error("Apollo read failed : %v", err)
 		ec = errcode.ErrCodeApolloReadFail
 		return
 	}
-	IQResult := cfg.Map[vo.IQBlockId]
+
+	classResultMpCfg := apollostruct.ClassResultMapCfg{}
+	err = apollo.GetJson(consts.ClassResultMapKey, &classResultMpCfg, apollo.ApolloOpts().SetNamespace("Raven_IQ_test"))
+	if err != nil {
+		logger.Error("Apollo read failed : %v", err)
+		ec = errcode.ErrCodeApolloReadFail
+		return
+	}
+
+	IQResult := IQResultMpcfg.Map[vo.IQBlockId]
 	vo.Percentile = IQResult.Percentile
 	vo.Description = IQResult.Description
 
+	for _, classScore := range vo.ClassScoreList {
+		classResult := classResultMpCfg.Map[classScore.ClassBlockId]
+		classScore.Suggestions = classResult.Description
+	}
+
 	return
 }
diff --git a/dbstruct/RavenIQTest.go b/dbstruct/RavenIQTest.go
index 30c03b9d..3747d123 100644
--- a/dbstruct/RavenIQTest.go
+++ b/dbstruct/RavenIQTest.go
@@ -19,8 +19,9 @@ type RavenIQTestAnswer struct {
 }
 
 type RavenIQTestClassScore struct {
-	ClassId *int64 `json:"class_id" bson:"class_id"` // 大类id
-	Score   *int64 `json:"score" bson:"score"`       // 得分
+	ClassId      *int64 `json:"class_id" bson:"class_id"`             // 大类id
+	Score        *int64 `json:"score" bson:"score"`                   // 得分
+	ClassBlockId *int64 `json:"class_block_id" bson:"class_block_id"` // 大类得分key
 }
 
 func (p *RavenIQTest) GetId() int64 {
@@ -85,3 +86,10 @@ func (p *RavenIQTestClassScore) GetScore() int64 {
 	}
 	return *p.Score
 }
+
+func (p *RavenIQTestClassScore) GetClassBlockId() int64 {
+	if p == nil || p.ClassBlockId == nil {
+		return 0
+	}
+	return *p.ClassBlockId
+}

From 62efdad5c02f940c012078ac8155aec79520aa76 Mon Sep 17 00:00:00 2001
From: Leufolium <Caeruscaemon@outlook.com>
Date: Mon, 22 Jul 2024 13:45:57 +0800
Subject: [PATCH 07/17] 1

---
 .../proto/Raven_IQ_test_vo_api.go             | 34 +++++++++----------
 apollostruct/RavenIQtest.go                   | 23 ++++++++++---
 app/mix/service/apiservice.go                 |  7 ++--
 3 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/api/proto/Raven_IQ_test/proto/Raven_IQ_test_vo_api.go b/api/proto/Raven_IQ_test/proto/Raven_IQ_test_vo_api.go
index abd90fba..0eb58447 100644
--- a/api/proto/Raven_IQ_test/proto/Raven_IQ_test_vo_api.go
+++ b/api/proto/Raven_IQ_test/proto/Raven_IQ_test_vo_api.go
@@ -1,25 +1,23 @@
 package proto
 
 import (
+	"service/apollostruct"
 	"service/dbstruct"
 )
 
 type ApiListVO struct {
-	Id             int64              `json:"id"`               // 瑞文智商测试表id
-	UserId         int64              `json:"user_id"`          // 用户id
-	Age            int64              `json:"age"`              // 年龄
-	TotalScore     float64            `json:"total_score"`      // 总得分
-	IQBlockId      int64              `json:"IQ_block_id"`      // 智商值
-	Percentile     int64              `json:"percentile"`       // 百分位
-	Description    string             `json:"description"`      // 描述
-	ClassScoreList []*ApiClassSocreVO `json:"class_score_list"` // 大类得分list
+	Id         int64   `json:"id"`          // 瑞文智商测试表id
+	UserId     int64   `json:"user_id"`     // 用户id
+	Age        int64   `json:"age"`         // 年龄
+	TotalScore float64 `json:"total_score"` // 总得分
+	*apollostruct.IQResult
+	ClassScoreList []*ApiClassScoreVO `json:"class_score_list"` // 大类得分list
 }
 
-type ApiClassSocreVO struct {
-	ClassId      int64  `json:"class_id"`       // 大类id
-	Score        int64  `json:"score"`          // 得分
-	ClassBlockId int64  `json:"class_block_id"` // 大类得分key
-	Suggestions  string `json:"suggestions"`    // 建议
+type ApiClassScoreVO struct {
+	ClassBlockId int64 `json:"class_block_id"` // 大类得分key
+	Score        int64 `json:"score"`          // 总分
+	*apollostruct.ClassResult
 }
 
 func (vo *ApiListVO) CopyRavenIQTest(test *dbstruct.RavenIQTest) *ApiListVO {
@@ -31,12 +29,14 @@ func (vo *ApiListVO) CopyRavenIQTest(test *dbstruct.RavenIQTest) *ApiListVO {
 	vo.Age = test.GetAge()
 	vo.TotalScore = test.GetTotalScore()
 	vo.IQBlockId = test.GetIQBlockId()
-	vo.ClassScoreList = make([]*ApiClassSocreVO, 0)
+	vo.ClassScoreList = make([]*ApiClassScoreVO, 0)
 	for _, score := range test.ClassScoreList {
-		vo.ClassScoreList = append(vo.ClassScoreList, &ApiClassSocreVO{
-			ClassId:      score.GetClassId(),
-			Score:        score.GetScore(),
+		vo.ClassScoreList = append(vo.ClassScoreList, &ApiClassScoreVO{
 			ClassBlockId: score.GetClassBlockId(),
+			Score:        score.GetScore(),
+			ClassResult: &apollostruct.ClassResult{
+				ClassId: score.GetClassId(),
+			},
 		})
 	}
 	return vo
diff --git a/apollostruct/RavenIQtest.go b/apollostruct/RavenIQtest.go
index 7d0efe66..ec2ba71d 100644
--- a/apollostruct/RavenIQtest.go
+++ b/apollostruct/RavenIQtest.go
@@ -11,9 +11,10 @@ type RavenIQTestQuestion struct {
 }
 
 type IQResult struct {
-	IQBlockId   int64  `json:"IQ_Block_Id"` // IQ分段id
-	Percentile  int64  `json:"percentile"`  // 百分位
-	Description string `json:"description"` // 描述
+	IQBlockId   int64    `json:"IQ_Block_Id"` // IQ分段id
+	Percentile  int64    `json:"percentile"`  // 百分位
+	Description string   `json:"description"` // 描述
+	Suggestions []string `json:"suggestions"` // 建议
 }
 
 type AgeScore2IQResultMapCfg struct {
@@ -31,8 +32,20 @@ type IQResultMapCfg struct {
 }
 
 type ClassResult struct {
-	ClassId     int64  `json:"class_id"`    // 大类id
-	Description string `json:"description"` // 描述
+	ClassId     int64         `json:"class_id"`    // 大类id
+	Description string        `json:"description"` // 描述
+	Analysis    string        `json:"analysis"`    // 成绩分析
+	Suggestions []*Suggestion `json:"suggestions"` // 建议
+}
+
+type Suggestion struct {
+	Title string `json:"title"`
+	Tips  []*Tip `json:"tips"`
+}
+
+type Tip struct {
+	Summary string `json:"summary"` // 概括
+	Content string `json:"content"` // 内容
 }
 
 type ClassResultMapCfg struct {
diff --git a/app/mix/service/apiservice.go b/app/mix/service/apiservice.go
index b8d6eb95..97461d85 100644
--- a/app/mix/service/apiservice.go
+++ b/app/mix/service/apiservice.go
@@ -3696,13 +3696,10 @@ func (s *Service) ApiGetRavenIQTestList(ctx *gin.Context, req *Raven_IQ_testprot
 		return
 	}
 
-	IQResult := IQResultMpcfg.Map[vo.IQBlockId]
-	vo.Percentile = IQResult.Percentile
-	vo.Description = IQResult.Description
+	vo.IQResult = IQResultMpcfg.Map[vo.IQBlockId]
 
 	for _, classScore := range vo.ClassScoreList {
-		classResult := classResultMpCfg.Map[classScore.ClassBlockId]
-		classScore.Suggestions = classResult.Description
+		classScore.ClassResult = classResultMpCfg.Map[classScore.ClassBlockId]
 	}
 
 	return

From de7adf04e8d332543e672520fab829ec7c613d87 Mon Sep 17 00:00:00 2001
From: Leufolium <Caeruscaemon@outlook.com>
Date: Mon, 22 Jul 2024 15:57:56 +0800
Subject: [PATCH 08/17] 1

---
 api/errcode/errcode.go                        | 13 ++---
 .../proto/Raven_IQ_test_vo_api.go             |  1 +
 .../Raven_IQ_test/proto/not_null_def_api.go   |  1 +
 apollostruct/RavenIQtest.go                   |  5 +-
 app/mix/dao/mongo.go                          |  2 +-
 app/mix/service/apiservice.go                 | 52 +++++++++++--------
 6 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/api/errcode/errcode.go b/api/errcode/errcode.go
index 8f44644a..4a0efe65 100644
--- a/api/errcode/errcode.go
+++ b/api/errcode/errcode.go
@@ -223,8 +223,9 @@ var ErrCodeMsgMap = map[ErrCode]string{
 
 	ErrCodeHvyogoSrvFail: "慧用工接口服务错误",
 
-	ErrCodeRavenIQTestSrvFail:  "瑞文智商测试表服务错误",
-	ErrCodeRavenIQTestNotExist: "瑞文智商测试表不存在",
+	ErrCodeRavenIQTestSrvFail:          "瑞文智商测试表服务错误",
+	ErrCodeRavenIQTestNotExist:         "瑞文智商测试表不存在",
+	ErrCodeRavenIQTestQuestionNotExist: "瑞文智商测试表题目不存在",
 }
 
 const (
@@ -546,8 +547,8 @@ const (
 	ErrCodeHandleWsFail ErrCode = -100001 // 长链连接失败
 
 	// RavenIQTest: 101xxx
-	ErrCodeRavenIQTestSrvOk    ErrCode = ErrCodeOk
-	ErrCodeRavenIQTestSrvFail  ErrCode = -101001 // 瑞文智商测试表服务错误
-	ErrCodeRavenIQTestNotExist ErrCode = -101002 // 瑞文智商测试表不存在
-
+	ErrCodeRavenIQTestSrvOk            ErrCode = ErrCodeOk
+	ErrCodeRavenIQTestSrvFail          ErrCode = -101001 // 瑞文智商测试表服务错误
+	ErrCodeRavenIQTestNotExist         ErrCode = -101002 // 瑞文智商测试表不存在
+	ErrCodeRavenIQTestQuestionNotExist ErrCode = -101003 // 瑞文智商测试表题目不存在
 )
diff --git a/api/proto/Raven_IQ_test/proto/Raven_IQ_test_vo_api.go b/api/proto/Raven_IQ_test/proto/Raven_IQ_test_vo_api.go
index 0eb58447..d481f205 100644
--- a/api/proto/Raven_IQ_test/proto/Raven_IQ_test_vo_api.go
+++ b/api/proto/Raven_IQ_test/proto/Raven_IQ_test_vo_api.go
@@ -24,6 +24,7 @@ func (vo *ApiListVO) CopyRavenIQTest(test *dbstruct.RavenIQTest) *ApiListVO {
 	if test == nil {
 		return vo
 	}
+	vo.IQResult = &apollostruct.IQResult{}
 	vo.Id = test.GetId()
 	vo.UserId = test.GetUserId()
 	vo.Age = test.GetAge()
diff --git a/api/proto/Raven_IQ_test/proto/not_null_def_api.go b/api/proto/Raven_IQ_test/proto/not_null_def_api.go
index 3259bcad..bcc08211 100644
--- a/api/proto/Raven_IQ_test/proto/not_null_def_api.go
+++ b/api/proto/Raven_IQ_test/proto/not_null_def_api.go
@@ -8,6 +8,7 @@ import (
 func (p *ApiCreateReq) ProvideNotNullValue() (params []*validator.JsonParam) {
 	params = make([]*validator.JsonParam, 0)
 	params = append(params, validator.NewInt64PtrParam("请提供您的年龄！", p.Age))
+	params = append(params, validator.NewStructSliceParam("请提供您的答案！", len(p.RavenIQTest.AnswerList)))
 	return params
 }
 
diff --git a/apollostruct/RavenIQtest.go b/apollostruct/RavenIQtest.go
index ec2ba71d..d1641058 100644
--- a/apollostruct/RavenIQtest.go
+++ b/apollostruct/RavenIQtest.go
@@ -1,7 +1,8 @@
 package apollostruct
 
 type QuestionMapCfg struct {
-	Map map[int64]*RavenIQTestQuestion `json:"map"`
+	Map       map[int64]*RavenIQTestQuestion `json:"map"`
+	ClassList []int64                        `json:"class_list"`
 }
 
 type RavenIQTestQuestion struct {
@@ -24,7 +25,7 @@ type AgeScore2IQResultMapCfg struct {
 }
 
 type ClassScore2ClassResultMapCfg struct {
-	ClassId2ClassScoreBlockListMap map[int64][]int64 `json:"class_id_2_class_score_block_list_map" bson:"class_id_2_class_score_block_list_map"` // 大类Id到大类分数分布区域的映射map
+	Map map[int64][]int64 `json:"map" bson:"map"` // 大类Id到大类分数分布区域的映射map
 }
 
 type IQResultMapCfg struct {
diff --git a/app/mix/dao/mongo.go b/app/mix/dao/mongo.go
index 29f17d6b..f6e053b5 100644
--- a/app/mix/dao/mongo.go
+++ b/app/mix/dao/mongo.go
@@ -5617,7 +5617,7 @@ func (m *Mongo) GetRavenIQTestById(ctx *gin.Context, id int64) (*dbstruct.RavenI
 	err := col.Find(ctx, query).One(test)
 	if err == qmgo.ErrNoSuchDocuments {
 		err = nil
-		return test, err
+		return nil, err
 	}
 	return test, err
 }
diff --git a/app/mix/service/apiservice.go b/app/mix/service/apiservice.go
index 97461d85..5be910ce 100644
--- a/app/mix/service/apiservice.go
+++ b/app/mix/service/apiservice.go
@@ -3592,7 +3592,7 @@ func (s *Service) ApiHvyogoWorkerUpdate(ctx *gin.Context, req *hvyogoproto.ApiWo
 func (s *Service) ApiCreateRavenIQTest(ctx *gin.Context, req *Raven_IQ_testproto.ApiCreateReq) (ec errcode.ErrCode) {
 	ec = errcode.ErrCodeRavenIQTestSrvOk
 
-	// 计算总得分
+	// 缓存数据准备
 	questionMapcfg := apollostruct.QuestionMapCfg{}
 	err := apollo.GetJson(consts.QuestionMapKey, &questionMapcfg, apollo.ApolloOpts().SetNamespace("Raven_IQ_test"))
 	if err != nil {
@@ -3600,25 +3600,6 @@ func (s *Service) ApiCreateRavenIQTest(ctx *gin.Context, req *Raven_IQ_testproto
 		return errcode.ErrCodeApolloReadFail
 	}
 
-	classScoreMap := make(map[int64]int64)
-	for _, answer := range req.AnswerList {
-		if answer.GetSelectedOption() == questionMapcfg.Map[answer.GetQuestionId()].CorrectOption {
-			classScoreMap[answer.GetQuestionId()] += 1
-		}
-	}
-
-	req.ClassScoreList = make([]*dbstruct.RavenIQTestClassScore, 0)
-	totalScore := float64(0)
-	for classId, score := range classScoreMap {
-		req.ClassScoreList = append(req.ClassScoreList, &dbstruct.RavenIQTestClassScore{
-			ClassId: goproto.Int64(classId),
-			Score:   goproto.Int64(score),
-		})
-		totalScore += float64(score)
-	}
-	req.TotalScore = goproto.Float64(totalScore)
-
-	// 换算智商及百分位
 	ageScore2IQResultMapCfg := apollostruct.AgeScore2IQResultMapCfg{}
 	err = apollo.GetJson(consts.AgeScore2IQResultMapKey, &ageScore2IQResultMapCfg, apollo.ApolloOpts().SetNamespace("Raven_IQ_test"))
 	if err != nil {
@@ -3635,15 +3616,42 @@ func (s *Service) ApiCreateRavenIQTest(ctx *gin.Context, req *Raven_IQ_testproto
 		return
 	}
 
+	// 计算总得分
+	classScoreMap := make(map[int64]int64)
+	for _, classId := range questionMapcfg.ClassList {
+		classScoreMap[classId] = 0
+	}
+	for _, answer := range req.AnswerList {
+		question, ok := questionMapcfg.Map[answer.GetQuestionId()]
+		if !ok {
+			return errcode.ErrCodeRavenIQTestQuestionNotExist
+		}
+		if answer.GetSelectedOption() == question.CorrectOption {
+			classScoreMap[answer.GetQuestionId()] += 1
+		}
+	}
+
+	req.ClassScoreList = make([]*dbstruct.RavenIQTestClassScore, 0)
+	totalScore := float64(0)
+	for classId, score := range classScoreMap {
+		req.ClassScoreList = append(req.ClassScoreList, &dbstruct.RavenIQTestClassScore{
+			ClassId: goproto.Int64(classId),
+			Score:   goproto.Int64(score),
+		})
+		totalScore += float64(score)
+	}
+	req.TotalScore = goproto.Float64(totalScore)
+
+	// 换算智商及百分位
 	ageBlockIdx := util.GetLastLessOrEqualForInt64(ageScore2IQResultMapCfg.AgeBlockList, req.GetAge())
 	list := ageScore2IQResultMapCfg.AgeBlockIndex2ScoreBlockListMap[ageBlockIdx]
 	scoreBlockIdx := util.GetLastLessOrEqualForFloat64(list, req.GetTotalScore())
 	IQBlockId := ageScore2IQResultMapCfg.ScoreBlockIndex2IQBlockIdMap[scoreBlockIdx]
 
 	for _, classScore := range req.ClassScoreList {
-		classScoreBlockList := classScore2ClassResultMapCfg.ClassId2ClassScoreBlockListMap[classScore.GetClassId()]
+		classScoreBlockList := classScore2ClassResultMapCfg.Map[classScore.GetClassId()]
 		classScoreBlockIdx := util.GetLastLessOrEqualForInt64(classScoreBlockList, classScore.GetScore())
-		classScore.ClassBlockId = goproto.Int64(int64(classScoreBlockIdx))
+		classScore.ClassBlockId = goproto.Int64(classScore.GetClassId()*100 + int64(classScoreBlockIdx)) // 100 * 大类id + 偏移量
 	}
 
 	req.IQBlockId = goproto.Int64(IQBlockId)

From e57b0d96d1a4314c3bb906c66ccdaec102256357 Mon Sep 17 00:00:00 2001
From: Leufolium <Caeruscaemon@outlook.com>
Date: Mon, 22 Jul 2024 15:58:02 +0800
Subject: [PATCH 09/17] 1

---
 etc/mix/mix-local.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/mix/mix-local.yaml b/etc/mix/mix-local.yaml
index 60c0afd6..d78d5a0b 100644
--- a/etc/mix/mix-local.yaml
+++ b/etc/mix/mix-local.yaml
@@ -85,7 +85,7 @@ apollo:
   app_id: "wishpal_live_service"
   cluster: "dev"
   ip: "http://localhost:8080"
-  namespace_name: "application,tag,account_init,platform,support_wx_id"
+  namespace_name: "application,tag,account_init,platform,support_wx_id,Raven_IQ_test"
   secret: ""
   is_back_up_config: true
   sync_server_timeout: 2

From c3ff7fae4a8d582e9e4d8feb64deedd037a2a0a4 Mon Sep 17 00:00:00 2001
From: Leufolium <Caeruscaemon@outlook.com>
Date: Mon, 22 Jul 2024 15:59:45 +0800
Subject: [PATCH 10/17] 1

---
 etc/mix/mix-prod-offline.yaml | 2 +-
 etc/mix/mix-prod.yaml         | 2 +-
 etc/mix/mix-test-offline.yaml | 2 +-
 etc/mix/mix-test.yaml         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/etc/mix/mix-prod-offline.yaml b/etc/mix/mix-prod-offline.yaml
index e45cec3b..994d0c9d 100644
--- a/etc/mix/mix-prod-offline.yaml
+++ b/etc/mix/mix-prod-offline.yaml
@@ -79,7 +79,7 @@ apollo:
   app_id: "wishpal_live_service"
   cluster: "dev"
   ip: "http://172.16.0.186:8080"
-  namespace_name: "application,tag,account_init,platform,support_wx_id,version,zone"
+  namespace_name: "application,tag,account_init,platform,support_wx_id,version,zone,Raven_IQ_test"
   secret: ""
   is_back_up_config: true
   sync_server_timeout: 2
diff --git a/etc/mix/mix-prod.yaml b/etc/mix/mix-prod.yaml
index d174a3b4..acf6c27c 100644
--- a/etc/mix/mix-prod.yaml
+++ b/etc/mix/mix-prod.yaml
@@ -95,7 +95,7 @@ apollo:
   app_id: "wishpal_live_service"
   cluster: "dev"
   ip: "http://172.16.0.186:8080"
-  namespace_name: "application,tag,account_init,platform,support_wx_id,version,zone"
+  namespace_name: "application,tag,account_init,platform,support_wx_id,version,zone,Raven_IQ_test"
   secret: ""
   is_back_up_config: true
   sync_server_timeout: 2
diff --git a/etc/mix/mix-test-offline.yaml b/etc/mix/mix-test-offline.yaml
index f15d7ec6..7748945a 100644
--- a/etc/mix/mix-test-offline.yaml
+++ b/etc/mix/mix-test-offline.yaml
@@ -81,7 +81,7 @@ apollo:
   app_id: "wishpal_live_service"
   cluster: "dev"
   ip: "http://localhost:8080"
-  namespace_name: "application,tag,account_init,platform,support_wx_id,version,zone"
+  namespace_name: "application,tag,account_init,platform,support_wx_id,version,zone,Raven_IQ_test"
   secret: ""
   is_back_up_config: true
   sync_server_timeout: 2
diff --git a/etc/mix/mix-test.yaml b/etc/mix/mix-test.yaml
index 109ec30f..cc9e7648 100644
--- a/etc/mix/mix-test.yaml
+++ b/etc/mix/mix-test.yaml
@@ -96,7 +96,7 @@ apollo:
   app_id: "wishpal_live_service"
   cluster: "dev"
   ip: "http://172.31.37.71:8080"
-  namespace_name: "application,tag,account_init,platform,support_wx_id,version,zone"
+  namespace_name: "application,tag,account_init,platform,support_wx_id,version,zone,Raven_IQ_test"
   secret: ""
   is_back_up_config: true
   sync_server_timeout: 2

From 6b800705c53aa8a3f962976e381e38fbf57c5c75 Mon Sep 17 00:00:00 2001
From: Leufolium <Caeruscaemon@outlook.com>
Date: Mon, 22 Jul 2024 16:12:22 +0800
Subject: [PATCH 11/17] 1

---
 api/proto/Raven_IQ_test/proto/Raven_IQ_test_api.go | 1 +
 app/mix/controller/Raven_IQ_test_api.go            | 7 +++++--
 app/mix/service/apiservice.go                      | 8 +++++---
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/api/proto/Raven_IQ_test/proto/Raven_IQ_test_api.go b/api/proto/Raven_IQ_test/proto/Raven_IQ_test_api.go
index e9702a7b..e0ca724e 100644
--- a/api/proto/Raven_IQ_test/proto/Raven_IQ_test_api.go
+++ b/api/proto/Raven_IQ_test/proto/Raven_IQ_test_api.go
@@ -12,6 +12,7 @@ type ApiCreateReq struct {
 }
 
 type ApiCreateData struct {
+	Id int64 `json:"id"`
 }
 
 type ApiCreateResp struct {
diff --git a/app/mix/controller/Raven_IQ_test_api.go b/app/mix/controller/Raven_IQ_test_api.go
index e2eb67a8..643275e2 100644
--- a/app/mix/controller/Raven_IQ_test_api.go
+++ b/app/mix/controller/Raven_IQ_test_api.go
@@ -12,14 +12,17 @@ import (
 
 func ApiCreateRavenIQTest(ctx *gin.Context) {
 	req := ctx.MustGet("client_req").(*Raven_IQ_testproto.ApiCreateReq)
-	ec := service.DefaultService.ApiCreateRavenIQTest(ctx, req)
+	id, ec := service.DefaultService.ApiCreateRavenIQTest(ctx, req)
 	if ec != errcode.ErrCodeRavenIQTestSrvOk {
 		logger.Error("ApiCreateRavenIQTest fail, req: %v, ec: %v", util.ToJson(req), ec)
 		ReplyErrorMsg(ctx, "server error")
 		return
 	}
 
-	ReplyOk(ctx, nil)
+	data := &Raven_IQ_testproto.ApiCreateData{
+		Id: id,
+	}
+	ReplyOk(ctx, data)
 }
 
 func ApiGetRavenIQTestList(ctx *gin.Context) {
diff --git a/app/mix/service/apiservice.go b/app/mix/service/apiservice.go
index 5be910ce..568e5b08 100644
--- a/app/mix/service/apiservice.go
+++ b/app/mix/service/apiservice.go
@@ -3589,7 +3589,7 @@ func (s *Service) ApiHvyogoWorkerUpdate(ctx *gin.Context, req *hvyogoproto.ApiWo
 }
 
 // RavenIQTest
-func (s *Service) ApiCreateRavenIQTest(ctx *gin.Context, req *Raven_IQ_testproto.ApiCreateReq) (ec errcode.ErrCode) {
+func (s *Service) ApiCreateRavenIQTest(ctx *gin.Context, req *Raven_IQ_testproto.ApiCreateReq) (id int64, ec errcode.ErrCode) {
 	ec = errcode.ErrCodeRavenIQTestSrvOk
 
 	// 缓存数据准备
@@ -3597,7 +3597,7 @@ func (s *Service) ApiCreateRavenIQTest(ctx *gin.Context, req *Raven_IQ_testproto
 	err := apollo.GetJson(consts.QuestionMapKey, &questionMapcfg, apollo.ApolloOpts().SetNamespace("Raven_IQ_test"))
 	if err != nil {
 		logger.Error("Apollo read failed : %v", err)
-		return errcode.ErrCodeApolloReadFail
+		return -1, errcode.ErrCodeApolloReadFail
 	}
 
 	ageScore2IQResultMapCfg := apollostruct.AgeScore2IQResultMapCfg{}
@@ -3624,7 +3624,7 @@ func (s *Service) ApiCreateRavenIQTest(ctx *gin.Context, req *Raven_IQ_testproto
 	for _, answer := range req.AnswerList {
 		question, ok := questionMapcfg.Map[answer.GetQuestionId()]
 		if !ok {
-			return errcode.ErrCodeRavenIQTestQuestionNotExist
+			return -1, errcode.ErrCodeRavenIQTestQuestionNotExist
 		}
 		if answer.GetSelectedOption() == question.CorrectOption {
 			classScoreMap[answer.GetQuestionId()] += 1
@@ -3665,6 +3665,8 @@ func (s *Service) ApiCreateRavenIQTest(ctx *gin.Context, req *Raven_IQ_testproto
 		ec = errcode.ErrCodeRavenIQTestSrvFail
 		return
 	}
+
+	id = req.RavenIQTest.GetId()
 	return
 }
 

From d74af2c693bb87c52e9571f8a8703f059f43f37a Mon Sep 17 00:00:00 2001
From: Leufolium <Caeruscaemon@outlook.com>
Date: Wed, 24 Jul 2024 14:14:26 +0800
Subject: [PATCH 12/17] By Robin at 20240724

---
 api/proto/Raven_IQ_test/proto/Raven_IQ_test_vo_api.go |  3 ++-
 apollostruct/RavenIQtest.go                           | 10 ++++++++--
 app/mix/service/apiservice.go                         |  3 ++-
 dbstruct/RavenIQTest.go                               |  2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/api/proto/Raven_IQ_test/proto/Raven_IQ_test_vo_api.go b/api/proto/Raven_IQ_test/proto/Raven_IQ_test_vo_api.go
index d481f205..b3581490 100644
--- a/api/proto/Raven_IQ_test/proto/Raven_IQ_test_vo_api.go
+++ b/api/proto/Raven_IQ_test/proto/Raven_IQ_test_vo_api.go
@@ -17,6 +17,7 @@ type ApiListVO struct {
 type ApiClassScoreVO struct {
 	ClassBlockId int64 `json:"class_block_id"` // 大类得分key
 	Score        int64 `json:"score"`          // 总分
+	*apollostruct.ClassInfo
 	*apollostruct.ClassResult
 }
 
@@ -35,7 +36,7 @@ func (vo *ApiListVO) CopyRavenIQTest(test *dbstruct.RavenIQTest) *ApiListVO {
 		vo.ClassScoreList = append(vo.ClassScoreList, &ApiClassScoreVO{
 			ClassBlockId: score.GetClassBlockId(),
 			Score:        score.GetScore(),
-			ClassResult: &apollostruct.ClassResult{
+			ClassInfo: &apollostruct.ClassInfo{
 				ClassId: score.GetClassId(),
 			},
 		})
diff --git a/apollostruct/RavenIQtest.go b/apollostruct/RavenIQtest.go
index d1641058..402ab644 100644
--- a/apollostruct/RavenIQtest.go
+++ b/apollostruct/RavenIQtest.go
@@ -13,6 +13,7 @@ type RavenIQTestQuestion struct {
 
 type IQResult struct {
 	IQBlockId   int64    `json:"IQ_Block_Id"` // IQ分段id
+	IQGrade     string   `json:"IQ_grade"`    // 智商等级
 	Percentile  int64    `json:"percentile"`  // 百分位
 	Description string   `json:"description"` // 描述
 	Suggestions []string `json:"suggestions"` // 建议
@@ -33,12 +34,16 @@ type IQResultMapCfg struct {
 }
 
 type ClassResult struct {
-	ClassId     int64         `json:"class_id"`    // 大类id
 	Description string        `json:"description"` // 描述
 	Analysis    string        `json:"analysis"`    // 成绩分析
 	Suggestions []*Suggestion `json:"suggestions"` // 建议
 }
 
+type ClassInfo struct {
+	ClassId   int64  `json:"class_id"`   // 大类id
+	ClassName string `json:"class_name"` // 大类名称
+}
+
 type Suggestion struct {
 	Title string `json:"title"`
 	Tips  []*Tip `json:"tips"`
@@ -50,5 +55,6 @@ type Tip struct {
 }
 
 type ClassResultMapCfg struct {
-	Map map[int64]*ClassResult `json:"map"`
+	Map          map[int64]*ClassResult `json:"map"`
+	ClassInfoMap map[int64]*ClassInfo   `json:"class_info_map"`
 }
diff --git a/app/mix/service/apiservice.go b/app/mix/service/apiservice.go
index 568e5b08..87700918 100644
--- a/app/mix/service/apiservice.go
+++ b/app/mix/service/apiservice.go
@@ -3627,7 +3627,7 @@ func (s *Service) ApiCreateRavenIQTest(ctx *gin.Context, req *Raven_IQ_testproto
 			return -1, errcode.ErrCodeRavenIQTestQuestionNotExist
 		}
 		if answer.GetSelectedOption() == question.CorrectOption {
-			classScoreMap[answer.GetQuestionId()] += 1
+			classScoreMap[question.ClassId] += 1
 		}
 	}
 
@@ -3710,6 +3710,7 @@ func (s *Service) ApiGetRavenIQTestList(ctx *gin.Context, req *Raven_IQ_testprot
 
 	for _, classScore := range vo.ClassScoreList {
 		classScore.ClassResult = classResultMpCfg.Map[classScore.ClassBlockId]
+		classScore.ClassInfo = classResultMpCfg.ClassInfoMap[classScore.ClassInfo.ClassId]
 	}
 
 	return
diff --git a/dbstruct/RavenIQTest.go b/dbstruct/RavenIQTest.go
index 3747d123..84620a5f 100644
--- a/dbstruct/RavenIQTest.go
+++ b/dbstruct/RavenIQTest.go
@@ -39,7 +39,7 @@ func (p *RavenIQTest) GetUserId() int64 {
 }
 
 func (p *RavenIQTest) GetAge() int64 {
-	if p == nil || p.UserId == nil {
+	if p == nil || p.Age == nil {
 		return 0
 	}
 	return *p.Age

From 2ea3ebb6aa3f8c6fc2ac6b5a4fbb77008a679bd8 Mon Sep 17 00:00:00 2001
From: Leufolium <Caeruscaemon@outlook.com>
Date: Thu, 25 Jul 2024 19:59:35 +0800
Subject: [PATCH 13/17] by Robin at 20240725

---
 api/errcode/errcode.go                        |  2 +
 .../proto/Raven_IQ_test_vo_api.go             |  4 +-
 apollostruct/RavenIQtest.go                   | 19 +++++---
 app/mix/service/apiservice.go                 | 47 ++++++++++---------
 dbstruct/RavenIQTest.go                       | 22 +++++++--
 library/apollo/apollo.go                      | 20 ++++++++
 6 files changed, 82 insertions(+), 32 deletions(-)

diff --git a/api/errcode/errcode.go b/api/errcode/errcode.go
index 4a0efe65..1b57d323 100644
--- a/api/errcode/errcode.go
+++ b/api/errcode/errcode.go
@@ -10,6 +10,7 @@ var ErrCodeMsgMap = map[ErrCode]string{
 	ErrCodeApolloReadFail:             "Apollo配置读取失败，请立即联系管理员",
 	ErrCodeApolloVersionFormatError:   "Apollo版本号配置格式错误",
 	ErrCodeUserVersionFormatError:     "用户上送版本号格式错误",
+	ErrCodeIndexOutOfRange:            "数组越界",
 	ErrCodeAssertionFail:              "严重错误：类型断言异常，请立即联系管理员",
 	ErrCodeSelfOnlyOperation:          "权限不足：该操作仅可对当前登录用户执行",
 	ErrCodeRolePrivilegesNotEnough:    "权限不足:当前用户角色禁止执行该操作",
@@ -238,6 +239,7 @@ const (
 	ErrCodeAssertionFail                 ErrCode = -12 // 类型断言异常
 	ErrCodeApolloVersionFormatError      ErrCode = -13 // Apollo版本号配置格式错误
 	ErrCodeUserVersionFormatError        ErrCode = -14 // 用户上送版本号格式错误
+	ErrCodeIndexOutOfRange               ErrCode = -15 // 数组越界
 	ErrCodeSelfOnlyOperation             ErrCode = -20 // 权限不足：该操作仅可对当前登录用户执行
 	ErrCodeRolePrivilegesNotEnough       ErrCode = -21 // 权限不足: 当前用户角色禁止执行该操作
 	ErrCodeOpRoleOnlyOperation           ErrCode = -22 // 权限不足: 后台系统仅允许超级管理员和运营操作
diff --git a/api/proto/Raven_IQ_test/proto/Raven_IQ_test_vo_api.go b/api/proto/Raven_IQ_test/proto/Raven_IQ_test_vo_api.go
index b3581490..8f52a4ad 100644
--- a/api/proto/Raven_IQ_test/proto/Raven_IQ_test_vo_api.go
+++ b/api/proto/Raven_IQ_test/proto/Raven_IQ_test_vo_api.go
@@ -10,6 +10,7 @@ type ApiListVO struct {
 	UserId     int64   `json:"user_id"`     // 用户id
 	Age        int64   `json:"age"`         // 年龄
 	TotalScore float64 `json:"total_score"` // 总得分
+	IQ         int64   `json:"IQ"`          // 智商值
 	*apollostruct.IQResult
 	ClassScoreList []*ApiClassScoreVO `json:"class_score_list"` // 大类得分list
 }
@@ -30,12 +31,13 @@ func (vo *ApiListVO) CopyRavenIQTest(test *dbstruct.RavenIQTest) *ApiListVO {
 	vo.UserId = test.GetUserId()
 	vo.Age = test.GetAge()
 	vo.TotalScore = test.GetTotalScore()
+	vo.IQ = test.GetIQ()
 	vo.IQBlockId = test.GetIQBlockId()
 	vo.ClassScoreList = make([]*ApiClassScoreVO, 0)
 	for _, score := range test.ClassScoreList {
 		vo.ClassScoreList = append(vo.ClassScoreList, &ApiClassScoreVO{
 			ClassBlockId: score.GetClassBlockId(),
-			Score:        score.GetScore(),
+			Score:        score.GetConvertedScore(),
 			ClassInfo: &apollostruct.ClassInfo{
 				ClassId: score.GetClassId(),
 			},
diff --git a/apollostruct/RavenIQtest.go b/apollostruct/RavenIQtest.go
index 402ab644..02a43c72 100644
--- a/apollostruct/RavenIQtest.go
+++ b/apollostruct/RavenIQtest.go
@@ -12,11 +12,13 @@ type RavenIQTestQuestion struct {
 }
 
 type IQResult struct {
-	IQBlockId   int64    `json:"IQ_Block_Id"` // IQ分段id
-	IQGrade     string   `json:"IQ_grade"`    // 智商等级
-	Percentile  int64    `json:"percentile"`  // 百分位
-	Description string   `json:"description"` // 描述
-	Suggestions []string `json:"suggestions"` // 建议
+	IQBlockId    int64    `json:"IQ_Block_Id"`    // IQ分段id
+	IQGrade      string   `json:"IQ_grade"`       // 智商等级
+	Percentile   int64    `json:"percentile"`     // 百分位
+	IQLowerBound int64    `json:"IQ_lower_bound"` // IQ下界
+	IQUpperBound int64    `json:"IQ_upper_bound"` // IQ上界
+	Description  string   `json:"description"`    // 描述
+	Suggestions  []string `json:"suggestions"`    // 建议
 }
 
 type AgeScore2IQResultMapCfg struct {
@@ -40,8 +42,10 @@ type ClassResult struct {
 }
 
 type ClassInfo struct {
-	ClassId   int64  `json:"class_id"`   // 大类id
-	ClassName string `json:"class_name"` // 大类名称
+	ClassId         int64  `json:"class_id"`          // 大类id
+	ClassName       string `json:"class_name"`        // 大类名称
+	ClassTotalScore int64  `json:"class_total_score"` // 大类总分
+	ClassFullScore  int64  `json:"class_full_score"`  // 大类满分
 }
 
 type Suggestion struct {
@@ -57,4 +61,5 @@ type Tip struct {
 type ClassResultMapCfg struct {
 	Map          map[int64]*ClassResult `json:"map"`
 	ClassInfoMap map[int64]*ClassInfo   `json:"class_info_map"`
+	FullScore    int64                  `json:"full_score"` // 满分
 }
diff --git a/app/mix/service/apiservice.go b/app/mix/service/apiservice.go
index 87700918..b6dfa9af 100644
--- a/app/mix/service/apiservice.go
+++ b/app/mix/service/apiservice.go
@@ -2,6 +2,7 @@ package service
 
 import (
 	"fmt"
+	"math"
 	"service/api/base"
 	"service/api/consts"
 	"service/api/errcode"
@@ -3594,29 +3595,19 @@ func (s *Service) ApiCreateRavenIQTest(ctx *gin.Context, req *Raven_IQ_testproto
 
 	// 缓存数据准备
 	questionMapcfg := apollostruct.QuestionMapCfg{}
-	err := apollo.GetJson(consts.QuestionMapKey, &questionMapcfg, apollo.ApolloOpts().SetNamespace("Raven_IQ_test"))
+	ageScore2IQResultMapCfg := apollostruct.AgeScore2IQResultMapCfg{}
+	classScore2ClassResultMapCfg := apollostruct.ClassScore2ClassResultMapCfg{}
+	IQResultMpcfg := apollostruct.IQResultMapCfg{}
+	classResultMpCfg := apollostruct.ClassResultMapCfg{}
+	keys := []string{consts.QuestionMapKey, consts.AgeScore2IQResultMapKey, consts.ClassScore2ClassResultMapKey, consts.IQResultMapKey, consts.ClassResultMapKey}
+	cfgs := []any{&questionMapcfg, &ageScore2IQResultMapCfg, &classScore2ClassResultMapCfg, &IQResultMpcfg, &classResultMpCfg}
+	err := apollo.GetJsons(keys, cfgs, apollo.ApolloOpts().SetNamespace("Raven_IQ_test"))
 	if err != nil {
 		logger.Error("Apollo read failed : %v", err)
 		return -1, errcode.ErrCodeApolloReadFail
 	}
 
-	ageScore2IQResultMapCfg := apollostruct.AgeScore2IQResultMapCfg{}
-	err = apollo.GetJson(consts.AgeScore2IQResultMapKey, &ageScore2IQResultMapCfg, apollo.ApolloOpts().SetNamespace("Raven_IQ_test"))
-	if err != nil {
-		logger.Error("Apollo read failed : %v", err)
-		ec = errcode.ErrCodeApolloReadFail
-		return
-	}
-
-	classScore2ClassResultMapCfg := apollostruct.ClassScore2ClassResultMapCfg{}
-	err = apollo.GetJson(consts.ClassScore2ClassResultMapKey, &classScore2ClassResultMapCfg, apollo.ApolloOpts().SetNamespace("Raven_IQ_test"))
-	if err != nil {
-		logger.Error("Apollo read failed : %v", err)
-		ec = errcode.ErrCodeApolloReadFail
-		return
-	}
-
-	// 计算总得分
+	// 计算大类得分、总得分情况
 	classScoreMap := make(map[int64]int64)
 	for _, classId := range questionMapcfg.ClassList {
 		classScoreMap[classId] = 0
@@ -3634,18 +3625,25 @@ func (s *Service) ApiCreateRavenIQTest(ctx *gin.Context, req *Raven_IQ_testproto
 	req.ClassScoreList = make([]*dbstruct.RavenIQTestClassScore, 0)
 	totalScore := float64(0)
 	for classId, score := range classScoreMap {
+		classInfo := classResultMpCfg.ClassInfoMap[classId]
+		covertedScore := int64(math.Ceil(((float64(score) / float64(classInfo.ClassTotalScore) * float64(classResultMpCfg.FullScore)) + float64(classInfo.ClassFullScore)) / 2))
 		req.ClassScoreList = append(req.ClassScoreList, &dbstruct.RavenIQTestClassScore{
-			ClassId: goproto.Int64(classId),
-			Score:   goproto.Int64(score),
+			ClassId:        goproto.Int64(classId),
+			Score:          goproto.Int64(score),
+			ConvertedScore: goproto.Int64(covertedScore),
 		})
 		totalScore += float64(score)
 	}
 	req.TotalScore = goproto.Float64(totalScore)
 
-	// 换算智商及百分位
+	// 获取IQ分组id
 	ageBlockIdx := util.GetLastLessOrEqualForInt64(ageScore2IQResultMapCfg.AgeBlockList, req.GetAge())
 	list := ageScore2IQResultMapCfg.AgeBlockIndex2ScoreBlockListMap[ageBlockIdx]
 	scoreBlockIdx := util.GetLastLessOrEqualForFloat64(list, req.GetTotalScore())
+	if scoreBlockIdx == -1 || scoreBlockIdx >= len(list)-1 {
+		logger.Error("array index out of bound...")
+		return -1, errcode.ErrCodeIndexOutOfRange
+	}
 	IQBlockId := ageScore2IQResultMapCfg.ScoreBlockIndex2IQBlockIdMap[scoreBlockIdx]
 
 	for _, classScore := range req.ClassScoreList {
@@ -3656,6 +3654,13 @@ func (s *Service) ApiCreateRavenIQTest(ctx *gin.Context, req *Raven_IQ_testproto
 
 	req.IQBlockId = goproto.Int64(IQBlockId)
 
+	// 计算智商
+	totalScoreLowerBound := list[scoreBlockIdx]
+	totalScoreUpperBound := list[scoreBlockIdx+1]
+	IQLowerBound := float64(IQResultMpcfg.Map[IQBlockId].IQLowerBound)
+	IQUpperBound := float64(IQResultMpcfg.Map[IQBlockId].IQUpperBound)
+	req.IQ = goproto.Int64(int64(math.Ceil(float64(totalScore-totalScoreLowerBound)/float64(totalScoreUpperBound-totalScoreLowerBound)*(IQUpperBound-IQLowerBound) + IQLowerBound)))
+
 	err = _DefaultRavenIQTest.OpCreate(ctx, &Raven_IQ_testproto.OpCreateReq{
 		BaseRequest: req.BaseRequest,
 		RavenIQTest: req.RavenIQTest,
diff --git a/dbstruct/RavenIQTest.go b/dbstruct/RavenIQTest.go
index 84620a5f..27ea68bc 100644
--- a/dbstruct/RavenIQTest.go
+++ b/dbstruct/RavenIQTest.go
@@ -6,6 +6,7 @@ type RavenIQTest struct {
 	Age            *int64                   `json:"age" bson:"age"`                           // 年龄
 	TotalScore     *float64                 `json:"total_score" bson:"total_score"`           // 总得分
 	IQBlockId      *int64                   `json:"IQ_block_id" bson:"IQ_block_id"`           // 智商值key
+	IQ             *int64                   `json:"IQ" bson:"IQ"`                             // 智商值
 	AnswerList     []*RavenIQTestAnswer     `json:"answer_list" bson:"answer_list"`           // 答案list
 	ClassScoreList []*RavenIQTestClassScore `json:"class_score_list" bson:"class_score_list"` // 大类得分list
 	Ct             *int64                   `json:"ct" bson:"ct"`                             // 创建时间
@@ -19,9 +20,10 @@ type RavenIQTestAnswer struct {
 }
 
 type RavenIQTestClassScore struct {
-	ClassId      *int64 `json:"class_id" bson:"class_id"`             // 大类id
-	Score        *int64 `json:"score" bson:"score"`                   // 得分
-	ClassBlockId *int64 `json:"class_block_id" bson:"class_block_id"` // 大类得分key
+	ClassId        *int64 `json:"class_id" bson:"class_id"`               // 大类id
+	Score          *int64 `json:"score" bson:"score"`                     // 得分
+	ClassBlockId   *int64 `json:"class_block_id" bson:"class_block_id"`   // 大类得分key
+	ConvertedScore *int64 `json:"converted_score" bson:"converted_score"` // 折算后得分
 }
 
 func (p *RavenIQTest) GetId() int64 {
@@ -59,6 +61,13 @@ func (p *RavenIQTest) GetIQBlockId() int64 {
 	return *p.IQBlockId
 }
 
+func (p *RavenIQTest) GetIQ() int64 {
+	if p == nil || p.IQ == nil {
+		return 0
+	}
+	return *p.IQ
+}
+
 func (p *RavenIQTestAnswer) GetQuestionId() int64 {
 	if p == nil || p.QuestionId == nil {
 		return 0
@@ -87,6 +96,13 @@ func (p *RavenIQTestClassScore) GetScore() int64 {
 	return *p.Score
 }
 
+func (p *RavenIQTestClassScore) GetConvertedScore() int64 {
+	if p == nil || p.ConvertedScore == nil {
+		return 0
+	}
+	return *p.ConvertedScore
+}
+
 func (p *RavenIQTestClassScore) GetClassBlockId() int64 {
 	if p == nil || p.ClassBlockId == nil {
 		return 0
diff --git a/library/apollo/apollo.go b/library/apollo/apollo.go
index 87e96a6e..b9b523dc 100644
--- a/library/apollo/apollo.go
+++ b/library/apollo/apollo.go
@@ -147,3 +147,23 @@ func GetFloat64Value(key string, opts ...*ApolloOptions) (value float64, err err
 	}
 	return
 }
+
+func GetJsons(keys []string, vs []interface{}, opts ...*ApolloOptions) (err error) {
+	opt := mergeApolloOptions(opts...)
+	for i, key := range keys {
+		var value string
+		if opt.GetNamespace() != "" {
+			value = defaultApolloClient.GetConfig(opt.GetNamespace()).GetStringValue(key, opt.GetDefaultValue())
+		} else {
+			value = defaultApolloClient.GetStringValue(key, opt.GetDefaultValue())
+		}
+		if value != "" {
+			err = json.Unmarshal([]byte(value), vs[i])
+			if err != nil {
+				return
+			}
+		}
+	}
+
+	return
+}

From bb2c18fa4b0418836d33ffaad872df63794d5afe Mon Sep 17 00:00:00 2001
From: Leufolium <Caeruscaemon@outlook.com>
Date: Thu, 25 Jul 2024 20:11:38 +0800
Subject: [PATCH 14/17] 1

---
 apollostruct/RavenIQtest.go   | 10 +++++-----
 app/mix/service/apiservice.go |  8 ++++++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/apollostruct/RavenIQtest.go b/apollostruct/RavenIQtest.go
index 02a43c72..d5f4744f 100644
--- a/apollostruct/RavenIQtest.go
+++ b/apollostruct/RavenIQtest.go
@@ -42,10 +42,9 @@ type ClassResult struct {
 }
 
 type ClassInfo struct {
-	ClassId         int64  `json:"class_id"`          // 大类id
-	ClassName       string `json:"class_name"`        // 大类名称
-	ClassTotalScore int64  `json:"class_total_score"` // 大类总分
-	ClassFullScore  int64  `json:"class_full_score"`  // 大类满分
+	ClassId        int64  `json:"class_id"`         // 大类id
+	ClassName      string `json:"class_name"`       // 大类名称
+	ClassFullScore int64  `json:"class_full_score"` // 大类满分
 }
 
 type Suggestion struct {
@@ -61,5 +60,6 @@ type Tip struct {
 type ClassResultMapCfg struct {
 	Map          map[int64]*ClassResult `json:"map"`
 	ClassInfoMap map[int64]*ClassInfo   `json:"class_info_map"`
-	FullScore    int64                  `json:"full_score"` // 满分
+	FullScore    int64                  `json:"full_score"`  // 满分
+	TotalScore   int64                  `json:"total_score"` // 总分
 }
diff --git a/app/mix/service/apiservice.go b/app/mix/service/apiservice.go
index b6dfa9af..8e32b2ed 100644
--- a/app/mix/service/apiservice.go
+++ b/app/mix/service/apiservice.go
@@ -3626,7 +3626,7 @@ func (s *Service) ApiCreateRavenIQTest(ctx *gin.Context, req *Raven_IQ_testproto
 	totalScore := float64(0)
 	for classId, score := range classScoreMap {
 		classInfo := classResultMpCfg.ClassInfoMap[classId]
-		covertedScore := int64(math.Ceil(((float64(score) / float64(classInfo.ClassTotalScore) * float64(classResultMpCfg.FullScore)) + float64(classInfo.ClassFullScore)) / 2))
+		covertedScore := int64(math.Ceil(((float64(score) / float64(classResultMpCfg.TotalScore) * float64(classResultMpCfg.FullScore)) + float64(classInfo.ClassFullScore)) / 2))
 		req.ClassScoreList = append(req.ClassScoreList, &dbstruct.RavenIQTestClassScore{
 			ClassId:        goproto.Int64(classId),
 			Score:          goproto.Int64(score),
@@ -3659,7 +3659,11 @@ func (s *Service) ApiCreateRavenIQTest(ctx *gin.Context, req *Raven_IQ_testproto
 	totalScoreUpperBound := list[scoreBlockIdx+1]
 	IQLowerBound := float64(IQResultMpcfg.Map[IQBlockId].IQLowerBound)
 	IQUpperBound := float64(IQResultMpcfg.Map[IQBlockId].IQUpperBound)
-	req.IQ = goproto.Int64(int64(math.Ceil(float64(totalScore-totalScoreLowerBound)/float64(totalScoreUpperBound-totalScoreLowerBound)*(IQUpperBound-IQLowerBound) + IQLowerBound)))
+	IQ := int64(math.Ceil(float64(totalScore-totalScoreLowerBound)/float64(totalScoreUpperBound-totalScoreLowerBound)*(IQUpperBound-IQLowerBound) + IQLowerBound))
+	if IQ == 0 {
+		IQ = IQResultMpcfg.Map[IQBlockId].IQLowerBound
+	}
+	req.IQ = goproto.Int64(IQ)
 
 	err = _DefaultRavenIQTest.OpCreate(ctx, &Raven_IQ_testproto.OpCreateReq{
 		BaseRequest: req.BaseRequest,

From 4caefe30250bb547b29959add6f9095ff4649763 Mon Sep 17 00:00:00 2001
From: Leufolium <Caeruscaemon@outlook.com>
Date: Thu, 25 Jul 2024 20:29:08 +0800
Subject: [PATCH 15/17] 1

---
 app/mix/service/apiservice.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/mix/service/apiservice.go b/app/mix/service/apiservice.go
index 8e32b2ed..388cfce7 100644
--- a/app/mix/service/apiservice.go
+++ b/app/mix/service/apiservice.go
@@ -3656,7 +3656,7 @@ func (s *Service) ApiCreateRavenIQTest(ctx *gin.Context, req *Raven_IQ_testproto
 
 	// 计算智商
 	totalScoreLowerBound := list[scoreBlockIdx]
-	totalScoreUpperBound := list[scoreBlockIdx+1]
+	totalScoreUpperBound := list[scoreBlockIdx+1] - 1
 	IQLowerBound := float64(IQResultMpcfg.Map[IQBlockId].IQLowerBound)
 	IQUpperBound := float64(IQResultMpcfg.Map[IQBlockId].IQUpperBound)
 	IQ := int64(math.Ceil(float64(totalScore-totalScoreLowerBound)/float64(totalScoreUpperBound-totalScoreLowerBound)*(IQUpperBound-IQLowerBound) + IQLowerBound))

From 73ada4aa6e189c2498d5ffb0637e756eb36195ae Mon Sep 17 00:00:00 2001
From: Leufolium <Caeruscaemon@outlook.com>
Date: Wed, 31 Jul 2024 17:04:08 +0800
Subject: [PATCH 16/17] by Robin at 20240731

---
 api/proto/Raven_IQ_test/proto/Raven_IQ_test_vo_api.go | 2 +-
 dbstruct/RavenIQTest.go                               | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/api/proto/Raven_IQ_test/proto/Raven_IQ_test_vo_api.go b/api/proto/Raven_IQ_test/proto/Raven_IQ_test_vo_api.go
index 8f52a4ad..df072688 100644
--- a/api/proto/Raven_IQ_test/proto/Raven_IQ_test_vo_api.go
+++ b/api/proto/Raven_IQ_test/proto/Raven_IQ_test_vo_api.go
@@ -7,7 +7,7 @@ import (
 
 type ApiListVO struct {
 	Id         int64   `json:"id"`          // 瑞文智商测试表id
-	UserId     int64   `json:"user_id"`     // 用户id
+	UserId     string  `json:"user_id"`     // 用户id
 	Age        int64   `json:"age"`         // 年龄
 	TotalScore float64 `json:"total_score"` // 总得分
 	IQ         int64   `json:"IQ"`          // 智商值
diff --git a/dbstruct/RavenIQTest.go b/dbstruct/RavenIQTest.go
index 27ea68bc..3c221061 100644
--- a/dbstruct/RavenIQTest.go
+++ b/dbstruct/RavenIQTest.go
@@ -2,7 +2,7 @@ package dbstruct
 
 type RavenIQTest struct {
 	Id             *int64                   `json:"id" bson:"_id"`                            // 瑞文智商测试表id
-	UserId         *int64                   `json:"user_id" bson:"user_id"`                   // 用户id
+	UserId         *string                  `json:"user_id" bson:"user_id"`                   // 用户id
 	Age            *int64                   `json:"age" bson:"age"`                           // 年龄
 	TotalScore     *float64                 `json:"total_score" bson:"total_score"`           // 总得分
 	IQBlockId      *int64                   `json:"IQ_block_id" bson:"IQ_block_id"`           // 智商值key
@@ -33,9 +33,9 @@ func (p *RavenIQTest) GetId() int64 {
 	return *p.Id
 }
 
-func (p *RavenIQTest) GetUserId() int64 {
+func (p *RavenIQTest) GetUserId() string {
 	if p == nil || p.UserId == nil {
-		return -1
+		return ""
 	}
 	return *p.UserId
 }

From b4e6c2532bff39f68eabcff8eb030c1fd5c26db9 Mon Sep 17 00:00:00 2001
From: Leufolium <Caeruscaemon@outlook.com>
Date: Wed, 31 Jul 2024 21:59:39 +0800
Subject: [PATCH 17/17] 1

---
 app/mix/service/apiservice.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/mix/service/apiservice.go b/app/mix/service/apiservice.go
index 388cfce7..579501bd 100644
--- a/app/mix/service/apiservice.go
+++ b/app/mix/service/apiservice.go
@@ -3660,8 +3660,8 @@ func (s *Service) ApiCreateRavenIQTest(ctx *gin.Context, req *Raven_IQ_testproto
 	IQLowerBound := float64(IQResultMpcfg.Map[IQBlockId].IQLowerBound)
 	IQUpperBound := float64(IQResultMpcfg.Map[IQBlockId].IQUpperBound)
 	IQ := int64(math.Ceil(float64(totalScore-totalScoreLowerBound)/float64(totalScoreUpperBound-totalScoreLowerBound)*(IQUpperBound-IQLowerBound) + IQLowerBound))
-	if IQ == 0 {
-		IQ = IQResultMpcfg.Map[IQBlockId].IQLowerBound
+	if IQ < 70 {
+		IQ = 70
 	}
 	req.IQ = goproto.Int64(IQ)