git fix

cmd_super_implement.bat

@@ -13,7 +13,7 @@ REM 将文件名转换成大驼峰格式并设置成最终实现类名
 for /f "delims=" %%i in ('powershell -File "%BasePath%etc\ps\ConvertToUpperCase.ps1" -inputString "%FileName%"') do set "ImplementName=%%i"
 
 REM 使用 PowerShell 替换接口名称，并指定 UTF-8 编码
-powershell -Command "(Get-Content '%BasePath%etc\template\template_implement.tpl') -replace 'DemoImplement', '%ImplementName%' | Out-File -FilePath '%BasePath%temp_implement.go' -Encoding UTF8"
+powershell -Command "(Get-Content '%BasePath%etc\template\template_super_implement.tpl') -replace 'DemoImplement', '%ImplementName%' | Out-File -FilePath '%BasePath%temp_implement.go' -Encoding UTF8"
 
 REM 如果需要，将临时文件重命名为最终文件（取决于move Y?N）
 move /Y "%BasePath%temp_implement.go" "%FinalFile%"

etc/template/template_implement.tpl

@@ -1,7 +1,7 @@
 package implement
 
 import (
-	"applet/app/db/dao"
+	"code.fnuoos.com/zhimeng/model.git/src/dao"
 	"xorm.io/xorm"
 )
 

etc/template/template_super_implement.tpl

@@ -0,0 +1,14 @@
+package implement
+
+import (
+	"code.fnuoos.com/zhimeng/model.git/src/super/dao"
+	"xorm.io/xorm"
+)
+
+func NewDemoImplementDb(engine *xorm.Engine) dao.DemoImplementDao {
+	return &DemoImplementDb{Db: engine}
+}
+
+type DemoImplementDb struct {
+	Db *xorm.Engine
+}

src/dao/agent_dao.go

