diff --git a/api/feedback/v1/feedback.go b/api/feedback/v1/feedback.go index 63a3172..b80de7c 100644 --- a/api/feedback/v1/feedback.go +++ b/api/feedback/v1/feedback.go @@ -1,6 +1,9 @@ package v1 -import "github.com/gogf/gf/v2/frame/g" +import ( + "github.com/gogf/gf/v2/frame/g" + "github.com/gogf/gf/v2/os/gtime" +) type ListReq struct { g.Meta `path:"/feedback" method:"get" tags:"Feedback" summary:"根据用户查询反馈列表"` @@ -9,7 +12,7 @@ type ListReq struct { Page int `json:"page" v:"required#页数不能为空" dc:"页数"` Size int `json:"size" v:"required#页大小不能为"` FeedbackType int `json:"feedbackType" v:"required#反馈类型不能为空" dc:"反馈类型"` - Title string `json:"title" v:"required#标题不能为空" dc:"标题"` + Title string `json:"title" dc:"标题"` } type ListRes struct { @@ -22,6 +25,8 @@ type CreateReq struct { Title string `json:"title" v:"required#标题不能为空" dc:"标题"` Content string `json:"content" v:"required#反馈内容不能为空" dc:"反馈内容"` FeedbackType int `json:"feedbackType" v:"required#反馈类型不能为空" dc:"反馈类型"` + StoreId int64 `json:"storeId" v:"required#门店ID不能为空" dc:"门店ID"` + MerchantId int64 `json:"merchantId" v:"required#商户ID不能为空" dc:"商户ID"` } type CreateRes struct { @@ -62,16 +67,16 @@ type InfoFeedbackReq struct { } type InfoFeedbackRes struct { - Id int64 `json:"id" dc:"ID"` - Title string `json:"title" dc:"标题"` - Content string `json:"content" dc:"反馈内容"` - FeedbackType int `json:"feedbackType" dc:"反馈类型"` - Reply string `json:"reply" dc:"回复"` - Status int `json:"status" dc:"状态"` - CreateTime int64 `json:"createTime" dc:"创建时间"` - UpdateTime int64 `json:"updateTime" dc:"更新时间"` - DeleteTime int64 `json:"deleteTime" dc:"删除时间"` - UserId int64 `json:"userId" dc:"用户ID"` - MerchantId int64 `json:"merchantId" dc:"商户ID"` - StoreId int64 `json:"storeId" dc:"店铺ID"` + Id int64 `json:"id" dc:"ID"` + Title string `json:"title" dc:"标题"` + Content string `json:"content" dc:"反馈内容"` + FeedbackType int `json:"feedbackType" dc:"反馈类型"` + Reply string `json:"reply" dc:"回复"` + Status int `json:"status" dc:"状态"` + CreateTime *gtime.Time `json:"createTime" dc:"创建时间"` + UpdateTime *gtime.Time `json:"updateTime" dc:"更新时间"` + DeleteTime *gtime.Time `json:"deleteTime" dc:"删除时间"` + UserId int64 `json:"userId" dc:"用户ID"` + MerchantId int64 `json:"merchantId" dc:"商户ID"` + StoreId int64 `json:"storeId" dc:"店铺ID"` } diff --git a/internal/controller/feedback/feedback_v1_create.go b/internal/controller/feedback/feedback_v1_create.go index aab9200..d870f5c 100644 --- a/internal/controller/feedback/feedback_v1_create.go +++ b/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 diff --git a/internal/controller/feedback/feedback_v1_info_feedback.go b/internal/controller/feedback/feedback_v1_info_feedback.go index fd98466..7dca96b 100644 --- a/internal/controller/feedback/feedback_v1_info_feedback.go +++ b/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 diff --git a/internal/logic/feedback/feedback.go b/internal/logic/feedback/feedback.go index ba0be78..8517fad 100644 --- a/internal/logic/feedback/feedback.go +++ b/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 diff --git a/internal/model/feedback.go b/internal/model/feedback.go index 7e8c4a8..247facf 100644 --- a/internal/model/feedback.go +++ b/internal/model/feedback.go @@ -41,6 +41,8 @@ type FeedbackCreateIn struct { Content string FeedbackType int OperatorId int64 + StoreId int64 + MerchantId int64 } type FeedbackCreateOut struct { diff --git a/utility/myCasbin/casbin.go b/utility/myCasbin/casbin.go index 60075e7..7b38447 100644 --- a/utility/myCasbin/casbin.go +++ b/utility/myCasbin/casbin.go @@ -44,8 +44,9 @@ func init() { enforcer.AddPolicy("user", "/x/feedback", "GET", "获取反馈信息列表") enforcer.AddPolicy("user", "/x/feedback", "POST", "添加反馈信息") enforcer.AddPolicy("user", "/x/feedback", "PUT", "更新反馈信息") + enforcer.AddPolicy("user", "/x/feedback/*", "PUT", "反馈信息处理") //enforcer.AddPolicy("user", "/x/feedback/*", "DELETE", "删除反馈信息")* - enforcer.AddPolicy("user", "/x/feedback/*", "Get", "查询反馈详情") + enforcer.AddPolicy("user", "/x/feedback/*", "GET", "查询反馈详情") } // 门店 {