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

controllers/article/article_controller.go

@@ -6,12 +6,14 @@ import (
 	"SCRM/controllers"
 	"SCRM/service/article_service"
 	"SCRM/enums"
+	"SCRM/models"
 )
 
 func ArticleRouters() {
 
 	beego.Router("/api/acticle/createacticle",&ArticleManage{},"Get:CreateArticle")
 	beego.Router("/api/acticle/getArticleType",&ArticleManage{},"Get:GetArticleType")
+	beego.Router("/api/acticle/getAllArticles",&ArticleManage{},"Get:GetAllArticles")
 }
 
 type ArticleManage struct {
@@ -20,8 +22,25 @@ type ArticleManage struct {
 }
 
 func (this *ArticleManage) CreateArticle(){
+	adminUserInfo := this.GetAdminUserInfo()
+	userOrgID := int64(adminUserInfo.CurrentOrgId)
 	actname := this.GetString("act_name")
-	fmt.Println("姓名:",actname)
+	actcontent := this.GetString("act_content")
+	orglogo := this.GetString("org_logo")
+	acttype, _ := this.GetInt64("act_type")
+	fmt.Println("姓名:",actname,"文章内容",actcontent,"图片",orglogo,"文章类型",acttype,userOrgID)
+	articles := models.Articles{
+				Title: actname,
+				Content: actcontent,
+				Imgs: orglogo,
+				ClassId: acttype,
+				UserOrgId:userOrgID,
+		}
+		err := article_service.AddAritcle(articles)
+		if err !=nil{
+			this.ServeFailJsonSend(enums.ErrorCodeDataException, "插入文章失败")
+			return
+		}
 }
 
 func (this *ArticleManage) GetArticleType(){
@@ -39,3 +58,32 @@ func (this *ArticleManage) GetArticleType(){
 	return
 }
 
+func (this *ArticleManage) GetAllArticles()  {
+	page, _ := this.GetInt("page", 1)
+	limit, _ := this.GetInt64("limit", 10)
+	searchKey := this.GetString("search", "")
+	classId,_ := this.GetInt64("classid",0)
+    fmt.Println("页面",page,"限制",limit,"关键字",searchKey,"分类号",classId)
+
+	if page <= 0 {
+		page = 1
+	}
+	if limit <= 0 {
+		limit = 10
+	}
+	adminUserInfo := this.GetAdminUserInfo()
+	userOrgID := adminUserInfo.CurrentOrgId
+
+	articles, total, err := article_service.FindAllArticle(userOrgID, page,10, searchKey, classId)
+	fmt.Println("文章内容是是么",articles)
+	if err !=nil{
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "获取文章列表失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"articles":articles,
+		"total":total,
+	})
+	return
+}
+

controllers/base_view_controller.go

@@ -1,9 +1,10 @@
 package controllers
-
 type BaseViewController struct {
 	BaseController
 }
 
+
+
 // 设置模板
 // 第一个参数模板，第二个参数为layout
 func (this *BaseViewController) SetTpl(template ...string) {

controllers/marketing_tool/activity_controller.go

@@ -2,6 +2,10 @@ package marketing_tool
 
 import (
 	"SCRM/controllers"
+	"SCRM/enums"
+	"SCRM/models"
+	"SCRM/service/marketing_tool_service"
+	"time"
 
 	"github.com/astaxie/beego"
 )
@@ -19,5 +23,94 @@ type ActivityAPIController struct {
 // @param keyword?:string
 // @param status?:int 1.已发布 2.待发布 3.未通过 4.已结束 其他取全部
 func (this *ActivityAPIController) Activities() {
+	page, _ := this.GetInt("page")
+	keyword := this.GetString("keyword")
+	status, _ := this.GetInt("status")
+	if page <= 0 {
+		page = 1
+	}
+	if status < 1 || status > 4 {
+		status = 0
+	}
 
+	adminUserInfo := this.GetAdminUserInfo()
+	var activities []*models.Activity
+	var totalCount int64
+	var getActivityErr error
+	if status == 1 {
+		activities, totalCount, getActivityErr = marketing_tool_service.GetActivitiesWithStatus(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, keyword, 1, page, 10)
+	} else if status == 2 {
+		activities, totalCount, getActivityErr = marketing_tool_service.GetActivitiesWithStatus(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, keyword, 4, page, 10)
+	} else if status == 3 {
+		activities, totalCount, getActivityErr = marketing_tool_service.GetActivitiesWithStatus(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, keyword, 3, page, 10)
+	} else if status == 4 {
+		activities, totalCount, getActivityErr = marketing_tool_service.GetDidEndedActivities(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, keyword, page, 10)
+	} else {
+		activities, totalCount, getActivityErr = marketing_tool_service.GetValidActivities(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, keyword, page, 10)
+	}
+
+	if getActivityErr != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+
+	activityJSONList := make([]map[string]interface{}, 0, len(activities))
+	for _, activity := range activities {
+		var json map[string]interface{}
+		// 活动状态 1:已发布 2:待审核 3:未通过 4:草稿 9:已删除
+		if activity.Status == 1 { // 已发布/已结束
+			json = this._convertToPublishedActivityViewJSON(activity)
+		} else if activity.Status == 3 { // 未通过
+			json = this._convertToUnapprovedActivityViewJSON(activity)
+		} else if activity.Status == 4 { // 草稿
+			json = this._convertToActivityDraftsViewJSON(activity)
+		}
+		activityJSONList = append(activityJSONList, json)
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"activities": activityJSONList,
+		"total":      totalCount,
+	})
+}
+
+func (this *ActivityAPIController) _convertToPublishedActivityViewJSON(activity *models.Activity) map[string]interface{} {
+	json := make(map[string]interface{})
+	now := time.Now().Unix()
+	if activity.StartTime < now {
+		json["status"] = 4
+	} else {
+		json["status"] = 1
+	}
+	json["id"] = activity.Id
+	json["poster_photo"] = activity.PosterPhoto
+	json["title"] = activity.Title
+	json["is_recommend"] = activity.IsRecommend
+	json["read_num"] = activity.ReadNum
+	json["comment_num"] = activity.CommentNum
+	json["star_num"] = activity.StarNum
+	json["join_num"] = activity.JoinNum
+	json["limit_num"] = activity.LimitNum
+	json["start_time"] = activity.StartTime
+	return json
+}
+
+func (this *ActivityAPIController) _convertToActivityDraftsViewJSON(activity *models.Activity) map[string]interface{} {
+	json := make(map[string]interface{})
+	json["status"] = 2
+	json["id"] = activity.Id
+	json["poster_photo"] = activity.PosterPhoto
+	json["title"] = activity.Title
+	return json
+}
+
+func (this *ActivityAPIController) _convertToUnapprovedActivityViewJSON(activity *models.Activity) map[string]interface{} {
+	json := make(map[string]interface{})
+	json["status"] = 3
+	json["id"] = activity.Id
+	json["poster_photo"] = activity.PosterPhoto
+	json["title"] = activity.Title
+	json["reason"] = activity.Reason
+	json["start_time"] = activity.StartTime
+	return json
 }

controllers/members/members_controller.go

@@ -8,7 +8,7 @@ import (
 	"SCRM/utils"
 	"reflect"
 	"time"
-
+    "fmt"
 	"encoding/json"
 
 	"github.com/astaxie/beego"
@@ -35,7 +35,7 @@ func (c *MembersAPIController) GetMembers() {
 	source, _ := c.GetInt64("source", 0)
 	tag, _ := c.GetInt64("tag", 0)
 	init, _ := c.GetInt64("init", 0)
-
+	fmt.Println("level",level,"source",source)
 	if page <= 0 {
 		page = 1
 	}

models/activity_models.go

@@ -2,36 +2,33 @@ 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"`     // 阅读数
+	Id               int    `gorm:"column:id" json:"id"`                                 // 活动 ID
+	Title            string `json:"title"`                                               // 活动标题
+	Subtitle         string `json:"subtitle"`                                            // 活动副标题
+	CityId           int    `gorm:"column:city_id" json:"city_id"`                       // 活动地点 ID
+	Address          string `json:"address"`                                             // 活动详细地址
+	Lng              string `gorm:"column:longitude" json:"lng"`                         // 活动位置的经度
+	Lat              string `gorm:"column:latitude" json:"lat"`                          // 活动位置的纬度
+	SignUpDeadline   int64  `gorm:"column:sign_up_deadline" json:"sign_up_deadline"`     // 报名截止时间戳
+	SignUpNotice     string `gorm:"column:sign_up_notice" json:"sign_up_notice"`         // 报名须知
+	StartTime        int64  `gorm:"column:start_time" json:"start_time"`                 // 活动开始时间戳
+	PosterPhoto      string `gorm:"column:poster_photo" json:"poster_photo"`             // 活动海报
+	PosterPhotoThumb string `gorm:"column:poster_photo_thumb" json:"poster_photo_thumb"` // 活动海报缩略图
+	LimitNum         int    `gorm:"column:limit_num;" json:"limit_num"`                  // 限制报名人数，0表示无限制
+	JoinNum          int    `gorm:"column:join_num" json:"join_num"`                     // 已报名人数
+	PhoneNumber      string `gorm:"column:phone_number" json:"phone_number"`             // 联系方式
+	Type             int8   `json:"type"`                                                // 活动形式
+	IsInsurance      int8   `gorm:"column:is_insurance;" json:"is_insurance"`            // 是否提供保险:报名不需要保险0:否;报名需要保险1:是;2不需要报名
+	Status           int    `json:"status"`                                              // 活动状态 1:已发布 2:待审核 3:未通过 4:草稿 9:已删除
+	Reason           string `json:"reason"`                                              // 审核原因
+	IsRecommend      int8   `gorm:"column:is_recommend;" json:"is_recommend"`            // 0:未推荐;1:已推荐
+	CreateTime       int64  `gorm:"column:ctime" json:"-"`                               // 创建时间
+	ModifyTime       int64  `gorm:"column:mtime" json:"-"`                               // 修改时间
+	UserOrgId        int    `gorm:"column:user_org_id" json:"-"`                         // 所属发布机构 ID
+	UserAppId        int    `gorm:"column:user_app_id" json:"-"`                         // 所属发布应用 ID
+	CommentNum       int    `gorm:"column:comment_num;" json:"comment_num"`              // 评论数
+	StarNum          int    `gorm:"column:star_num" json:"star_num"`                     // 点赞书
+	ReadNum          int    `gorm:"column:read_num;" json:"read_num"`                    // 阅读数
 }
 
 func (Activity) TableName() string {

models/article_models.go

@@ -18,3 +18,72 @@ type ArticleCategory struct{
 func (ArticleCategory) TableName() string  {
 	return "sgj_patient_articles_menu"
 }
+
+type Articles struct {
+	ID            int64     `gorm:"column:id" json:"id"`
+	Title         string    `gorm:"column:title" json:"title"`
+	Summary       string    `gorm:"column:summary" json:"summary"`
+	Content       string    `gorm:"column:content" json:"content"`
+	Type          int       `gorm:"column:type" json:"type"`
+	Num           int       `gorm:"column:num" json:"num"`
+	Mtime         int64     `gorm:"column:mtime" json:"mtime"`
+	Ctime         int64     `gorm:"column:ctime" json:"ctime"`
+	ClassId       int64     `gorm:"column:class_id" json:"class_id"`
+	Author        string    `gorm:"column:author" json:"author"`
+	Status        int       `gorm:"column:status" json:"status"`
+	Reason        string    `gorm:"column:reason" json:"reason"`
+	StarNum       int       `gorm:"column:star_num" json:"star_num"`
+	CommentNum    int       `gorm:"column:comment_num" json:"comment_num"`
+	UserOrgId     int64     `gorm:"column:user_org_id" json:"user_org_id"`
+	ArticleStatus int64     `gorm:"column:article_status" json:"article_status"`
+	Imgs          string    `gorm:"column:imgs" json:"imgs"`
+	VideoUrl      string    `gorm:"column:video_url" json:"video_url"`
+	Cover         string    `gorm:"-" json:"cover"`
+	PublicTime    string    `gorm:"-" json:"publicTime"`
+	Comments      []Comment `gorm:"ForeignKey:ArticleId"`
+	ArticleId	  int64		 `gorm:"-"`
+}
+
+func (Articles) TableName() string {
+	return "sgj_patient_articles"
+}
+
+type Comment struct {
+	ID                int64  `gorm:"column:id" json:"id"`
+	ArticleId         int64  `gorm:"column:article_id" json:"article_id"`
+	CommentUserId     int64  `gorm:"column:comment_user_id" json:"comment_user_id"`
+	ParentId          int64  `gorm:"column:parent_id" json:"parent_id"`
+	Content           string `gorm:"column:content" json:"content"`
+	Ctime             int64  `gorm:"column:ctime" json:"ctime"`
+	Mtime             int64  `gorm:"column:mtime" json:"mtime"`
+	Status            int64  `gorm:"column:status" json:"status"`
+	StarNum           int64  `gorm:"column:star_num" json:"star_num"`
+	CommentNum        int64  `gorm:"column:comment_num" json:"comment_num"`
+	CommentId         int64  `gorm:"column:comment_id" json:"comment_id"`
+	CommentUserName   string `gorm:"column:comment_user_name" json:"comment_user_name"`
+	CommentUserAvater string `gorm:"column:comment_user_avater" json:"comment_user_avater"`
+	CommentTime       string `gorm:"-" json:"commentTime"`
+	Article           Articles
+	Parent            Parents
+}
+
+type Parents struct {
+	ID                int64  `gorm:"-" json:"id"`
+	ArticleId         int64  `gorm:"-" json:"article_id"`
+	CommentUserId     int64  `gorm:"-" json:"comment_user_id"`
+	ParentId          int64  `gorm:"-" json:"parent_id"`
+	Content           string `gorm:"-" json:"content"`
+	Ctime             int64  `gorm:"-" json:"ctime"`
+	Mtime             int64  `gorm:"-" json:"mtime"`
+	Status            int64  `gorm:"-" json:"status"`
+	StarNum           int64  `gorm:"-" json:"star_num"`
+	CommentNum        int64  `gorm:"-" json:"comment_num"`
+	CommentId         int64  `gorm:"-" json:"comment_id"`
+	CommentUserName   string `gorm:"-" json:"comment_user_name"`
+	CommentUserAvater string `gorm:"-" json:"comment_user_avater"`
+	CommentTime       string `gorm:"-" json:"commentTime"`
+}
+
+func (Comment) TableName() string {
+	return "sgj_patient_articles_comment"
+}

service/article_service/article_category_service.go

@@ -5,8 +5,35 @@ import (
 	"SCRM/service"
 )
 
-func FindArticleCategoryType(userOrgId int64)(*[]models.ArticleCategory,error){
+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
 }
+
+func AddAritcle(articles models.Articles) error {
+	err := service.PatientWriteDB().Create(&articles).Error
+	return  err
+}
+
+func FindAllArticle(orgID int64, page int, count int, searchKey string, classId int64) (articles *[]models.Articles,total int64, err error) {
+
+	db := service.PatientReadDB().Table("sgj_patient_articles as a ").Where("a.status=1")
+	if(orgID>0){
+		db.Where("a.user_org_id = ?" ,orgID)
+	}
+
+	if(classId>0){
+	  db = db.Joins("JOIN sgj_patient_articles_menu as s ON s.id = a.class_id AND s.status=1 AND user_org_id = ?")
+	}
+
+	if len(searchKey) > 0 {
+		searchKey = "%" + searchKey + "%"
+		db = db.Where("a.title LIKE ?", searchKey)
+	}
+
+	//err = db.Select("a.id,a.title,a.summary,a.content,a.type,a.num,a.mtime,a.real_read_num,a.ctime,a.class_id,a.author,a.status,a.reason" +
+	//	"a.star_num,a.comment_num,a.user_org_id,a.article_status,a.imgs,a.video_url,a.source,a.category_id,a.ttid,a.ttype,a.toid").Count(&total).Find(&articles).Error
+
+		return
+}

service/marketing_tool_service/activity_service.go

@@ -0,0 +1,90 @@
+package marketing_tool_service
+
+import (
+	"SCRM/models"
+	"SCRM/service"
+	"time"
+)
+
+func GetValidActivities(orgID int64, appID int64, keyWord string, page int, count int) ([]*models.Activity, int64, error) {
+	if count <= 0 {
+		return []*models.Activity{}, 0, nil
+	}
+	if page < 1 {
+		page = 1
+	}
+
+	var activities []*models.Activity
+	var totalCount int64
+	db := service.PatientReadDB().Model(&models.Activity{}).Where("user_org_id = ? AND user_app_id = ? AND status <> 9", orgID, appID)
+	if len(keyWord) > 0 {
+		likeParam := "%" + keyWord + "%"
+		db = db.Where("title LIKE ?", likeParam)
+	}
+
+	err := db.
+		Count(&totalCount).
+		Order("ctime desc").Limit(count).Offset((page - 1) * count).Find(&activities).
+		Error
+
+	if err == nil {
+		return activities, totalCount, nil
+	} else {
+		return nil, 0, err
+	}
+}
+
+func GetActivitiesWithStatus(orgID int64, appID int64, keyWord string, status int, page int, count int) ([]*models.Activity, int64, error) {
+	if count <= 0 {
+		return []*models.Activity{}, 0, nil
+	}
+	if page < 1 {
+		page = 1
+	}
+
+	var activities []*models.Activity
+	var totalCount int64
+	db := service.PatientReadDB().Model(&models.Activity{}).Where("user_org_id = ? AND user_app_id = ? AND status = ?", orgID, appID, status)
+	if len(keyWord) > 0 {
+		likeParam := "%" + keyWord + "%"
+		db = db.Where("title LIKE ?", likeParam)
+	}
+	err := db.
+		Count(&totalCount).
+		Order("ctime desc").Limit(count).Offset((page - 1) * count).Find(&activities).
+		Error
+
+	if err == nil {
+		return activities, totalCount, nil
+	} else {
+		return nil, 0, err
+	}
+}
+
+func GetDidEndedActivities(orgID int64, appID int64, keyWord string, page int, count int) ([]*models.Activity, int64, error) {
+	if count <= 0 {
+		return []*models.Activity{}, 0, nil
+	}
+	if page < 1 {
+		page = 1
+	}
+
+	var activities []*models.Activity
+	var totalCount int64
+	now := time.Now().Unix()
+	db := service.PatientReadDB().Model(&models.Activity{}).Where("user_org_id = ? AND user_app_id = ? AND status = 1 AND start_time < ?", orgID, appID, now)
+	if len(keyWord) > 0 {
+		likeParam := "%" + keyWord + "%"
+		db = db.Where("title LIKE ?", likeParam)
+	}
+	err := db.
+		Count(&totalCount).
+		Order("ctime desc").Limit(count).Offset((page - 1) * count).Find(&activities).
+		Error
+
+	if err == nil {
+		return activities, totalCount, nil
+	} else {
+		return nil, 0, err
+	}
+}