@@ -1,4 +1,4 @@
-package dao
+package dao
 
 import (
 	"code.fnuoos.com/zhimeng/model.git/src/model"
@@ -14,6 +14,8 @@ type AgentDao interface {
 	FindAdmin(username string, state, page, limit int) (list []model.Agent, total int64, err error)
 	GetAgent(id int) (m *model.Agent, err error)
 	FindAgentRolePermissionGroup(id int) (list []*AgentWithRolePermissionGroup, total int64, err error)
+	GetSuperAdmin(agentId int) (list *model.Agent)
+	GetSuperAgentByUsername(username string) (agent *model.Agent, err error)
 }
 
 type AgentWithRolePermissionGroup struct {

src/dao/applet_application_ad_space_list_dao.go

@@ -3,6 +3,7 @@ package dao
 import "code.fnuoos.com/zhimeng/model.git/src/model"
 
 type AppletApplicationAdSpaceListDao interface {
+	FindAppletApplicationAdSpaceListByMediumId(mediumId int) (medium *[]model.AppletApplicationAdSpaceList, err error)
 	FindAppletApplicationAdSpaceListByIds(id []string) (medium *[]model.AppletApplicationAdSpaceList, err error)
 	FindAppletApplicationAdSpaceList(name, platform string, state string, mediumId, page, limit int) (list []AppletApplicationAdSpaceListGroup, total int64, err error)
 }

src/dao/medium_dao.go

@@ -15,6 +15,7 @@ type MediumDao interface {
 	GetMedium(id int) (m *model.Medium, err error)
 	FindMediumRolePermissionGroup(id int) (list []*MediumWithRolePermissionGroup, total int64, err error)
 	FindSuperAdmin(username, memo string, page, limit int) (list []model.Medium, total int64, err error)
+	GetSuperAdmin(mediumId int) (list *model.Medium)
 }
 
 type MediumWithRolePermissionGroup struct {

src/implement/agent_implement.go

@@ -1,4 +1,4 @@
-package implement
+package implement
 
 import (
 	"code.fnuoos.com/zhimeng/model.git/src/dao"
@@ -98,3 +98,23 @@ func (a AgentDb) FindAgentRolePermissionGroup(id int) (list []*dao.AgentWithRole
 		FindAndCount(&list)
 	return
 }
+func (a AgentDb) GetSuperAdmin(agentId int) (list *model.Agent) {
+	list = new(model.Agent)
+	sess := a.Db.Where("is_super_administrator=1 and agent_id=?", agentId)
+	get, err := sess.Get(list)
+	if err != nil || get == false {
+		return nil
+	}
+	return list
+}
+func (a AgentDb) GetSuperAgentByUsername(username string) (agent *model.Agent, err error) {
+	agent = new(model.Agent)
+	has, err := a.Db.Where("is_super_administrator=1 and username =?", username).Get(agent)
+	if err != nil {
+		return nil, zhios_order_relate_logx.Error(err)
+	}
+	if has == false {
+		return nil, nil
+	}
+	return agent, nil
+}

src/implement/applet_application_ad_space_list_implement.go

@@ -23,6 +23,15 @@ func (a AppletApplicationAdSpaceListDb) FindAppletApplicationAdSpaceListByIds(id
 	}
 	return medium, nil
 }
+func (a AppletApplicationAdSpaceListDb) FindAppletApplicationAdSpaceListByMediumId(mediumId int) (medium *[]model.AppletApplicationAdSpaceList, err error) {
+
+	medium = new([]model.AppletApplicationAdSpaceList)
+	err = a.Db.Where("medium_id=?", mediumId).Find(medium)
+	if err != nil {
+		return nil, zhios_order_relate_logx.Error(err)
+	}
+	return medium, nil
+}
 func (a AppletApplicationAdSpaceListDb) FindAppletApplicationAdSpaceList(name, platform string, state string, mediumId, page, limit int) (list []dao.AppletApplicationAdSpaceListGroup, total int64, err error) {
 	sess := a.Db.Where("applet_application_ad_space_list.id>0").Desc("applet_application_ad_space_list.id")
 	if page > 0 {

src/implement/medium_implement.go

@@ -112,3 +112,12 @@ func (m MediumDb) FindSuperAdmin(username, memo string, page, limit int) (list [
 	}
 	return
 }
+func (m MediumDb) GetSuperAdmin(mediumId int) (list *model.Medium) {
+	list = new(model.Medium)
+	sess := m.Db.Where("is_super_administrator=1 and medium_id=?", mediumId)
+	get, err := sess.Get(list)
+	if err != nil || get == false {
+		return nil
+	}
+	return list
+}

src/model/applet_application_ad_space_list.go

@@ -11,6 +11,7 @@ type AppletApplicationAdSpaceList struct {
 	AdId     string    `json:"ad_id" xorm:"not null default '' comment('广告位id') VARCHAR(255)"`
 	Kind     string    `json:"kind" xorm:"not null default 1 comment('广告位类型(1:banner 2:激励视频 3:插屏广告 4:视频广告 5:视频贴片广告)') TINYINT(1)"`
 	State    int       `json:"state" xorm:"not null default 0 comment('状态(0:待审核 1:审核通过 2:审核拒绝 3:封禁中)') TINYINT(1)"`
+	UseState int       `json:"use_state" xorm:"not null default 1 comment('广告位微信平台状态（1开通 2关闭）') TINYINT(1)"`
 	CreateAt time.Time `json:"create_at" xorm:"not null default 'CURRENT_TIMESTAMP' DATETIME"`
 	UpdateAt time.Time `json:"update_at" xorm:"not null default 'CURRENT_TIMESTAMP' DATETIME"`
 	MediumId int       `json:"medium_id" xorm:"not null comment('媒体id') default '0' INT(10)"`

src/super/dao/agent_bank_info_dao.go

@@ -4,7 +4,7 @@ import "code.fnuoos.com/zhimeng/model.git/src/super/model"
 
 type AgentBankInfoDao interface {
 	GetAgentBankInfoList(agentId int) (medium *model.AgentBankInfo, err error)
-	FindAgentBankInfoList(name, state string, page, limit int) (list []AgentBankInfoGroup, total int64, err error)
+	FindAgentBankInfoList(uuid, name, state string, page, limit int) (list []AgentBankInfoGroup, total int64, err error)
 }
 type AgentBankInfoGroup struct {
 	model.AgentList     `xorm:"extends"`

src/super/dao/agent_contact_info_dao.go

@@ -4,7 +4,7 @@ import "code.fnuoos.com/zhimeng/model.git/src/super/model"
 
 type AgentContactInfoDao interface {
 	GetAgentContactInfoList(agentId int) (medium *model.AgentContactInfo, err error)
-	FindAgentContactInfoList(name, state string, page, limit int) (list []AgentContactInfoGroup, total int64, err error)
+	FindAgentContactInfoList(uuid, name, state string, page, limit int) (list []AgentContactInfoGroup, total int64, err error)
 }
 type AgentContactInfoGroup struct {
 	model.AgentList        `xorm:"extends"`

src/super/dao/agent_list_dao.go

@@ -6,5 +6,5 @@ type AgentListDao interface {
 	GetAgentList(agentId int) (medium *model.AgentList, err error)
 	AgentListInsert(m *model.AgentList) (int64, error)
 	UpdateAgentList(m *model.AgentList, columns ...string) (int64, error)
-	FindAgentList(name, state string, page, limit int) (list []model.AgentList, total int64, err error)
+	FindAgentList(uuid, name, state string, minState, page, limit int) (list []model.AgentList, total int64, err error)
 }

src/super/dao/agent_with_medium_dao.go

@@ -0,0 +1,17 @@
+package dao
+
+import "code.fnuoos.com/zhimeng/model.git/src/super/model"
+
+type AgentWithMediumDao interface {
+	FindAgentWithMediumList(name, state string, agentId, mediumId, page, limit int) (list []AgentWithMediumGroup, total int64, err error)
+	GetAgentWithMediumByMediumIdAndAgentId(mediumId, agentId int) (medium *model.AgentWithMedium)
+}
+type AgentWithMediumGroup struct {
+	model.AgentWithMedium `xorm:"extends"`
+	model.MediumList      `xorm:"extends"`
+	model.AgentList       `xorm:"extends"`
+}
+
+func (AgentWithMediumGroup) TableName() string {
+	return "agent_with_medium"
+}

src/super/dao/medium_bank_info_dao.go

@@ -4,7 +4,7 @@ import "code.fnuoos.com/zhimeng/model.git/src/super/model"
 
 type MediumBankInfoDao interface {
 	GetMediumBankInfoList(MediumId int) (medium *model.MediumBankInfo, err error)
-	FindMediumBankInfoList(name, state string, page, limit int) (list []MediumBankInfoGroup, total int64, err error)
+	FindMediumBankInfoList(uuid, name, state string, page, limit int) (list []MediumBankInfoGroup, total int64, err error)
 }
 type MediumBankInfoGroup struct {
 	model.MediumList     `xorm:"extends"`

src/super/dao/medium_contact_info_dao.go

@@ -4,7 +4,7 @@ import "code.fnuoos.com/zhimeng/model.git/src/super/model"
 
 type MediumContactInfoDao interface {
 	GetMediumContactInfoList(MediumId int) (medium *model.MediumContactInfo, err error)
-	FindMediumContactInfoList(name, state string, page, limit int) (list []MediumContactInfoGroup, total int64, err error)
+	FindMediumContactInfoList(uuid, name, state string, page, limit int) (list []MediumContactInfoGroup, total int64, err error)
 }
 type MediumContactInfoGroup struct {
 	model.MediumList        `xorm:"extends"`

src/super/dao/medium_list_dao.go

@@ -6,5 +6,5 @@ type MediumListDao interface {
 	GetMediumList(mediumId int) (medium *model.MediumList, err error)
 	MediumListInsert(m *model.MediumList) (int64, error)
 	UpdateMediumList(m *model.MediumList, columns ...string) (int64, error)
-	FindMediumList(name, state string, page, limit int) (list []model.MediumList, total int64, err error)
+	FindMediumList(uuid, name, state string, minState, page, limit int) (list []model.MediumList, total int64, err error)
 }

src/super/implement/agent_bank_info_db.go

@@ -26,7 +26,7 @@ func (a AgentBankInfoDb) GetAgentBankInfoList(agentId int) (medium *model.AgentB
 	}
 	return medium, nil
 }
-func (a AgentBankInfoDb) FindAgentBankInfoList(name, state string, page, limit int) (list []dao.AgentBankInfoGroup, total int64, err error) {
+func (a AgentBankInfoDb) FindAgentBankInfoList(uuid, name, state string, page, limit int) (list []dao.AgentBankInfoGroup, total int64, err error) {
 	sess := a.Db.Where("agent_bank_info.state>0").Desc("agent_bank_info.id").Limit(limit, (page-1)*limit)
 	if name != "" {
 		sess.And("agent_list.company_name like ?", "%"+name+"%")
@@ -34,6 +34,9 @@ func (a AgentBankInfoDb) FindAgentBankInfoList(name, state string, page, limit i
 	if state != "" {
 		sess.And("agent_bank_info.state = ?", state)
 	}
+	if uuid != "" {
+		sess.And("agent_bank_info.uuid = ?", uuid)
+	}
 	sess.Join("LEFT", "agent_list", "agent_list.agent_id = agent_bank_info.agent_id")
 	total, err = sess.FindAndCount(&list)
 	if err != nil {

src/super/implement/agent_contact_info_db.go

@@ -26,7 +26,7 @@ func (a AgentContactInfoDb) GetAgentContactInfoList(agentId int) (medium *model.
 	}
 	return medium, nil
 }
-func (a AgentContactInfoDb) FindAgentContactInfoList(name, state string, page, limit int) (list []dao.AgentContactInfoGroup, total int64, err error) {
+func (a AgentContactInfoDb) FindAgentContactInfoList(uuid, name, state string, page, limit int) (list []dao.AgentContactInfoGroup, total int64, err error) {
 	sess := a.Db.Where("agent_contact_info.state>0").Desc("agent_contact_info.id").Limit(limit, (page-1)*limit)
 	if name != "" {
 		sess.And("agent_list.company_name like ?", "%"+name+"%")
@@ -34,6 +34,9 @@ func (a AgentContactInfoDb) FindAgentContactInfoList(name, state string, page, l
 	if state != "" {
 		sess.And("agent_contact_info.state = ?", state)
 	}
+	if uuid != "" {
+		sess.And("agent_contact_info.uuid = ?", uuid)
+	}
 	sess.Join("LEFT", "agent_list", "agent_list.agent_id = agent_contact_info.agent_id")
 	total, err = sess.FindAndCount(&list)
 	if err != nil {

src/super/implement/agent_list_implement.go

@@ -42,14 +42,20 @@ func (a AgentListDb) UpdateAgentList(m *model.AgentList, columns ...string) (int
 	}
 	return affected, nil
 }
-func (a AgentListDb) FindAgentList(name, state string, page, limit int) (list []model.AgentList, total int64, err error) {
-	sess := a.Db.Where("state>0").Desc("id").Limit(limit, (page-1)*limit)
+func (a AgentListDb) FindAgentList(uuid, name, state string, minState, page, limit int) (list []model.AgentList, total int64, err error) {
+	sess := a.Db.Desc("id").Limit(limit, (page-1)*limit)
 	if name != "" {
 		sess.And("company_name like ?", "%"+name+"%")
 	}
 	if state != "" {
 		sess.And("state = ?", state)
 	}
+	if uuid != "" {
+		sess.And("uuid = ?", uuid)
+	}
+	if minState > 0 {
+		sess.And("state >= ?", minState)
+	}
 	total, err = sess.FindAndCount(&list)
 	if err != nil {
 		return nil, 0, err

src/super/implement/agent_with_medium_db.go

@@ -0,0 +1,46 @@
+package implement
+
+import (
+	"code.fnuoos.com/zhimeng/model.git/src/super/dao"
+	"code.fnuoos.com/zhimeng/model.git/src/super/model"
+	"xorm.io/xorm"
+)
+
+func NewAgentWithMediumDb(engine *xorm.Engine) dao.AgentWithMediumDao {
+	return &AgentWithMediumDb{Db: engine}
+}
+
+type AgentWithMediumDb struct {
+	Db *xorm.Engine
+}
+
+func (a AgentWithMediumDb) GetAgentWithMediumByMediumIdAndAgentId(mediumId, agentId int) (medium *model.AgentWithMedium) {
+	medium = new(model.AgentWithMedium)
+	get, err := a.Db.Where("medium_id=? and agent_id=?", mediumId, agentId).Get(medium)
+	if get == false || err != nil {
+		return nil
+	}
+	return medium
+}
+func (a AgentWithMediumDb) FindAgentWithMediumList(name, state string, agentId, mediumId, page, limit int) (list []dao.AgentWithMediumGroup, total int64, err error) {
+	sess := a.Db.Desc("agent_with_medium.id").Limit(limit, (page-1)*limit)
+	if name != "" {
+		sess.And("medium_list.company_name like ?", "%"+name+"%")
+	}
+	if state != "" {
+		sess.And("medium_list.state = ?", state)
+	}
+	if agentId > 0 {
+		sess.And("agent_with_medium.agent_id = ?", agentId)
+	}
+	if mediumId > 0 {
+		sess.And("agent_with_medium.medium_id = ?", mediumId)
+	}
+	sess.Join("LEFT", "medium_list", "medium_list.medium_id = agent_with_medium.medium_id")
+	sess.Join("LEFT", "agent_list", "agent_list.agent_id = agent_with_medium.agent_id")
+	total, err = sess.FindAndCount(&list)
+	if err != nil {
+		return nil, 0, err
+	}
+	return
+}

src/super/implement/medium_bank_info_db.go

@@ -26,7 +26,7 @@ func (a MediumBankInfoDb) GetMediumBankInfoList(MediumId int) (medium *model.Med
 	}
 	return medium, nil
 }
-func (a MediumBankInfoDb) FindMediumBankInfoList(name, state string, page, limit int) (list []dao.MediumBankInfoGroup, total int64, err error) {
+func (a MediumBankInfoDb) FindMediumBankInfoList(uuid, name, state string, page, limit int) (list []dao.MediumBankInfoGroup, total int64, err error) {
 	sess := a.Db.Where("medium_bank_info.state>0").Desc("medium_bank_info.id").Limit(limit, (page-1)*limit)
 	if name != "" {
 		sess.And("medium_list.company_name like ?", "%"+name+"%")
@@ -34,6 +34,9 @@ func (a MediumBankInfoDb) FindMediumBankInfoList(name, state string, page, limit
 	if state != "" {
 		sess.And("medium_bank_info.state = ?", state)
 	}
+	if uuid != "" {
+		sess.And("medium_bank_info.uuid = ?", uuid)
+	}
 	sess.Join("LEFT", "medium_list", "medium_list.medium_id = medium_bank_info.medium_id")
 	total, err = sess.FindAndCount(&list)
 	if err != nil {

src/super/implement/medium_contact_info_db.go

@@ -26,7 +26,7 @@ func (a MediumContactInfoDb) GetMediumContactInfoList(MediumId int) (medium *mod
 	}
 	return medium, nil
 }
-func (a MediumContactInfoDb) FindMediumContactInfoList(name, state string, page, limit int) (list []dao.MediumContactInfoGroup, total int64, err error) {
+func (a MediumContactInfoDb) FindMediumContactInfoList(uuid, name, state string, page, limit int) (list []dao.MediumContactInfoGroup, total int64, err error) {
 	sess := a.Db.Where("medium_contact_info.state>0").Desc("medium_contact_info.id").Limit(limit, (page-1)*limit)
 	if name != "" {
 		sess.And("medium_list.company_name like ?", "%"+name+"%")
@@ -34,6 +34,9 @@ func (a MediumContactInfoDb) FindMediumContactInfoList(name, state string, page,
 	if state != "" {
 		sess.And("medium_contact_info.state = ?", state)
 	}
+	if uuid != "" {
+		sess.And("medium_contact_info.uuid = ?", uuid)
+	}
 	sess.Join("LEFT", "medium_list", "medium_list.medium_id = medium_contact_info.medium_id")
 	total, err = sess.FindAndCount(&list)
 	if err != nil {

src/super/implement/medium_list_implement.go

@@ -42,14 +42,20 @@ func (m MediumListDb) UpdateMediumList(medium *model.MediumList, columns ...stri
 	}
 	return affected, nil
 }
-func (m MediumListDb) FindMediumList(name, state string, page, limit int) (list []model.MediumList, total int64, err error) {
-	sess := m.Db.Where("state>0").Desc("id").Limit(limit, (page-1)*limit)
+func (m MediumListDb) FindMediumList(uuid, name, state string, minState, page, limit int) (list []model.MediumList, total int64, err error) {
+	sess := m.Db.Desc("id").Limit(limit, (page-1)*limit)
 	if name != "" {
 		sess.And("company_name like ?", "%"+name+"%")
 	}
 	if state != "" {
 		sess.And("state = ?", state)
 	}
+	if uuid != "" {
+		sess.And("uuid = ?", uuid)
+	}
+	if minState > 0 {
+		sess.And("state >= ?", minState)
+	}
 	total, err = sess.FindAndCount(&list)
 	if err != nil {
 		return nil, 0, err

src/super/model/agent_with_medium.go

@@ -0,0 +1,13 @@
+package model
+
+import (
+	"time"
+)
+
+type AgentWithMedium struct {
+	Id       int       `json:"id" xorm:"not null pk autoincr INT(11)"`
+	AgentId  int       `json:"agent_id" xorm:"not null default 0 comment('代理id') INT(11)"`
+	MediumId int       `json:"medium_id" xorm:"not null default 0 comment('媒体id') INT(11)"`
+	CreateAt time.Time `json:"create_at" xorm:"not null default CURRENT_TIMESTAMP DATETIME"`
+	UpdateAt time.Time `json:"update_at" xorm:"not null default CURRENT_TIMESTAMP DATETIME"`
+}