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

controllers/base_controller.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	service "SCRM/service/admin_service"
+	"SCRM/utils"
 
 	"github.com/astaxie/beego"
 )
@@ -21,20 +22,25 @@ func (this *BaseController) GetAdminUserInfo() *service.AdminUserInfo {
 
 func (this *BaseController) ErrorLog(format string, a ...interface{}) {
 	//beego.Error(fmt.Sprintf(format, a...))
+	utils.ErrorLog(format, a...)
 }
 
 func (this *BaseController) WarnLog(format string, a ...interface{}) {
 	//beego.Warn(fmt.Sprintf(format, a...))
+	utils.WarningLog(format, a...)
 }
 
 func (this *BaseController) InfoLog(format string, a ...interface{}) {
 	//beego.Info(fmt.Sprintf(format, a...))
+	utils.InfoLog(format, a...)
 }
 
 func (this *BaseController) DebugLog(format string, a ...interface{}) {
 	//beego.Debug(fmt.Sprintf(format, a...))
+	utils.InfoLog(format, a...)
 }
 
 func (this *BaseController) TraceLog(format string, a ...interface{}) {
 	//beego.Trace(fmt.Sprintf(format, a...))
+	utils.TraceLog(format, a...)
 }

controllers/marketing_tool/activity_controller.go

@@ -5,6 +5,8 @@ import (
 	"SCRM/enums"
 	"SCRM/models"
 	"SCRM/service/marketing_tool_service"
+	"SCRM/utils"
+	"encoding/json"
 	"time"
 
 	"github.com/astaxie/beego"
@@ -12,6 +14,8 @@ import (
 
 func ActivityCtlRegistRouters() {
 	beego.Router("/api/activities", &ActivityAPIController{}, "get:Activities")
+	beego.Router("/api/activity", &ActivityAPIController{}, "get:GetActivity")
+	beego.Router("/api/activity/submit", &ActivityAPIController{}, "post:ActivitySubmit")
 }
 
 type ActivityAPIController struct {
@@ -114,3 +118,214 @@ func (this *ActivityAPIController) _convertToUnapprovedActivityViewJSON(activity
 	json["start_time"] = activity.StartTime
 	return json
 }
+
+// /api/activity [get]
+// @param id:int
+func (this *ActivityAPIController) GetActivity() {
+	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
+	}
+
+	paragraph, getParagraphErr := marketing_tool_service.GetActivityParagraphByActivityID(activity.Id)
+	if getParagraphErr != nil {
+		this.ErrorLog("获取活动段落失败：%v", getParagraphErr)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+
+	paragraphTitle := ""
+	paragraphContent := ""
+	if paragraph != nil {
+		paragraphTitle = paragraph.Title
+		paragraphContent = paragraph.Text
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"activity": activity,
+		"paragraph": map[string]interface{}{
+			"title":   paragraphTitle,
+			"content": paragraphContent,
+		},
+	})
+}
+
+// /api/activity/submit [post]
+// @param publish:bool 是否发布
+// @data 如下格式
+/*
+{
+	id?:int
+	title:string
+	subtitle:string
+	poster_photo:string
+	address:string
+	limit_num?:int
+	sign_up_deadline:string ("yyyy-MM-dd HH:mm")
+	start_time:string ("yyyy-MM-dd HH:mm")
+	phone_number?:string
+	sign_up_notice?:string
+
+	paragraph: {
+		title:string
+		content:string
+	}
+}
+*/
+func (this *ActivityAPIController) ActivitySubmit() {
+	publish, _ := this.GetBool("publish")
+
+	var activityForm ActivityForm
+	parseErr := json.Unmarshal(this.Ctx.Input.RequestBody, &activityForm)
+	if parseErr != nil {
+		this.ErrorLog("解析 activity form 失败：%v", parseErr)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamFormatWrong)
+		return
+	}
+
+	adminUserInfo := this.GetAdminUserInfo()
+	var activity *models.Activity
+	if activityForm.ID > 0 {
+		var getActivityErr error
+		activity, getActivityErr = marketing_tool_service.GetActivityWithID(adminUserInfo.CurrentOrgId, activityForm.ID)
+		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 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
+	}
+	timeFmt := "2006-01-02 15:04"
+	signUpDeadlineTime, parseSUDErr := utils.ParseTimeStringToTime(timeFmt, activityForm.SignUpDeadline)
+	if parseSUDErr != nil {
+		this.ErrorLog("解析报名截止时间失败:%v", parseSUDErr)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamFormatWrong)
+		return
+	}
+	activityTime, parseActivityTimeErr := utils.ParseTimeStringToTime(timeFmt, activityForm.StartTime)
+	if parseActivityTimeErr != nil {
+		this.ErrorLog("解析活动开始时间失败:%v", parseActivityTimeErr)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamFormatWrong)
+		return
+	}
+
+	if len(activityForm.PhoneNumber) > 0 {
+		if utils.PhoneRegexp().MatchString(activityForm.PhoneNumber) == false {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamFormatWrong)
+			return
+		}
+	}
+	if activityForm.LimitNum < 0 {
+		activityForm.LimitNum = 0
+	}
+
+	if activity == nil {
+		activity = &models.Activity{
+			UserOrgId:        adminUserInfo.CurrentOrgId,
+			UserAppId:        adminUserInfo.CurrentAppId,
+			Title:            activityForm.Title,
+			Subtitle:         activityForm.Subtitle,
+			Address:          activityForm.Address,
+			SignUpDeadline:   signUpDeadlineTime.Unix(),
+			SignUpNotice:     activityForm.SignUpNotice,
+			StartTime:        activityTime.Unix(),
+			PosterPhoto:      activityForm.PosterPhoto,
+			PosterPhotoThumb: activityForm.PosterPhoto,
+			LimitNum:         activityForm.LimitNum,
+			PhoneNumber:      activityForm.PhoneNumber,
+			CreateTime:       time.Now().Unix(),
+		}
+	} else {
+		activity.Title = activityForm.Title
+		activity.Subtitle = activityForm.Subtitle
+		activity.Address = activityForm.Address
+		activity.SignUpDeadline = signUpDeadlineTime.Unix()
+		activity.SignUpNotice = activityForm.SignUpNotice
+		activity.StartTime = activityTime.Unix()
+		activity.PosterPhoto = activityForm.PosterPhoto
+		activity.PosterPhotoThumb = activityForm.PosterPhoto
+		activity.LimitNum = activityForm.LimitNum
+		activity.PhoneNumber = activityForm.PhoneNumber
+	}
+	activity.ModifyTime = time.Now().Unix()
+	if publish {
+		activity.Status = 1
+	} else {
+		activity.Status = 4
+	}
+
+	var paragraph *models.ActivityParagraph
+	if activity.Id > 0 {
+		var getPErr error
+		paragraph, getPErr = marketing_tool_service.GetActivityParagraphByActivityID(activity.Id)
+		if getPErr != nil {
+			this.ErrorLog("获取活动段落失败：%v", getPErr)
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+	}
+	if len(activityForm.Paragraph.Title) > 0 {
+		if paragraph == nil {
+			paragraph = &models.ActivityParagraph{
+				Title:      activityForm.Paragraph.Title,
+				Text:       activityForm.Paragraph.Content,
+				Status:     1,
+				CreateTime: time.Now().Unix(),
+				ModifyTime: time.Now().Unix(),
+			}
+		} else {
+			paragraph.Title = activityForm.Paragraph.Title
+			paragraph.Text = activityForm.Paragraph.Content
+			paragraph.ModifyTime = time.Now().Unix()
+		}
+	} else {
+		if paragraph != nil {
+			paragraph.Status = 0
+			paragraph.ModifyTime = time.Now().Unix()
+		}
+	}
+
+	saveErr := marketing_tool_service.SaveActivityAndParagraph(activity, paragraph)
+	if saveErr != nil {
+		this.ErrorLog("保存活动失败:%v", saveErr)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+
+	wxShareModel, getWxShareErr := marketing_tool_service.GetActivityWxShareByActivityID(activity.Id)
+	if getWxShareErr != nil {
+		this.ErrorLog("获取活动微信分享信息失败:%v", getWxShareErr)
+	} else if wxShareModel != nil {
+		wxShareModel.ModifyTime = time.Now().Unix()
+		wxShareModel.Status = 1
+		wxShareModel.Title = activity.Title
+		wxShareModel.Subtitle = activity.Subtitle
+		wxShareModel.Image = activity.PosterPhoto
+		saveWxShareErr := marketing_tool_service.SaveActivityWxShare(wxShareModel)
+		if saveWxShareErr != nil {
+			this.ErrorLog("更新活动微信分享信息失败:%v", saveWxShareErr)
+		}
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"activity_id": activity.Id,
+	})
+}

