feat:完善项目信息
This commit is contained in:
@ -25,6 +25,18 @@ func (*Sys) Banner(c *gin.Context) {
|
||||
api.APIResponse(err, data)(c)
|
||||
}
|
||||
|
||||
func (*Sys) BannerLocal(c *gin.Context) {
|
||||
form := &struct {
|
||||
api.TenantIDStringForm
|
||||
}{}
|
||||
if err := api.Bind(form)(c); err != nil {
|
||||
api.APIFailure(err.(error))(c)
|
||||
return
|
||||
}
|
||||
data, err := sys.NewBanner()(api.GetSession()(c).(*session.Admin)).Local(form.Convert())
|
||||
api.APIResponse(err, data)(c)
|
||||
}
|
||||
|
||||
func (*Sys) BannerForm(c *gin.Context) {
|
||||
form := &struct {
|
||||
api.IDStringForm
|
||||
@ -136,3 +148,59 @@ func (*Sys) NavigationDelete(c *gin.Context) {
|
||||
err := sys.NewNavigation()(api.GetSession()(c).(*session.Admin)).Delete(form.Convert())
|
||||
api.APIResponse(err)(c)
|
||||
}
|
||||
|
||||
func (*Sys) Agreement(c *gin.Context) {
|
||||
form := &struct {
|
||||
api.TenantIDStringForm
|
||||
Title string `json:"title" form:"title"`
|
||||
api.PageForm
|
||||
}{}
|
||||
if err := api.Bind(form)(c); err != nil {
|
||||
api.APIFailure(err.(error))(c)
|
||||
return
|
||||
}
|
||||
data, err := sys.NewAgreement()(api.GetSession()(c).(*session.Admin)).Instance(form.Convert(), form.Title,
|
||||
form.Page, form.PageSize)
|
||||
api.APIResponse(err, data)(c)
|
||||
}
|
||||
|
||||
func (*Sys) AgreementDetail(c *gin.Context) {
|
||||
form := new(api.IDStringForm)
|
||||
|
||||
if err := api.Bind(form)(c); err != nil {
|
||||
api.APIFailure(err.(error))(c)
|
||||
return
|
||||
}
|
||||
data, err := sys.NewAgreement()(api.GetSession()(c).(*session.Admin)).Detail(form.Convert())
|
||||
api.APIResponse(err, data)(c)
|
||||
}
|
||||
|
||||
func (*Sys) AgreementForm(c *gin.Context) {
|
||||
form := &struct {
|
||||
api.IDStringForm
|
||||
api.TenantIDStringForm
|
||||
Title string `json:"title" form:"title" binding:"required"`
|
||||
Content string `json:"content" form:"content" binding:"required"`
|
||||
Status int `json:"status" form:"status" binding:"required"`
|
||||
}{}
|
||||
if err := api.Bind(form)(c); err != nil {
|
||||
api.APIFailure(err.(error))(c)
|
||||
return
|
||||
}
|
||||
err := sys.NewAgreement()(api.GetSession()(c).(*session.Admin)).Form(&sys.AgreementParams{
|
||||
ID: form.IDStringForm.Convert(), TenantID: form.TenantIDStringForm.Convert(),
|
||||
Title: form.Title, Content: form.Content, Status: form.Status,
|
||||
})
|
||||
api.APIResponse(err)(c)
|
||||
}
|
||||
|
||||
func (*Sys) AgreementDelete(c *gin.Context) {
|
||||
form := new(api.IDStringForm)
|
||||
|
||||
if err := api.Bind(form)(c); err != nil {
|
||||
api.APIFailure(err.(error))(c)
|
||||
return
|
||||
}
|
||||
err := sys.NewAgreement()(api.GetSession()(c).(*session.Admin)).Delete(form.Convert())
|
||||
api.APIResponse(err)(c)
|
||||
}
|
||||
|
151
app/api/admin/controller/sys/agreement.go
Normal file
151
app/api/admin/controller/sys/agreement.go
Normal file
@ -0,0 +1,151 @@
|
||||
package sys
|
||||
|
||||
import (
|
||||
"SciencesServer/app/api/admin/model"
|
||||
"SciencesServer/app/basic/controller"
|
||||
model2 "SciencesServer/app/common/model"
|
||||
"SciencesServer/app/session"
|
||||
"errors"
|
||||
)
|
||||
|
||||
type Agreement struct {
|
||||
*session.Admin
|
||||
}
|
||||
|
||||
type AgreementHandle func(session *session.Admin) *Agreement
|
||||
|
||||
type (
|
||||
// AgreementInfo 协议信息
|
||||
AgreementInfo struct {
|
||||
ID string `json:"id"`
|
||||
TenantID string `json:"tenant_id"`
|
||||
Area string `json:"area"`
|
||||
*model2.SysAgreement
|
||||
}
|
||||
// AgreementDetailInfo 协议详细信息
|
||||
AgreementDetailInfo struct {
|
||||
ID string `json:"id"`
|
||||
TenantID string `json:"tenant_id"`
|
||||
*model2.SysAgreement
|
||||
}
|
||||
// AgreementParams 协议参数信息
|
||||
AgreementParams struct {
|
||||
ID, TenantID uint64
|
||||
Title, Content string
|
||||
Status int
|
||||
}
|
||||
)
|
||||
|
||||
// Instance 首页信息
|
||||
func (c *Agreement) Instance(tenantID uint64, title string, page, pageSize int) (*controller.ReturnPages, error) {
|
||||
mSysAgreement := model.NewSysAgreement()
|
||||
|
||||
where := make([]*model2.ModelWhere, 0)
|
||||
|
||||
if c.TenantID > 0 {
|
||||
where = append(where, model2.NewWhere("s.tenant_id", c.TenantID))
|
||||
}
|
||||
if tenantID > 0 {
|
||||
where = append(where, model2.NewWhere("s.tenant_id", tenantID))
|
||||
}
|
||||
if title != "" {
|
||||
where = append(where, model2.NewWhereLike("s.title", title))
|
||||
}
|
||||
var count int64
|
||||
|
||||
out, err := mSysAgreement.Agreement(page, pageSize, &count, where...)
|
||||
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
list := make([]*AgreementInfo, 0)
|
||||
|
||||
for _, v := range out {
|
||||
list = append(list, &AgreementInfo{
|
||||
ID: v.GetEncodeID(),
|
||||
TenantID: v.GetEncodeTenantID(),
|
||||
Area: v.FormatBasic(),
|
||||
SysAgreement: v.SysAgreement,
|
||||
})
|
||||
}
|
||||
return &controller.ReturnPages{Data: list, Count: count}, nil
|
||||
}
|
||||
|
||||
// Detail 详细信息
|
||||
func (c *Agreement) Detail(id uint64) (*AgreementDetailInfo, error) {
|
||||
mSysAgreement := model.NewSysAgreement()
|
||||
mSysAgreement.ID = id
|
||||
|
||||
isExist, err := model2.FirstField(mSysAgreement.SysAgreement, []string{"id", "tenant_id"})
|
||||
|
||||
if err != nil {
|
||||
return nil, err
|
||||
} else if !isExist {
|
||||
return nil, errors.New("操作错误,协议信息不存在或已被删除")
|
||||
}
|
||||
return &AgreementDetailInfo{
|
||||
ID: mSysAgreement.GetEncodeID(),
|
||||
TenantID: mSysAgreement.GetEncodeTenantID(),
|
||||
SysAgreement: mSysAgreement.SysAgreement,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (c *Agreement) Form(params *AgreementParams) error {
|
||||
mSysAgreement := model.NewSysAgreement()
|
||||
|
||||
if params.ID > 0 {
|
||||
mSysAgreement.ID = params.ID
|
||||
|
||||
isExist, err := model2.FirstField(mSysAgreement.SysAgreement, []string{"id", "tenant_id", "created_at"})
|
||||
|
||||
if err != nil {
|
||||
return err
|
||||
} else if !isExist {
|
||||
return errors.New("操作错误,协议信息不存在或已被删除")
|
||||
}
|
||||
if c.TenantID > 0 && c.TenantID != mSysAgreement.TenantID {
|
||||
return errors.New("操作错误,无权限操作")
|
||||
}
|
||||
}
|
||||
mSysAgreement.Title = params.Title
|
||||
mSysAgreement.Content = params.Content
|
||||
mSysAgreement.Status = model2.SysAgreementStatus(params.Status)
|
||||
|
||||
if mSysAgreement.ID > 0 {
|
||||
if c.TenantID <= 0 {
|
||||
mSysAgreement.TenantID = params.TenantID
|
||||
}
|
||||
return model2.Updates(mSysAgreement.SysAgreement, mSysAgreement.SysAgreement)
|
||||
}
|
||||
mSysAgreement.TenantID = params.TenantID
|
||||
|
||||
if c.TenantID > 0 {
|
||||
mSysAgreement.TenantID = c.TenantID
|
||||
}
|
||||
return model2.Create(mSysAgreement.SysAgreement)
|
||||
}
|
||||
|
||||
// Delete 删除操作
|
||||
func (c *Agreement) Delete(id uint64) error {
|
||||
mSysAgreement := model.NewSysAgreement()
|
||||
mSysAgreement.ID = id
|
||||
|
||||
isExist, err := model2.FirstField(mSysAgreement.SysAgreement, []string{"id", "tenant_id"})
|
||||
|
||||
if err != nil {
|
||||
return err
|
||||
} else if !isExist {
|
||||
return errors.New("操作错误,协议信息不存在或已被删除")
|
||||
}
|
||||
if c.TenantID > 0 && mSysAgreement.TenantID != c.TenantID {
|
||||
return errors.New("操作错误,无权限操作")
|
||||
}
|
||||
return model2.Delete(mSysAgreement.SysAgreement)
|
||||
}
|
||||
|
||||
func NewAgreement() AgreementHandle {
|
||||
return func(session *session.Admin) *Agreement {
|
||||
return &Agreement{session}
|
||||
}
|
||||
}
|
@ -22,8 +22,8 @@ type (
|
||||
BannerInfo struct {
|
||||
ID string `json:"id"`
|
||||
*model2.SysBanner
|
||||
Area string `json:"area"`
|
||||
Images []string `json:"images"`
|
||||
Area string `json:"area"`
|
||||
Images string `json:"images"`
|
||||
}
|
||||
// BannerLocalInfo 轮播图位置信息
|
||||
BannerLocalInfo struct {
|
||||
@ -37,10 +37,9 @@ type (
|
||||
}
|
||||
// BannerParams 轮播图参数信息
|
||||
BannerParams struct {
|
||||
ID, TenantID uint64
|
||||
Title, Local, Size, Remark string
|
||||
Images []string
|
||||
IsMultiple int
|
||||
ID, TenantID uint64
|
||||
Title, Local, Size, Images, Remark string
|
||||
IsMultiple int
|
||||
}
|
||||
)
|
||||
|
||||
@ -156,7 +155,7 @@ func (c *Banner) Form(params *BannerParams) error {
|
||||
}
|
||||
mSysBanner.Title = params.Title
|
||||
mSysBanner.Local = params.Local
|
||||
mSysBanner.Images.SetImagesAttribute(params.Images)
|
||||
mSysBanner.Images.Images = params.Images
|
||||
mSysBanner.Size = params.Size
|
||||
mSysBanner.IsMultiple = params.IsMultiple
|
||||
mSysBanner.Remark = params.Remark
|
||||
@ -185,16 +184,12 @@ func (c *Banner) Local(tenantID uint64) ([]*BannerLocalInfo, error) {
|
||||
|
||||
if tenantID > 0 {
|
||||
where = append(where, model2.NewWhere("tenant_id", tenantID))
|
||||
} else {
|
||||
where = append(where, model2.NewWhere("tenant_id", c.TenantID))
|
||||
}
|
||||
if err := model2.Pluck(mSysBanner.SysBanner, "local", &out, where...); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
c.filter(out, ">")
|
||||
|
||||
return nil, nil
|
||||
return c.tree(c.filter(out, ">"), defaultFirstLevelKey), nil
|
||||
}
|
||||
|
||||
// Delete 删除操作
|
||||
|
45
app/api/admin/model/sys_agreement.go
Normal file
45
app/api/admin/model/sys_agreement.go
Normal file
@ -0,0 +1,45 @@
|
||||
package model
|
||||
|
||||
import (
|
||||
"SciencesServer/app/common/model"
|
||||
"SciencesServer/serve/orm"
|
||||
"fmt"
|
||||
)
|
||||
|
||||
type SysAgreement struct {
|
||||
*model.SysAgreement
|
||||
}
|
||||
|
||||
// SysAgreementInfo 轮播图信息
|
||||
type SysAgreementInfo struct {
|
||||
*model.SysAgreement
|
||||
model.Area
|
||||
}
|
||||
|
||||
// Agreement 协议信息
|
||||
func (m *SysAgreement) Agreement(page, pageSize int, count *int64, where ...*model.ModelWhere) ([]*SysAgreementInfo, error) {
|
||||
db := orm.GetDB().Table(m.TableName()+" AS s").
|
||||
Select("s.id", "s.tenant_id", "s.title", "s.status", "s.created_at", "s.updated_at",
|
||||
"t.province", "t.city").
|
||||
Joins(fmt.Sprintf("LEFT JOIN %s AS t ON s.tenant_id = t.id", model.NewSysTenant().TableName())).
|
||||
Where("s.is_deleted = ?", model.DeleteStatusForNot)
|
||||
|
||||
if len(where) > 0 {
|
||||
for _, wo := range where {
|
||||
db = db.Where(wo.Condition, wo.Value)
|
||||
}
|
||||
}
|
||||
out := make([]*SysAgreementInfo, 0)
|
||||
|
||||
if err := db.Count(count).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := db.Order("s.id " + model.OrderModeToDesc).Offset((page - 1) * pageSize).Limit(pageSize).Scan(&out).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return out, nil
|
||||
}
|
||||
|
||||
func NewSysAgreement() *SysAgreement {
|
||||
return &SysAgreement{model.NewSysAgreement()}
|
||||
}
|
@ -30,8 +30,8 @@ type (
|
||||
}
|
||||
// WithdrawalTransferInfo 提现转账信息
|
||||
WithdrawalTransferInfo struct {
|
||||
Images []string `json:"images"`
|
||||
Remark string `json:"remark"`
|
||||
Images string `json:"images"`
|
||||
Remark string `json:"remark"`
|
||||
}
|
||||
)
|
||||
|
||||
|
Reference in New Issue
Block a user