From 18b5d94a4d627739b2cb2e6ff68a092638f2112d Mon Sep 17 00:00:00 2001 From: XiaoLFeng Date: Tue, 2 Jan 2024 00:28:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7=E8=B5=9E?= =?UTF-8?q?=E5=8A=A9=E6=A8=A1=E5=9D=97=EF=BC=88=E5=B8=A6=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E4=B8=8E=E7=99=BB=E9=99=86=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=A1=AB=E5=86=99=E6=9C=89=E5=85=B3=E4=BF=A1=E6=81=AF=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/interface.go | 1 + api/request/sponsorApi.go | 4 ++ .../link/custom/sponsor/sponsorController.go | 15 +++++ internal/dao/sponsorDAO/sponsorDAO.go | 34 ++++++++++ .../SponsorServiceImpl/sponsorServiceImpl.go | 64 +++++++++++++++++++ internal/model/do/sponsorDO.go | 4 +- internal/model/do/sponsorTypeDO.go | 13 ++++ internal/model/do/userDO.go | 1 + internal/model/entity/sponsorAddVO.go | 9 +++ .../service/SponsorService/sponsorService.go | 2 + utility/ErrorCode/ErrorCode.go | 2 + 11 files changed, 147 insertions(+), 2 deletions(-) create mode 100644 internal/model/do/sponsorTypeDO.go create mode 100644 internal/model/entity/sponsorAddVO.go diff --git a/api/interface.go b/api/interface.go index 7ccd38e..19bfb08 100644 --- a/api/interface.go +++ b/api/interface.go @@ -34,4 +34,5 @@ type IUserV1 interface { type ISponsorV1 interface { GetSponsor(context.Context, *request.GetSponsorReq) (*request.GetSponsorRes, error) + AddSponsor(context.Context, *request.AddSponsorReq) (*request.AddSponsorRes, error) } diff --git a/api/request/sponsorApi.go b/api/request/sponsorApi.go index 2771d6f..160d79c 100644 --- a/api/request/sponsorApi.go +++ b/api/request/sponsorApi.go @@ -5,5 +5,9 @@ import "github.com/gogf/gf/v2/frame/g" type GetSponsorReq struct { g.Meta `path:"/list" tags:"获取赞助" method:"get" summary:"获取赞助"` } +type AddSponsorReq struct { + g.Meta `path:"/add" tags:"添加赞助" method:"post" summary:"添加赞助"` +} type GetSponsorRes struct{} +type AddSponsorRes struct{} diff --git a/internal/controller/auth/link/custom/sponsor/sponsorController.go b/internal/controller/auth/link/custom/sponsor/sponsorController.go index c4bb83f..b726e88 100644 --- a/internal/controller/auth/link/custom/sponsor/sponsorController.go +++ b/internal/controller/auth/link/custom/sponsor/sponsorController.go @@ -3,6 +3,7 @@ package sponsor import ( "PersonalMain/api" "PersonalMain/api/request" + "PersonalMain/internal/model/entity" "PersonalMain/internal/service/SponsorService" "context" "github.com/gogf/gf/v2/net/ghttp" @@ -27,3 +28,17 @@ func (*ControllerV1) GetSponsor(ctx context.Context, _ *request.GetSponsorReq) ( sponorService().GetSponsor(req) return res, err } + +// AddSponsor +// +// 添加赞助 +func (*ControllerV1) AddSponsor(ctx context.Context, _ *request.AddSponsorReq) (res *request.AddSponsorRes, err error) { + req := ghttp.RequestFromCtx(ctx) + // 获取业务 + sponsorAddVO := entity.SponsorAddVO{} + err = req.GetRequestStruct(&sponsorAddVO) + if err == nil { + sponorService().AddSponsor(req, sponsorAddVO) + } + return res, err +} diff --git a/internal/dao/sponsorDAO/sponsorDAO.go b/internal/dao/sponsorDAO/sponsorDAO.go index 4b8f18b..677912d 100644 --- a/internal/dao/sponsorDAO/sponsorDAO.go +++ b/internal/dao/sponsorDAO/sponsorDAO.go @@ -27,3 +27,37 @@ func GetSponsor() *[]do.SponsorDO { return nil } } + +// AddSponsor +// +// 添加赞助 +func AddSponsor(getSponsorDO do.SponsorDO) bool { + // + _, err := g.Model("xf_sponsor").Data(getSponsorDO).Insert() + if err == nil { + g.Log().Cat("Database").Cat("Sponor").Notice(context.Background(), "xf_sponor 数据表数据添加成功") + return true + } else { + g.Log().Cat("Database").Cat("Sponor").Error(context.Background(), err.Error()) + return false + } +} + +func GetSponsorType(t uint8) *do.SponsorTypeDO { + var getSponsorTypeDO do.SponsorTypeDO + result, err := g.Model("xf_sponsor_type").Where("id", t).One() + if err == nil { + if !result.IsEmpty() { + _ = result.Struct(&getSponsorTypeDO) + g.Log().Cat("Database").Cat("Sponor").Notice(context.Background(), "xf_sponsor_type 数据表数据提取成功") + return &getSponsorTypeDO + } else { + g.Log().Cat("Database").Cat("Sponor").Notice(context.Background(), "xf_sponsor_type 数据表中没有赞助类型相关信息") + return nil + } + } else { + g.Log().Cat("Database").Cat("Sponor").Error(context.Background(), err.Error()) + return nil + } + +} diff --git a/internal/logic/SponsorServiceImpl/sponsorServiceImpl.go b/internal/logic/SponsorServiceImpl/sponsorServiceImpl.go index 90ee884..891ac7d 100644 --- a/internal/logic/SponsorServiceImpl/sponsorServiceImpl.go +++ b/internal/logic/SponsorServiceImpl/sponsorServiceImpl.go @@ -2,13 +2,77 @@ package SponsorServiceImpl import ( "PersonalMain/internal/dao/sponsorDAO" + "PersonalMain/internal/model/do" + "PersonalMain/internal/model/entity" + "PersonalMain/internal/service/TokenService" + "PersonalMain/internal/service/UserService" "PersonalMain/utility/ErrorCode" "PersonalMain/utility/ResultUtil" "github.com/gogf/gf/v2/net/ghttp" + "time" ) type SponsorServiceImpl struct{} +func tokenService() TokenService.TokenService { + return TokenService.NewTokenService() +} + +func userService() UserService.UserService { + return UserService.NewUserService() +} + +// AddSponsor +// +// 添加赞助 +func (*SponsorServiceImpl) AddSponsor(req *ghttp.Request, entity entity.SponsorAddVO) { + // 检查用户是否登陆 + getTokenDO := tokenService().GetToken(req) + var getUserDO *do.UserDO + var check = false + if getTokenDO != nil { + // 检查token是否有效 + if tokenService().VerifyToken(getTokenDO) { + // 配置用户信息 + getUserDO = userService().UserCurrent(req) + if getUserDO.Permission { + check = true + } + } else { + // token无效 + tokenService().DeleteToken(req) + ResultUtil.ErrorNoData(req, ErrorCode.TokenVerifyFailed) + return + } + } else { + getUserDO = new(do.UserDO) + getUserDO.UserName = entity.Name + } + // 数据检查 + getSponsorTypeInfo := sponsorDAO.GetSponsorType(entity.Type) + if getSponsorTypeInfo == nil { + ResultUtil.ErrorNoData(req, ErrorCode.NoSponsorType) + return + } + // 数据处理 + newSponsorDO := do.SponsorDO{ + Name: getUserDO.UserName, + UserId: getUserDO.Id, + Url: entity.Url, + Type: entity.Type, + Money: entity.Money, + CreatedAt: time.Time{}, + Check: check, + } + if sponsorDAO.AddSponsor(newSponsorDO) { + //TODO：发送邮件 + ResultUtil.SuccessNoData(req, "添加成功") + } else { + //TODO：发送邮件 + ResultUtil.ErrorNoData(req, ErrorCode.AddSponsorFailed) + } +} + // GetSponsor // // 获取赞助 diff --git a/internal/model/do/sponsorDO.go b/internal/model/do/sponsorDO.go index 729b471..3ad0f5b 100644 --- a/internal/model/do/sponsorDO.go +++ b/internal/model/do/sponsorDO.go @@ -8,7 +8,7 @@ type SponsorDO struct { UserId *uint64 `json:"user_id"` Url *string `json:"url"` Type uint8 `json:"type"` - Amount uint64 `json:"amount"` + Money uint64 `json:"money"` CreatedAt time.Time `json:"created_at"` - Check uint8 `json:"check"` + Check bool `json:"check"` } diff --git a/internal/model/do/sponsorTypeDO.go b/internal/model/do/sponsorTypeDO.go new file mode 100644 index 0000000..dfc54f8 --- /dev/null +++ b/internal/model/do/sponsorTypeDO.go @@ -0,0 +1,13 @@ +package do + +import "time" + +type SponsorTypeDO struct { + Id *uint64 `json:"id"` + Name string `json:"name"` + Url string `json:"url"` + Include bool `json:"include"` + Link bool `json:"link"` + CreatedAt time.Time `json:"created_at"` + UpdatedAt *time.Time `json:"updated_at"` +} diff --git a/internal/model/do/userDO.go b/internal/model/do/userDO.go index fa9da20..18cfb50 100644 --- a/internal/model/do/userDO.go +++ b/internal/model/do/userDO.go @@ -10,6 +10,7 @@ type UserDO struct { Qq *string `json:"qq"` Password string `json:"password"` OldPassword *string `json:"old_password"` + Permission bool `json:"permission"` EmailVerify bool `json:"email_verify"` CreatedAt time.Time `json:"created_at"` UpdatedAt *time.Time `json:"updated_at"` diff --git a/internal/model/entity/sponsorAddVO.go b/internal/model/entity/sponsorAddVO.go new file mode 100644 index 0000000..7325d47 --- /dev/null +++ b/internal/model/entity/sponsorAddVO.go @@ -0,0 +1,9 @@ +package entity + +type SponsorAddVO struct { + Name string `json:"name" v:"required|length:1,50#请输入赞助名称|赞助名称长度为:1到:50位"` + Url *string `json:"url" v:"url#请输入正确的赞助链接"` + Type uint8 `json:"type" v:"required|between:1,4#请选择赞助类型|赞助类型只能为:1或:2"` + Money uint64 `json:"money" v:"required|between:1,1000000#请输入赞助金额|赞助金额只能为:1到1000000"` + StatementOfAccount *string `json:"statement_of_account" v:"required#请输入流水号，以便博主可以查明账单来源"` +} diff --git a/internal/service/SponsorService/sponsorService.go b/internal/service/SponsorService/sponsorService.go index 468843e..9120350 100644 --- a/internal/service/SponsorService/sponsorService.go +++ b/internal/service/SponsorService/sponsorService.go @@ -2,6 +2,7 @@ package SponsorService import ( "PersonalMain/internal/logic/SponsorServiceImpl" + "PersonalMain/internal/model/entity" "github.com/gogf/gf/v2/net/ghttp" ) @@ -11,4 +12,5 @@ func NewSponsorService() SponsorService { type SponsorService interface { GetSponsor(*ghttp.Request) + AddSponsor(*ghttp.Request, entity.SponsorAddVO) } diff --git a/utility/ErrorCode/ErrorCode.go b/utility/ErrorCode/ErrorCode.go index 5c99e89..9ecca20 100644 --- a/utility/ErrorCode/ErrorCode.go +++ b/utility/ErrorCode/ErrorCode.go @@ -31,6 +31,8 @@ var ( LinkAcceptDenied = ErrorCode{output: "LinkAcceptDenied", code: 40305, message: "链接接受协议拒绝"} FriendLinkDoesNotExist = ErrorCode{output: "FriendLinkDoesNotExist", code: 40306, message: "友链不存在"} NoSponsor = ErrorCode{output: "NoSponsor", code: 40307, message: "没有赞助"} + AddSponsorFailed = ErrorCode{output: "AddSponsorFailed", code: 40308, message: "添加赞助失败"} + NoSponsorType = ErrorCode{output: "NoSponsorType", code: 40309, message: "没有此赞助类型"} ServerUnknownError = ErrorCode{output: "ServerUnknownError", code: 50000, message: "服务器未知错误"} ServerDatabaseInteriorError = ErrorCode{output: "ServerDatabaseInteriorError", code: 50001, message: "服务器数据库内部错误"} )