反馈信息列表，详情修改

internal/controller/feedback/feedback_v1_create.go

@@ -2,7 +2,6 @@ package feedback
 
 import (
 	"context"
-	"github.com/gogf/gf/v2/frame/g"
 	"server/internal/model"
 	"server/internal/service"
 
@@ -11,13 +10,16 @@ import (
 
 func (c *ControllerV1) Create(ctx context.Context, req *v1.CreateReq) (res *v1.CreateRes, err error) {
 
-	id := g.RequestFromCtx(ctx).GetCtxVar("Id")
+	//id := g.RequestFromCtx(ctx).GetCtxVar("Id")
 
 	out, err := service.Feedback().Create(ctx, &model.FeedbackCreateIn{
 		Content:      req.Content,
 		FeedbackType: req.FeedbackType,
-		OperatorId:   id.Int64(),
-		Title:        req.Title,
+		OperatorId:   3,
+		//OperatorId:   id.Int64(),
+		Title:      req.Title,
+		StoreId:    req.StoreId,
+		MerchantId: req.MerchantId,
 	})
 	if err != nil {
 		return nil, err

internal/controller/feedback/feedback_v1_info_feedback.go

@@ -2,10 +2,9 @@ package feedback
 
 import (
 	"context"
+	"server/api/feedback/v1"
 	"server/internal/model"
 	"server/internal/service"
-
-	"server/api/feedback/v1"
 )
 
 func (c *ControllerV1) InfoFeedback(ctx context.Context, req *v1.InfoFeedbackReq) (res *v1.InfoFeedbackRes, err error) {
@@ -24,9 +23,9 @@ func (c *ControllerV1) InfoFeedback(ctx context.Context, req *v1.InfoFeedbackReq
 		FeedbackType: out.FeedbackType,
 		Status:       out.Status,
 		Reply:        out.Reply,
-		CreateTime:   out.CreateTime.Unix(),
-		UpdateTime:   out.UpdateTime.Unix(),
-		DeleteTime:   out.DeleteTime.Unix(),
+		CreateTime:   out.CreateTime,
+		UpdateTime:   out.UpdateTime,
+		DeleteTime:   out.DeleteTime,
 		StoreId:      out.StoreId,
 		MerchantId:   out.MerchantId,
 	}, nil

internal/logic/feedback/feedback.go

@@ -86,6 +86,8 @@ func (s *sFeedback) Create(ctx context.Context, in *model.FeedbackCreateIn) (out
 		Content:      in.Content,
 		FeedbackType: in.FeedbackType,
 		UserId:       in.OperatorId,
+		StoreId:      in.StoreId,
+		MerchatId:    in.MerchantId,
 	})
 	if err != nil {
 		return nil, err

internal/model/feedback.go

@@ -41,6 +41,8 @@ type FeedbackCreateIn struct {
 	Content      string
 	FeedbackType int
 	OperatorId   int64
+	StoreId      int64
+	MerchantId   int64
 }
 
 type FeedbackCreateOut struct {