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

controllers/marketing_tool/activity_controller.go

 	beego.Router("/api/activity/submit", &ActivityAPIController{}, "post:ActivitySubmit")
 	beego.Router("/api/activity/detailview", &ActivityAPIController{}, "get:GetActivityDetailView")
 	beego.Router("/api/activity/signups", &ActivityAPIController{}, "get:SignupUsers")
+	beego.Router("/api/activity/delete", &ActivityAPIController{}, "post:DeleteActivity")
+	beego.Router("/api/activity/publish", &ActivityAPIController{}, "post:PublishActivity")
+	beego.Router("/api/activity/shareinfo", &ActivityAPIController{}, "get:GetActivityShareInfo")
 }
 
 type ActivityAPIController struct {
 		paragraphContent = paragraph.Text
 	}
 
+	currentOrg := adminUserInfo.Orgs[adminUserInfo.CurrentOrgId]
 	this.ServeSuccessJSON(map[string]interface{}{
 		"activity": activity,
 		"paragraph": map[string]interface{}{
 			"title":   paragraphTitle,
 			"content": paragraphContent,
 		},
+		"org": map[string]interface{}{
+			"logo": currentOrg.OrgLogo,
+			"name": currentOrg.OrgName,
+		},
 	})
 }
 
 		} else if activity == nil || activity.Status == 9 {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeActivityNotExist)
 			return
+		} else if activity.Status == 1 {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeActivityPublishedCannotModify)
+			return
 		}
 	}
 
-	if activity.Status == 1 {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeActivityPublishedCannotModify)
-		return
-	}
-
 	if len(activityForm.Title) == 0 || len(activityForm.Subtitle) == 0 || len(activityForm.PosterPhoto) == 0 || len(activityForm.Address) == 0 || len(activityForm.SignUpDeadline) == 0 || len(activityForm.StartTime) == 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 		"total": total,
 	})
 }
+
+// /api/activity/delete [post]
+// @param id:int
+func (this *ActivityAPIController) DeleteActivity() {
+	activityID, _ := this.GetInt64("id")
+	if activityID <= 0 {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	adminUserInfo := this.GetAdminUserInfo()
+	activity, getActivityErr := marketing_tool_service.GetActivityWithID(adminUserInfo.CurrentOrgId, activityID)
+	if getActivityErr != nil {
+		this.ErrorLog("获取活动失败：%v", getActivityErr)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	} else if activity == nil || activity.Status == 9 {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeActivityNotExist)
+		return
+	}
+
+	deleteErr := marketing_tool_service.DeleteActivity(adminUserInfo.CurrentOrgId, activityID)
+	if deleteErr != nil {
+		this.ErrorLog("删除活动失败：%v", deleteErr)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+
+	this.ServeSuccessJSON(nil)
+}
+
+// /api/activity/publish [post]
+// @param id:int
+func (this *ActivityAPIController) PublishActivity() {
+	activityID, _ := this.GetInt64("id")
+	if activityID <= 0 {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	adminUserInfo := this.GetAdminUserInfo()
+	activity, getActivityErr := marketing_tool_service.GetActivityWithID(adminUserInfo.CurrentOrgId, activityID)
+	if getActivityErr != nil {
+		this.ErrorLog("获取活动失败：%v", getActivityErr)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	} else if activity == nil || activity.Status == 9 {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeActivityNotExist)
+		return
+	}
+
+	if activity.Status == 1 {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeActivityPublishRepeat)
+		return
+	}
+
+	activity.Status = 1
+	activity.ModifyTime = time.Now().Unix()
+	updateErr := marketing_tool_service.SaveActivityAndParagraph(activity, nil)
+	if updateErr != nil {
+		this.ErrorLog("发布活动失败：%v", updateErr)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	this.ServeSuccessJSON(nil)
+}
+
+// /api/activity/shareinfo [get]
+// @param id:int
+func (this *ActivityAPIController) GetActivityShareInfo() {
+	activityID, _ := this.GetInt64("id")
+	if activityID <= 0 {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	adminUserInfo := this.GetAdminUserInfo()
+	activity, getActivityErr := marketing_tool_service.GetActivityWithID(adminUserInfo.CurrentOrgId, activityID)
+	if getActivityErr != nil {
+		this.ErrorLog("获取活动失败：%v", getActivityErr)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	} else if activity == nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeActivityNotExist)
+		return
+	}
+
+	wxShareModel, getWxShareErr := marketing_tool_service.GetActivityWxShareByActivityID(activity.Id)
+	if getWxShareErr != nil || wxShareModel == nil {
+		this.ErrorLog("获取活动微信分享信息失败:%v", getWxShareErr)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"url": wxShareModel.ShortURL,
+	})
+}

enums/error_code.go

 
 	ErrorCodeActivityNotExist              = 9100
 	ErrorCodeActivityPublishedCannotModify = 9101
+	ErrorCodeActivityPublishRepeat         = 9102
 
 	ErrorCodeGetQiniuUpToken = 1001
 
 
 	ErrorCodeActivityNotExist:              "活动不存在",
 	ErrorCodeActivityPublishedCannotModify: "已发布的活动不可更改",
+	ErrorCodeActivityPublishRepeat:         "该活动已发布",
 
 	ErrorCodeGetQiniuUpToken: "获取七牛uptoken失败",
 

service/marketing_tool_service/activity_service.go

 		return nil, 0, err
 	}
 }
+
+func DeleteActivity(orgID int64, activityID int64) error {
+	tx := service.PatientWriteDB().Begin()
+	deleteActivityErr := tx.Model(&models.Activity{}).Where("user_org_id = ? AND id = ?", orgID, activityID).Updates(map[string]interface{}{
+		"status": 9,
+		"mtime":  time.Now().Unix(),
+	}).Error
+	if deleteActivityErr != nil {
+		tx.Rollback()
+		return deleteActivityErr
+	}
+
+	// deletePErr := tx.Model(&models.ActivityParagraph{}).Where("activity_id = ?", activityID).Updates(map[string]interface{}{
+	// 	"status": 0,
+	// 	"mtime":  time.Now().Unix(),
+	// }).Error
+	// if deletePErr != nil {
+	// 	tx.Rollback()
+	// 	return deletePErr
+	// }
+
+	// deleteShareErr := tx.Model(&models.ActivityWxShare{}).Where("activity_id = ?", activityID).Updates(map[string]interface{}{
+	// 	"status": 0,
+	// 	"mtime":  time.Now().Unix(),
+	// }).Error
+	// if deleteShareErr != nil {
+	// 	tx.Rollback()
+	// 	return deleteShareErr
+	// }
+
+	tx.Commit()
+	return nil
+}