williamet/cas_tt_cloud_backend
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat：完善项目信息

Browse Source
This commit is contained in:
henry
2022-01-20 17:22:05 +08:00
parent bfa9af1654
commit 7a9c8f9e56
11 changed files with 53 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/api/website/controller/docking.go
View File

@ -8,22 +8,23 @@ import (
type Docking struct {
*session.Enterprise
tenantID uint64
}
type DockingHandle func(session *session.Enterprise) *Docking
type DockingHandle func(session *session.Enterprise, tenantID uint64) *Docking
// Form 联系客服对接
func (c *Docking) Form() error {
func (c *Docking) Form(ip string) error {
mServiceDocking := model.NewServiceDocking()
mServiceDocking.TenantID = c.tenantID
mServiceDocking.UID = c.UID
mServiceDocking.IP = ip
if c.Enterprise != nil {
mServiceDocking.UID = c.UID
}
return model2.Create(mServiceDocking.ServiceDocking)
}
func NewDocking() DockingHandle {
return func(session *session.Enterprise) *Docking {
return func(session *session.Enterprise, tenantID uint64) *Docking {
return &Docking{
Enterprise: session,
}

5
app/api/website/controller/manage/company.go
View File

@ -63,6 +63,7 @@ func (c *Company) Instance(id uint64) (*CompanyInstanceInfo, error) {
ID: mManageCompany.GetEncodeID(), Kind: mManageCompany.Kind, Name: mManageCompany.Name,
Image: mManageCompany.Image.Analysis(config2.SystemConfig[config2.SysImageDomain]),
Url: mManageCompany.Url,
Product: mManageCompany.Product,
Keywords: mManageCompany.GetKeywordAttribute(),
},
KindTitle: mManageCompany.KindTitle(),
@ -76,7 +77,7 @@ func (c *Company) Instance(id uint64) (*CompanyInstanceInfo, error) {
func (c *Company) Product(id uint64, page, pageSize int) (*controller.ReturnPages, error) {
mManageCompany := model.NewManageCompany()
var count int64
out, err := mManageCompany.Product(id, c.UID, page, pageSize, &count)
out, err := mManageCompany.Products(id, c.UID, page, pageSize, &count)
if err != nil {
return nil, err
@ -96,7 +97,7 @@ func (c *Company) Product(id uint64, page, pageSize int) (*controller.ReturnPage
list = append(list, &CompanyProductInfo{
ManageCompanyProduct: v,
ID: v.GetEncodeID(),
IsCollect: v.IsCollect > 0,
IsCollect: v.CollectID > 0,
LeadStandardTitle: v.GetLeadStandardTitle(),
MaturityTitle: config.GetTechnologyMaturityTitle(v.Maturity),
CooperationModeTitle: config.GetTechnologyCooperationModeTitle(v.CooperationMode),

8
app/api/website/controller/user/collect.go
View File

@ -13,7 +13,7 @@ type Collect struct {
type CollectHandle func(session *session.Enterprise) *Collect
// Launch 收藏发起
func (c *Collect) Launch(kind int, objectID uint64) error {
func (c *Collect) Launch(kind int, objectID uint64) (bool, error) {
mUserCollect := model.NewUserCollect()
where := []*model2.ModelWhere{
@ -24,15 +24,15 @@ func (c *Collect) Launch(kind int, objectID uint64) error {
isExist, err := model2.FirstField(mUserCollect.UserCollect, []string{"id"}, where...)
if err != nil {
return err
return false, err
}
if isExist {
return model2.Delete(mUserCollect.UserCollect)
return false, model2.Delete(mUserCollect.UserCollect)
}
mUserCollect.UID = c.UID
mUserCollect.Kind = model2.UserCollectKind(kind)
mUserCollect.ObjectID = objectID
return model2.Create(mUserCollect.UserCollect)
return true, model2.Create(mUserCollect.UserCollect)
}
func NewCollect() CollectHandle {