controllers/marketing_tool/activity_vms.go

@@ -0,0 +1,19 @@
+package marketing_tool
+
+type ActivityForm struct {
+	ID             int64  `json:"id"`
+	Title          string `json:"title"`
+	Subtitle       string `json:"subtitle"`
+	PosterPhoto    string `json:"poster_photo"`
+	Address        string `json:"address"`
+	LimitNum       int    `json:"limit_num"`
+	SignUpDeadline string `json:"sign_up_deadline"`
+	StartTime      string `json:"start_time"`
+	PhoneNumber    string `json:"phone_number"`
+	SignUpNotice   string `json:"sign_up_notice"`
+
+	Paragraph struct {
+		Title   string `json:"title"`
+		Content string `json:"content"`
+	} `json:"paragraph"`
+}

enums/error_code.go

@@ -44,63 +44,9 @@ const ( // ErrorCode
 	ErrorCodeCannotRemoveRole       = 9006
 	ErrorCodeRoleMobileIsSuperAdmin = 9007
 
-	ErrorCodeGetQiniuUpToken                = 1001
-	ErrorCodeCreatePatient                  = 1002
-	ErrorCodeDialysisNoExist                = 1003
-	ErrorCodeIdCardNoExist                  = 1004
-	ErrorCodePatientNoExist                 = 1005
-	ErrorCodeUpdatePatient                  = 1006
-	ErrorCodeDialysisSolutionExist          = 1007
-	ErrorCodeDialysisSolutionCreate         = 1008
-	ErrorCodeDialysisSolutionUpdate         = 1009
-	ErrorCodeDialysisSolutionNotExist       = 1010
-	ErrorCodeParentDialysisSolutionNotExist = 1011
-	ErrorCodeAlReadyHadChildSolution        = 1012
-	ErrorCodeCanntCreateChildChildSolution  = 1013
-	ErrorCodeDialysisSolutionUsed           = 1014
-	ErrorCodeCreateDryWeightFail            = 1015
-	ErrorCodeCreateDoctorAdviceFail         = 1016
-	ErrorCodeDoctorAdviceNotExist           = 1017
-	ErrorCodeUpdateDoctorAdviceFail         = 1018
-	ErrorCodeLongTimeAdviceNotCanntEdit     = 1019
-	ErrorCodeAdviceStoped                   = 1020
-	ErrorCodeParentAdviceNotExist           = 1021
-	ErrorCodeStopAdviceFail                 = 1022
-	ErrorCodeDeleteAdviceFail               = 1023
-	ErrorCodeDialysisSolutionDelete         = 1024
-	ErrorCodeDeviceNumberNotTheZone         = 1025
-	ErrorCodeCreateScheduleFail             = 1026
-	ErrorCodeCantSetScheduleAgainOneDay     = 1027
-	ErrorCodeCantSetScheduleBeforeNow       = 1028
-	ErrorCodeScheduleNotExist               = 1029
-	ErrorCodeDeleteScheduleFail             = 1030
-	ErrorCodeChangeScheduleFail             = 1031
-	ErrorCodePatientPhoneUsed               = 1032
-	ErrorCodeAdviceExced                    = 1033
-	ErrorCodeAdviceChecked                  = 1034
-	ErrorCodePointScheduleExist             = 1035
-	ErrorCodeExceAndCheckNotOneUser         = 1036
-	ErrorCodeCanotEditOtherAdvice           = 1037
-	ErrorCodeEditLapsetoFail                = 1038
-	ErrorCodeAdviceCheckBeforeExce          = 1039
-	ErrorCodeAdviceExceBeforeStart          = 1040
-	ErrorCodeDelScheduleFailByDialysis      = 1041
-	ErrorCodeNotSelectLapsetoType           = 1042
-	ErrorCodeNotSelectLapsetoTime           = 1043
+	ErrorCodeActivityNotExist = 9100
 
-	ErrorCodeInspectionDateExit    = 1201
-	ErrorCodeInspectionAddFail     = 1202
-	ErrorCodeInspectionEditFail    = 1204
-	ErrorCodeInspectionDateNotExit = 1203
-	ErrorCodeInspectionDeleteFail  = 1205
-
-	ErrorCodeMonitorCreate                  = 1128
-	ErrorCodeMonitorNotExist                = 1129
-	ErrorCodeMonitorUpdate                  = 1130
-	ErrorDialysisOrderNoStart               = 1132
-	ErrorDialysisOrderNoEND                 = 1133
-	ErrorDialysisOrderRepeatStart           = 1134
-	ErrorCodeDialysisPermissionDeniedModify = 1135
+	ErrorCodeGetQiniuUpToken = 1001
 
 	ErrorCodeNotSubscibe       = 4003
 	ErrorCodeServeNotExist     = 4004
@@ -109,50 +55,6 @@ const ( // ErrorCode
 	ErrorCodeHetongHad         = 4007
 	ErrorCodeCreateHetongFail  = 4008
 	ErrorCodePatientReachLimit = 4009
-
-	ErrorCodeDeviceZoneNotExist                      = 9021
-	ErrorCodeDeviceZoneNameRepeat                    = 9022
-	ErrorCodeDeviceGroupNotExist                     = 9023
-	ErrorCodeDeviceGroupNameRepeat                   = 9024
-	ErrorCodeDeviceNumberNotExist                    = 9025
-	ErrorCodeDeviceNumberRepeat                      = 9026
-	ErrorCodeDeviceNotExist                          = 9027
-	ErrorCodeDeviceZoneCannotDisable                 = 9028
-	ErrorCodeDeviceNumberCannotDisableCuzDevice      = 9029
-	ErrorCodeDeviceNumberCannotDisableCuzSchedule    = 9030
-	ErrorCodeDeviceNumberCannotDisableCuzSchTemplate = 9031
-
-	ErrorCommitFail = 90000
-
-	ErrorCodeCreateStockInFail = 20001
-
-	ErrorCodeScheduleTemplateNotExist = 10001
-
-	ErrorCodeSystemError  = 6666
-	ErrorCodeProductError = 6667
-	ErrorCodeFieldExist   = 100001
-	ErrorCodeCreateConfig = 100002
-	ErrorCodeUpdateConfig = 100003
-
-	ErrorCodeDoubleCheckWrong     = 200003
-	ErrorCodeDoubleCheckUserWrong = 200004
-	ErrorCodeGoodNoStockInError   = 200005
-	ErrorCodeCancelStockFail      = 200006
-	ErrorCodeDeleteGoodTypeFail   = 200007
-	ErrorCodeDeleteGoodInfoFail   = 200008
-	ErrorCodeDeleteFail           = 200009
-
-	ErrorCodeKeyFail                 = 200010
-	ErrorCodeDeleteStockInRecordFail = 200011
-	ErrorCodeNameWrong               = 200012
-
-	ErrorCodeParamEmptyWrong       = 200013
-	ErrorCodeParamAdviceEmptyWrong = 200014
-
-	ErrorCodeParamTemplateNOEXISTWrong = 200015
-
-	ErrorCodeDeleteDealerWrong       = 200016
-	ErrorCodeDeleteManufacturerWrong = 200017
 )
 
 var ErrCodeMsgs = map[int]string{
@@ -197,68 +99,9 @@ var ErrCodeMsgs = map[int]string{
 	ErrorCodeCannotRemoveRole:       "存在该角色的管理员，不能删除该角色",
 	ErrorCodeRoleMobileIsSuperAdmin: "该手机号已注册为超级管理员",
 
-	ErrorCodeGetQiniuUpToken: "获取七牛uptoken失败",
-	ErrorCodeCreatePatient:   "创建患者失败",
-	ErrorCodeDialysisNoExist: "患者透析号重复！",
-	ErrorCodeIdCardNoExist:   "身份证号重复！",
-	ErrorCodePatientNoExist:  "患者信息不存在！",
-	ErrorCodeUpdatePatient:   "修改患者信息失败",
-
-	ErrorCodeDialysisSolutionExist:          "该处方已经存在",
-	ErrorCodeDialysisSolutionCreate:         "创建处方失败",
-	ErrorCodeDialysisSolutionUpdate:         "修改处方失败",
-	ErrorCodeDialysisSolutionNotExist:       "该处方不存在",
-	ErrorCodeParentDialysisSolutionNotExist: "上级处方不存在",
-	ErrorCodeAlReadyHadChildSolution:        "所选处方已经存在子方案",
-	ErrorCodeCanntCreateChildChildSolution:  "子方案不能添加子方案",
-	ErrorCodeDialysisSolutionUsed:           "处方已被使用，不能删除",
-	ErrorCodeCreateDryWeightFail:            "添加干体重失败",
-	ErrorCodeCreateDoctorAdviceFail:         "添加医嘱失败",
-	ErrorCodeUpdateDoctorAdviceFail:         "修改医嘱信息失败",
-	ErrorCodeDoctorAdviceNotExist:           "医嘱不存在",
-	ErrorCodeLongTimeAdviceNotCanntEdit:     "长期医嘱不能修改！",
-	ErrorCodeAdviceStoped:                   "所选医嘱已停止",
-	ErrorCodeParentAdviceNotExist:           "上级医嘱不存在",
-	ErrorCodeDeleteAdviceFail:               "删除医嘱失败",
-	ErrorCodeStopAdviceFail:                 "停止医嘱失败",
-	ErrorCodeDialysisSolutionDelete:         "删除方案失败",
-	ErrorCodeDeviceNumberNotTheZone:         "所选机号不在选择分区中",
-	ErrorCodeCreateScheduleFail:             "添加排班失败",
-	ErrorCodeCantSetScheduleAgainOneDay:     "同一天不可有两次排班",
-	ErrorCodeCantSetScheduleBeforeNow:       "不能给今天之前的日期排班",
-	ErrorCodeScheduleNotExist:               "排班不存在",
-	ErrorCodePointScheduleExist:             "所先位置排班已经存在",
-	ErrorCodeDeleteScheduleFail:             "取消排班失败",
-	ErrorCodeChangeScheduleFail:             "修改排班失败",
-	ErrorCodePatientPhoneUsed:               "手机号已经存在",
-	ErrorCodeAdviceExced:                    "医嘱已经执行",
-	ErrorCodeAdviceCheckBeforeExce:          "核对医嘱不能在执行医嘱之前",
-	ErrorCodeAdviceExceBeforeStart:          "执行医嘱不能在开始之前",
-	ErrorCodeAdviceChecked:                  "医嘱已经核对",
-	ErrorCodeExceAndCheckNotOneUser:         "核对与执行不能是同一人",
-	ErrorCodeCanotEditOtherAdvice:           "不能修改非本人添加的医嘱",
-	ErrorCodeEditLapsetoFail:                "转归失败",
-	ErrorCodeDelScheduleFailByDialysis:      "已经上机透析，不能取消排班",
-	ErrorCodeNotSelectLapsetoType:           "请选择转归状态",
-	ErrorCodeNotSelectLapsetoTime:           "请选择转归时间",
-
-	ErrorCodeInspectionDateExit:    "当天已经存在检验检查记录",
-	ErrorCodeInspectionAddFail:     "添加记录失败",
-	ErrorCodeInspectionDateNotExit: "当天不存在检验检查记录",
-	ErrorCodeInspectionEditFail:    "修改记录失败",
-	ErrorCodeInspectionDeleteFail:  "删除记录失败",
+	ErrorCodeActivityNotExist: "活动不存在",
 
-	ErrorCodeDeviceZoneNotExist:                      "设备分区不存在",
-	ErrorCodeDeviceZoneNameRepeat:                    "该分区名已存在",
-	ErrorCodeDeviceGroupNotExist:                     "设备分组不存在",
-	ErrorCodeDeviceGroupNameRepeat:                   "该分组名已存在",
-	ErrorCodeDeviceNumberNotExist:                    "机号不存在",
-	ErrorCodeDeviceNumberRepeat:                      "该机号已存在",
-	ErrorCodeDeviceNotExist:                          "该设备不存在",
-	ErrorCodeDeviceZoneCannotDisable:                 "该分区存在床位号，不能删除",
-	ErrorCodeDeviceNumberCannotDisableCuzDevice:      "该床位存在设备，不能删除",
-	ErrorCodeDeviceNumberCannotDisableCuzSchedule:    "该床位尚有排班安排，不能删除",
-	ErrorCodeDeviceNumberCannotDisableCuzSchTemplate: "排班模板在该床位尚有排班安排，不能删除",
+	ErrorCodeGetQiniuUpToken: "获取七牛uptoken失败",
 
 	ErrorCodeNotSubscibe:       "没有订阅服务或服务已过期，请先购买服务！",
 	ErrorCodeServeNotExist:     "服务订单不存在！",
@@ -267,47 +110,6 @@ var ErrCodeMsgs = map[int]string{
 	ErrorCodeHetongHad:         "合同已经存在！",
 	ErrorCodeCreateHetongFail:  "合同创建失败",
 	ErrorCodePatientReachLimit: "患者数已达到当前服务版本病人数，需要升级到更高的版本",
-
-	ErrorCodeMonitorCreate:                  "创建监测失败",
-	ErrorCodeMonitorNotExist:                "监测记录不存在",
-	ErrorCodeMonitorUpdate:                  "修改监测失败",
-	ErrorCodeDialysisPermissionDeniedModify: "您没有权限修改其他医护的数据！",
-
-	ErrorDialysisOrderNoStart:     "尚未上机，无法执行下机操作",
-	ErrorDialysisOrderNoEND:       "已处于下机状态",
-	ErrorDialysisOrderRepeatStart: "已上机",
-	//ErrorCodeScheduleTemplateNotExist: "排班模板不存在",
-
-	ErrorCodeSystemError:              "系统异常",
-	ErrorCodeProductError:             "该服务商品已丢失",
-	ErrorCodeScheduleTemplateNotExist: "排班模板不存在",
-
-	ErrorCodeCreateStockInFail: "入库失败",
-	//ErrorCodeSystemError:  "系统异常",
-	//ErrorCodeProductError: "该服务商品已丢失",
-	ErrorCodeFieldExist:   "配置字段已存在",
-	ErrorCodeCreateConfig: "创建配置失败",
-	ErrorCodeUpdateConfig: "修改配置失败",
-
-	ErrorCommitFail:               "提交失败",
-	ErrorCodeDoubleCheckWrong:     "核对已完成, 无法再次提交",
-	ErrorCodeDoubleCheckUserWrong: "你已完成核对，不能重复核对",
-	ErrorCodeGoodNoStockInError:   "该商品尚未入库",
-
-	ErrorCodeCancelStockFail:    "出库退库失败",
-	ErrorCodeDeleteGoodTypeFail: "该类型存在商品信息,无法删除",
-	ErrorCodeDeleteGoodInfoFail: "该商品已经入库无法删除",
-
-	ErrorCodeDeleteFail: "删除失败",
-
-	ErrorCodeKeyFail:                 "关键字不能为空",
-	ErrorCodeDeleteStockInRecordFail: "该记录已经有出库或退货操作,无法删除",
-	ErrorCodeNameWrong:               "该模版名字已存在",
-	ErrorCodeParamEmptyWrong:         "模版名称不能为空",
-	ErrorCodeParamAdviceEmptyWrong:   "医嘱名称不能为空",
-
-	ErrorCodeDeleteDealerWrong:       "该经销商所属商品已入库无法删除",
-	ErrorCodeDeleteManufacturerWrong: "该厂商所属商品已入库无法删除",
 }
 
 type SGJError struct {

models/activity_models.go

@@ -2,7 +2,7 @@ package models
 
 // 表
 type Activity struct {
-	Id               int    `gorm:"column:id" json:"id"`                                 // 活动 ID
+	Id               int64  `gorm:"column:id" json:"id"`                                 // 活动 ID
 	Title            string `json:"title"`                                               // 活动标题
 	Subtitle         string `json:"subtitle"`                                            // 活动副标题
 	CityId           int    `gorm:"column:city_id" json:"city_id"`                       // 活动地点 ID
@@ -24,8 +24,8 @@ type Activity struct {
 	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
+	UserOrgId        int64  `gorm:"column:user_org_id" json:"-"`                         // 所属发布机构 ID
+	UserAppId        int64  `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"`                    // 阅读数
@@ -36,14 +36,14 @@ func (Activity) TableName() string {
 }
 
 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"` // 修改时间
+	Id         int64  `gorm:"PRIMARY_KEY;AUTO_INCREMENT" json:"id"`  // 记录 ID
+	ActivityId int64  `gorm:"column:activity_id" json:"activity_id"` // 活动 ID
+	Title      string `json:"title"`
+	Text       string `json:"text"`
+	// Image      string `json:"image"` // 该字段实际上已经没用了
+	Status     int8  `json:"-"`                     // 状态 0.无效 1.有效
+	CreateTime int64 `gorm:"column:ctime" json:"-"` // 创建时间
+	ModifyTime int64 `gorm:"column:mtime" json:"-"` // 修改时间
 }
 
 func (ActivityParagraph) TableName() string {

service/marketing_tool_service/activity_service.go

@@ -4,6 +4,8 @@ import (
 	"SCRM/models"
 	"SCRM/service"
 	"time"
+
+	"github.com/jinzhu/gorm"
 )
 
 func GetValidActivities(orgID int64, appID int64, keyWord string, page int, count int) ([]*models.Activity, int64, error) {
@@ -88,3 +90,77 @@ func GetDidEndedActivities(orgID int64, appID int64, keyWord string, page int, c
 		return nil, 0, err
 	}
 }
+
+func GetActivityWithID(orgID int64, activityID int64) (*models.Activity, error) {
+	var activity models.Activity
+	err := service.PatientReadDB().Model(&models.Activity{}).Where("user_org_id = ? and id = ?", orgID, activityID).First(&activity).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
+		} else {
+			return nil, err
+		}
+	}
+	return &activity, nil
+}
+
+func GetActivityParagraphByActivityID(activityID int64) (*models.ActivityParagraph, error) {
+	var paragraph models.ActivityParagraph
+	err :=
+		service.PatientReadDB().Model(&models.ActivityParagraph{}).
+			Where("activity_id = ? and status = 1", activityID).
+			First(&paragraph).
+			Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
+		} else {
+			return nil, err
+		}
+	}
+	return &paragraph, nil
+}
+
+func GetActivityWxShareByActivityID(activityID int64) (*models.ActivityWxShare, error) {
+	var model models.ActivityWxShare
+	err :=
+		service.PatientReadDB().Model(&models.ActivityWxShare{}).
+			Where("activity_id = ?", activityID).
+			First(&model).
+			Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
+		} else {
+			return nil, err
+		}
+	}
+	return &model, nil
+}
+
+func SaveActivityAndParagraph(activity *models.Activity, paragraph *models.ActivityParagraph) error {
+	tx := service.PatientWriteDB().Begin()
+	saveActivityErr := tx.Save(activity).Error
+	if saveActivityErr != nil {
+		tx.Rollback()
+		return saveActivityErr
+	}
+	if paragraph != nil {
+		if paragraph.Id == 0 {
+			paragraph.ActivityId = activity.Id
+		}
+
+		saveParagraphErr := tx.Save(paragraph).Error
+		if saveParagraphErr != nil {
+			tx.Rollback()
+			return saveParagraphErr
+		}
+	}
+
+	tx.Commit()
+	return nil
+}
+
+func SaveActivityWxShare(model *models.ActivityWxShare) error {
+	return service.PatientWriteDB().Save(model).Error
+}