Merge branch 'master' of http://git.shengws.com/zhangbj/scrm-go

controllers/article/article_controller.go

@@ -0,0 +1,41 @@
+package article
+
+import (
+	"github.com/astaxie/beego"
+	"fmt"
+	"SCRM/controllers"
+	"SCRM/service/article_service"
+	"SCRM/enums"
+)
+
+func ArticleRouters() {
+
+	beego.Router("/api/acticle/createacticle",&ArticleManage{},"Get:CreateArticle")
+	beego.Router("/api/acticle/getArticleType",&ArticleManage{},"Get:GetArticleType")
+}
+
+type ArticleManage struct {
+
+	controllers.BaseAuthAPIController
+}
+
+func (this *ArticleManage) CreateArticle(){
+	actname := this.GetString("act_name")
+	fmt.Println("姓名:",actname)
+}
+
+func (this *ArticleManage) GetArticleType(){
+	adminUserInfo := this.GetAdminUserInfo()
+	userOrgID := adminUserInfo.CurrentOrgId
+	category, err := article_service.FindArticleCategoryType(userOrgID)
+	fmt.Println("文章分类列表",category,err)
+	if err !=nil{
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "获取文章分类列表失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"category":category,
+	})
+	return
+}
+

controllers/article/router_collector.go

@@ -0,0 +1,5 @@
+package article
+
+func RegisterRouters() {
+	ArticleRouters()
+}

controllers/base_api_controller.go

