by Robin at 20231228; fix

api/consts/status.go

@@ -65,3 +65,12 @@ const (
 	TextAudit_Failed             = 9  //回退失败
 	TextAudit_ServiceFailed      = 10 //批次任务失败
 )
+
+// 意见反馈表的status审批状态
+const (
+	Feedback_Created            = 0 //待处理
+	Feedback_Handling           = 1 //跟进中
+	Feedback_Handled            = 2 //已处理
+	Feedback_Invalid            = 3 //无效
+	Feedback_RelatedToIteration = 3 //迭代相关
+)

api/proto/feedback/proto/not_null_def_api.go

@@ -0,0 +1,14 @@
+package proto
+
+import "service/library/validator"
+
+// api 创建
+func (p *ApiCreateReq) ProvideNotNullValue() (params []*validator.JsonParam) {
+	params = make([]*validator.JsonParam, 0)
+
+	params = append(params, validator.NewInt64PtrParam("请填写反馈用户MID！", p.Feedback.Mid))
+	params = append(params, validator.NewStringPtrParam("请填写问题描述！", p.Discription))
+	params = append(params, validator.NewStructPtrParam("请填写问题凭证！", p.Credentials))
+
+	return
+}

api/proto/feedback/proto/not_null_def_op.go

@@ -0,0 +1,12 @@
+package proto
+
+import "service/library/validator"
+
+// api 创建
+func (p *OpUpdateReq) ProvideNotNullValue() (params []*validator.JsonParam) {
+	params = make([]*validator.JsonParam, 0)
+
+	params = append(params, validator.NewInt64PtrParam("请提供Id！", p.Feedback.Id))
+
+	return
+}

app/mix/dao/mongo_idseq.go

@@ -42,6 +42,9 @@ const (
 
 	DBContactCustomerServiceSessionIdSeq  = "contact_customer_service_session_id_seq"
 	COLContactCustomerServiceSessionIdSeq = "contact_customer_service_session_id_seq"
+
+	DBFeedbackIdSeq  = "feedback_id_seq"
+	COLFeedbackIdSeq = "feedback_id_seq"
 )
 
 // UserIdSeq序列表
@@ -99,6 +102,11 @@ func (m *Mongo) getColContactCustomerServiceSessionIdSeq() *qmgo.Collection {
 	return m.clientMix.Database(DBContactCustomerServiceSessionIdSeq).Collection(COLContactCustomerServiceIdSeq)
 }
 
+// FeedbackIdSeq序列表
+func (m *Mongo) getColFeedbackIdSeq() *qmgo.Collection {
+	return m.clientMix.Database(DBFeedbackIdSeq).Collection(COLFeedbackIdSeq)
+}
+
 // account_id发号器
 func (m *Mongo) GetAndUpdateAccountIdSeq(ctx *gin.Context) (accountIdSeq *dbstruct.AccountIdSeq, err error) {
 	col := m.getColAccountIdSeq()
@@ -300,6 +308,25 @@ func (m *Mongo) GetAndUpdateContactCustomerServiceSessionIdSeq(ctx *gin.Context)
 	return &contactCustomerServiceSessionIdSeqInstance, err
 }
 
+// feedback_id发号器
+func (m *Mongo) GetAndUpdateFeedbackIdSeq(ctx *gin.Context) (feedbackIdSeq *dbstruct.FeedbackIdSeq, err error) {
+	col := m.getColFeedbackIdSeq()
+
+	change := qmgo.Change{
+		Update:    qmgo.M{"$inc": qmgo.M{"seq": 1}},
+		Upsert:    true,
+		ReturnNew: false,
+	}
+
+	feedbackIdSeqInstance := dbstruct.FeedbackIdSeq{}
+	if err = col.Find(ctx, qmgo.M{"_id": "feedback_id_seq_id"}).Apply(change, &feedbackIdSeqInstance); err != nil {
+		logger.Error("change error : %v", err)
+		return
+	}
+
+	return &feedbackIdSeqInstance, err
+}
+
 // media_id发号器
 func (m *Mongo) GetAndUpdateMediaSeq(ctx *gin.Context) (mediaIdSeq *dbstruct.MediaIdSeq, err error) {
 	col := m.getColMomentIdSeq()

app/mix/service/logic/feedback.go

@@ -5,7 +5,6 @@ import (
 	feedbackproto "service/api/proto/feedback/proto"
 	"service/app/mix/dao"
 	"service/dbstruct"
-	"service/library/idgenerator"
 	"service/library/logger"
 	"time"
 
@@ -25,11 +24,20 @@ func NewFeedback(store *dao.Store) (a *Feedback) {
 }
 
 func (p *Feedback) OpCreate(ctx *gin.Context, req *feedbackproto.OpCreateReq) error {
-	req.Feedback.Id = goproto.Int64(idgenerator.GenFeedbackId())
+
+	//产生id
+	feedbackIdSeq, err := p.store.GetAndUpdateFeedbackIdSeq(ctx)
+	if err != nil {
+		logger.Error("GetAndUpdateFeedbackIdSeq failed : %v", err)
+		return err
+	}
+
+	req.Feedback.Id = goproto.Int64(feedbackIdSeq.Seq)
 	req.Feedback.Ct = goproto.Int64(time.Now().Unix())
 	req.Feedback.Ut = goproto.Int64(time.Now().Unix())
 	req.Feedback.DelFlag = goproto.Int64(consts.Exist)
-	err := p.store.CreateFeedback(ctx, req.Feedback)
+	req.Feedback.Status = goproto.Int64(consts.Feedback_Created)
+	err = p.store.CreateFeedback(ctx, req.Feedback)
 	if err != nil {
 		logger.Error("CreateFeedback fail, err: %v", err)
 		return err

app/mix/service/service.go

@@ -1766,7 +1766,13 @@ func (s *Service) OpUpdateFeedback(ctx *gin.Context, req *feedbackproto.OpUpdate
 		return
 	}
 
-	err := _DefaultFeedback.OpUpdate(ctx, req)
+	err := _DefaultFeedback.OpUpdate(ctx, &feedbackproto.OpUpdateReq{
+		BaseRequest: req.BaseRequest,
+		Feedback: &dbstruct.Feedback{
+			Id:     req.Id,
+			Status: req.Status,
+		},
+	})
 	if err == qmgo.ErrNoSuchDocuments {
 		ec = errcode.ErrCodeFeedbackNotExist
 		err = nil

dbstruct/feedback.go

@@ -5,6 +5,7 @@ type Feedback struct {
 	Mid         *int64          `json:"mid" bson:"mid"`                 // 反馈用户mid
 	Discription *string         `json:"discription" bson:"discription"` // 问题描述
 	Credentials *MediaComponent `json:"credentials" bson:"credentials"` // 问题凭证
+	Status      *int64          `json:"status" bson:"status"`           // 问题状态
 	Ct          *int64          `json:"ct" bson:"ct"`                   // 创建时间
 	Ut          *int64          `json:"ut" bson:"ut"`                   // 更新时间
 	DelFlag     *int64          `json:"del_flag" bson:"del_flag"`       // 删除标记

dbstruct/idSeq.go

@@ -45,6 +45,10 @@ type ContactCustomerServiceSessionIdSeq struct {
 	Seq int64 //联系客服对话ID序列号
 }
 
+type FeedbackIdSeq struct {
+	Seq int64 //动态Id序列号
+}
+
 type MediaIdSeq struct {
 	Seq int64 `json:"seq" bson:"seq"`
 }