@@ -51,6 +51,31 @@ type BaseAuthAPIController struct {
 func (this *BaseAuthAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
+		// var userAdmin models.AdminUser
+		// userAdmin.Id = 380
+		// userAdmin.Mobile = "13532250447"
+		// userAdmin.IsSuperAdmin = true
+		// userAdmin.Status = 1
+		// userAdmin.CreateTime = 1530786071
+		// userAdmin.ModifyTime = 1530786071
+		// var subscibe models.ServeSubscibe
+		// subscibe.ID = 1
+		// subscibe.OrgId = 4
+		// subscibe.PeriodStart = 1538035409
+		// subscibe.PeriodEnd = 1569571409
+		// subscibe.State = 1
+		// subscibe.Status = 1
+		// subscibe.CreatedTime = 1538035409
+		// subscibe.UpdatedTime = 1538035409
+		// subscibes := make(map[int64]*models.ServeSubscibe, 0)
+		// subscibes[4] = &subscibe
+		// var adminUserInfo admin_service.AdminUserInfo
+		// adminUserInfo.CurrentOrgId = 4
+		// adminUserInfo.CurrentAppId = 5
+		// adminUserInfo.AdminUser = &userAdmin
+		// adminUserInfo.Subscibes = subscibes
+		// this.SetSession("admin_user_info", &adminUserInfo)
+
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
 		this.StopRun()
 	}

controllers/marketing_tool/activity_controller.go

@@ -0,0 +1,23 @@
+package marketing_tool
+
+import (
+	"SCRM/controllers"
+
+	"github.com/astaxie/beego"
+)
+
+func ActivityCtlRegistRouters() {
+	beego.Router("/api/activities", &ActivityAPIController{}, "get:Activities")
+}
+
+type ActivityAPIController struct {
+	controllers.BaseAuthAPIController
+}
+
+// /api/activities [get]
+// @param page?:int
+// @param keyword?:string
+// @param status?:int 1.已发布 2.待发布 3.未通过 4.已结束 其他取全部
+func (this *ActivityAPIController) Activities() {
+
+}

controllers/marketing_tool/router_collector.go

@@ -0,0 +1,5 @@
+package marketing_tool
+
+func RegisterRouters() {
+	ActivityCtlRegistRouters()
+}

controllers/短信模块临时备注

@@ -0,0 +1,2 @@
+修改个人信息
+权限管理中添加管理员

models/activity_models.go

@@ -0,0 +1,88 @@
+package models
+
+// 表
+type Activity struct {
+	Id       int    `gorm:"PRIMARY_KEY;AUTO_INCREMENT"` // 活动 ID
+	Title    string // 活动标题
+	Subtitle string // 活动副标题
+	CityId   int    `gorm:"column:city_id"` // 活动地点 ID
+	Address  string // 活动详细地址
+	Lng      string `gorm:"column:longitude"` // 活动位置的经度
+	Lat      string `gorm:"column:latitude"`  // 活动位置的纬度
+	// SignUpStart int64  `gorm:"column:sign_up_start"` // 报名开始时间戳
+	SignUpDeadline int64  `gorm:"column:sign_up_deadline"` // 报名截止时间戳
+	SignUpNotice   string `gorm:"column:sign_up_notice"`   // 报名须知
+	StartTime      int64  `gorm:"column:start_time"`       // 活动开始时间戳
+	// EndTime          int64  `gorm:"column:end_time"`            // 活动结束时间戳
+	PosterPhoto      string `gorm:"column:poster_photo"`        // 活动海报
+	PosterPhotoThumb string `gorm:"column:poster_photo_thumb"`  // 活动海报缩略图
+	LimitNum         int    `gorm:"column:limit_num;default:0"` // 限制报名人数，0表示无限制
+	JoinNum          int    `gorm:"column:join_num"`            // 已报名人数
+	PhoneNumber      string `gorm:"column:phone_number"`        // 联系方式
+	Type             int8   // 活动形式
+	// Content		string	// 活动内容
+	IsInsurance int8   `gorm:"column:is_insurance;default:0"` // 是否提供保险:报名不需要保险0:否;报名需要保险1:是;2不需要报名
+	Status      int    // 活动状态 1:已发布 2:待审核 3:未通过 4:草稿 9:已删除
+	Reason      string // 审核原因
+	IsRecommend int8   `gorm:"column:is_recommend;default:0"` // 0:未推荐;1:已推荐
+	CreateTime  int64  `gorm:"column:ctime"`                  // 创建时间
+	ModifyTime  int64  `gorm:"column:mtime"`                  // 修改时间
+	UserOrgId   int    `gorm:"column:user_org_id"`            // 所属发布机构 ID
+	UserAppId   int    `gorm:"column:user_app_id"`            // 所属发布应用 ID
+	CommentNum  int    `gorm:"column:comment_num;default:0"`  // 评论数
+	StarNum     int    `gorm:"column:star_num;default:0"`     // 点赞书
+	ReadNum     int    `gorm:"column:read_num;default:0"`     // 阅读数
+}
+
+func (Activity) TableName() string {
+	return "sgj_patient_activity"
+}
+
+type ActivityParagraph struct {
+	Id         int `gorm:"PRIMARY_KEY;AUTO_INCREMENT"` // 记录 ID
+	ActivityId int `gorm:"column:activity_id"`         // 活动 ID
+	Title      string
+	Text       string
+	Image      string
+	Status     int8  // 状态 0.无效 1.有效
+	CreateTime int64 `gorm:"column:ctime"` // 创建时间
+	ModifyTime int64 `gorm:"column:mtime"` // 修改时间
+}
+
+func (ActivityParagraph) TableName() string {
+	return "sgj_patient_activity_paragraph"
+}
+
+type ActivityUser struct {
+	Id          int    `gorm:"PRIMARY_KEY;AUTO_INCREMENT"` // 记录 ID
+	ActivityId  int    `gorm:"column:activity_id"`         // 活动 ID
+	UserId      int    `gorm:"column:user_id"`             // 参与者 ID
+	IDCardNo    string `gorm:"column:idcard_no"`           // 身份证号
+	Mobile      string
+	Realname    string
+	Avatar      string
+	AvatarThumb string
+	Status      int8  // 状态 0.无效 1.有效
+	CreateTime  int64 `gorm:"column:ctime"` // 报名时间
+	ModifyTime  int64 `gorm:"column:mtime"` // 修改时间
+}
+
+func (ActivityUser) TableName() string {
+	return "sgj_patient_activity_user"
+}
+
+type ActivityWxShare struct {
+	Id         int `gorm:"PRIMARY_KEY;AUTO_INCREMENT"` // 记录 ID
+	ActivityId int `gorm:"column:activity_id"`         // 活动 ID
+	Title      string
+	Subtitle   string
+	Image      string
+	Status     int8   // 状态 0.无效 1.有效
+	CreateTime int64  `gorm:"column:ctime"`     // 创建时间
+	ModifyTime int64  `gorm:"column:mtime"`     // 修改时间
+	ShortURL   string `gorm:"column:short_url"` // 短链接
+}
+
+func (ActivityWxShare) TableName() string {
+	return "sgj_patient_activity_wx_share"
+}

models/article_models.go

@@ -0,0 +1,20 @@
+package models
+
+type ArticleCategory struct{
+	//对应数据库中的字段
+	MenuId    int64  `gorm:"column:id" `
+	Name      string `gorm:"column:name" `
+	Order     int64  `gorm:"column:order" `
+	Status    int64  `gorm:"column:status" `
+	Summary   string `gorm:"column:summary" `
+	Type      int64  `gorm:"column:type"`
+	Mtime     int64  `gorm:"column:mtime"`
+	Ctime     int64  `gorm:"column:ctime"`
+	UserOrgId int64  `gorm:"column:user_org_id"`
+	Num       int64  `gorm:"column:num" json:"num"`
+
+}
+
+func (ArticleCategory) TableName() string  {
+	return "sgj_patient_articles_menu"
+}

routers/router.go

@@ -2,8 +2,10 @@ package routers
 
 import (
 	"SCRM/controllers/admin_user"
+	"SCRM/controllers/article"
 	"SCRM/controllers/global"
 	"SCRM/controllers/login"
+	"SCRM/controllers/marketing_tool"
 	"SCRM/controllers/members"
 	"SCRM/controllers/role"
 
@@ -25,4 +27,6 @@ func init() {
 	login.RegisterRouters()
 	role.RegisterRouters()
 	members.RegisterRouters()
+	marketing_tool.RegisterRouters()
+	article.RegisterRouters()
 }

service/article_service/article_category_service.go

@@ -0,0 +1,12 @@
+package article_service
+
+import (
+	"SCRM/models"
+	"SCRM/service"
+)
+
+func FindArticleCategoryType(userOrgId int64)(*[]models.ArticleCategory,error){
+   cartegory :=	&[]models.ArticleCategory{}
+	err := service.PatientReadDB().Where("status = ? AND user_org_id = ? ", 1, userOrgId).Find(cartegory).Error
+	return  cartegory,err
+}