Browse Source

弘则自用加上试用平台商户号

hsun 1 năm trước cách đây
mục cha
commit
5e8de455c5

+ 1 - 1
controllers/classify.go

@@ -899,7 +899,7 @@ func (this *ClassifyController) TelListClassify() {
 	resp := make([]*models.SimpleClassifyList, 0)
 	var condition, orderRule string
 	var pars []interface{}
-	if utils.BusinessCode == utils.BusinessCodeRelease {
+	if utils.BusinessCode == utils.BusinessCodeRelease || utils.BusinessCode == utils.BusinessCodeSandbox {
 		condition += ` AND classify_name <> '晨报' AND classify_name <> '周报' `
 	}
 	telList, e := models.GetClassifyByCondition(condition, orderRule, pars)

+ 2 - 2
controllers/company_permission.go

@@ -34,7 +34,7 @@ func (this *CompanyPermissionController) List() {
 	}
 	// 非自用无需查询
 	resp := new(company.PermissionSetResp)
-	if utils.BusinessCode != utils.BusinessCodeRelease {
+	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox {
 		br.Ret = 200
 		br.Success = true
 		br.Msg = "获取成功"
@@ -101,7 +101,7 @@ func (this *CompanyPermissionController) PermissionVariety() {
 		br.Ret = 408
 		return
 	}
-	if utils.BusinessCode != utils.BusinessCodeRelease {
+	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox {
 		br.Ret = 200
 		br.Success = true
 		br.Msg = "获取成功"

+ 18 - 18
controllers/report.go

@@ -489,7 +489,7 @@ func (this *ReportController) Add() {
 	}
 
 	//处理权限
-	if utils.BusinessCode == utils.BusinessCodeRelease {
+	if utils.BusinessCode == utils.BusinessCodeRelease || utils.BusinessCode == utils.BusinessCodeSandbox {
 		go func() {
 			permissionItems, e := models.GetPermission(req.ClassifyNameSecond)
 			if e != nil {
@@ -614,7 +614,7 @@ func (this *ReportController) Edit() {
 	}
 
 	//处理权限
-	if utils.BusinessCode == utils.BusinessCodeRelease {
+	if utils.BusinessCode == utils.BusinessCodeRelease || utils.BusinessCode == utils.BusinessCodeSandbox {
 		go func() {
 			e := models.RemoveChartPermissionChapterMapping(req.ReportId)
 			if e != nil {
@@ -884,7 +884,7 @@ func (this *ReportController) SendTemplateMsg() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
-	if utils.BusinessCode != utils.BusinessCodeRelease {
+	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox {
 		br.Ret = 200
 		br.Success = true
 		br.Msg = "操作成功"
@@ -1436,7 +1436,7 @@ func (this *ReportController) GetDayWeekReportChapterTypeList() {
 		br.Ret = 408
 		return
 	}
-	if utils.BusinessCode != utils.BusinessCodeRelease {
+	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox {
 		br.Ret = 200
 		br.Success = true
 		br.Msg = "操作成功"
@@ -1546,7 +1546,7 @@ func (this *ReportController) GetDayWeekReportPauseTime() {
 		br.Ret = 408
 		return
 	}
-	if utils.BusinessCode != utils.BusinessCodeRelease {
+	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox {
 		br.Ret = 200
 		br.Success = true
 		br.Msg = "操作成功"
@@ -1586,7 +1586,7 @@ func (this *ReportController) SetDayWeekReportUpdateRule() {
 		br.Ret = 408
 		return
 	}
-	if utils.BusinessCode != utils.BusinessCodeRelease {
+	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox {
 		br.Ret = 200
 		br.Success = true
 		br.Msg = "操作成功"
@@ -1639,7 +1639,7 @@ func (this *ReportController) SetDayWeekReportEnableRule() {
 		br.Ret = 408
 		return
 	}
-	if utils.BusinessCode != utils.BusinessCodeRelease {
+	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox {
 		br.Ret = 200
 		br.Success = true
 		br.Msg = "操作成功"
@@ -1693,7 +1693,7 @@ func (this *ReportController) AddDayWeekReport() {
 		br.Ret = 408
 		return
 	}
-	if utils.BusinessCode != utils.BusinessCodeRelease {
+	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox {
 		br.Ret = 200
 		br.Success = true
 		br.Msg = "操作成功"
@@ -1897,7 +1897,7 @@ func (this *ReportController) EditDayWeekReport() {
 		br.Ret = 408
 		return
 	}
-	if utils.BusinessCode != utils.BusinessCodeRelease {
+	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox {
 		br.Ret = 200
 		br.Success = true
 		br.Msg = "操作成功"
@@ -1974,7 +1974,7 @@ func (this *ReportController) GetReportChapterList() {
 		br.Ret = 408
 		return
 	}
-	if utils.BusinessCode != utils.BusinessCodeRelease {
+	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox {
 		br.Ret = 200
 		br.Success = true
 		br.Msg = "操作成功"
@@ -2098,7 +2098,7 @@ func (this *ReportController) GetLastDayWeekReportChapter() {
 		br.Ret = 408
 		return
 	}
-	if utils.BusinessCode != utils.BusinessCodeRelease {
+	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox {
 		br.Ret = 200
 		br.Success = true
 		br.Msg = "操作成功"
@@ -2414,7 +2414,7 @@ func (this *ReportController) GetDayReportTickerList() {
 		br.Ret = 408
 		return
 	}
-	if utils.BusinessCode != utils.BusinessCodeRelease {
+	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox {
 		br.Ret = 200
 		br.Success = true
 		br.Msg = "操作成功"
@@ -2521,7 +2521,7 @@ func (this *ReportController) IsLastDayWeekReportChapter() {
 		br.Ret = 408
 		return
 	}
-	if utils.BusinessCode != utils.BusinessCodeRelease {
+	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox {
 		br.Ret = 200
 		br.Success = true
 		br.Msg = "操作成功"
@@ -2584,7 +2584,7 @@ func (this *ReportController) PublishDayWeekReportChapter() {
 		br.Ret = 408
 		return
 	}
-	if utils.BusinessCode != utils.BusinessCodeRelease {
+	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox {
 		br.Ret = 200
 		br.Success = true
 		br.Msg = "操作成功"
@@ -2779,7 +2779,7 @@ func (this *ReportController) PublishDayWeekReport() {
 		br.Ret = 408
 		return
 	}
-	if utils.BusinessCode != utils.BusinessCodeRelease {
+	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox {
 		br.Ret = 200
 		br.Success = true
 		br.Msg = "操作成功"
@@ -2844,7 +2844,7 @@ func (this *ReportController) GetSunCode() {
 		br.Ret = 408
 		return
 	}
-	if utils.BusinessCode != utils.BusinessCodeRelease {
+	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox {
 		br.Ret = 200
 		br.Success = true
 		br.Msg = "操作成功"
@@ -2904,7 +2904,7 @@ func (this *ReportController) GetStopDayWeekReportChapterTypeList() {
 		br.Ret = 408
 		return
 	}
-	if utils.BusinessCode != utils.BusinessCodeRelease {
+	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox {
 		br.Ret = 200
 		br.Success = true
 		br.Msg = "获取成功"
@@ -3025,7 +3025,7 @@ func (this *ReportController) SendMsg() {
 		br.ErrMsg = "参数解析失败,Err:" + err.Error()
 		return
 	}
-	if utils.BusinessCode != utils.BusinessCodeRelease {
+	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox {
 		br.Ret = 200
 		br.Success = true
 		br.Msg = "操作成功"

+ 2 - 2
controllers/report_chapter_type.go

@@ -371,7 +371,7 @@ func (this *ReportChapterTypeController) AuthSetting() {
 		return
 	}
 	// 非自用直接返回
-	if utils.BusinessCode != utils.BusinessCodeRelease {
+	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox {
 		br.Ret = 200
 		br.Success = true
 		br.Msg = "操作成功"
@@ -464,7 +464,7 @@ func (this *ReportChapterTypeController) PermissionList() {
 		br.Ret = 408
 		return
 	}
-	if utils.BusinessCode != utils.BusinessCodeRelease {
+	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox {
 		br.Ret = 200
 		br.Success = true
 		br.Msg = "操作成功"

+ 2 - 2
controllers/research_group.go

@@ -21,7 +21,7 @@ func (this *ResearchGroupController) GetResearchGroupList() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
-	if utils.BusinessCode != utils.BusinessCodeRelease {
+	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox {
 		br.Ret = 200
 		br.Success = true
 		br.Msg = "操作成功"
@@ -58,7 +58,7 @@ func (this *ResearchGroupController) GetAdminResearchGroup() {
 		br.Msg = "参数有误"
 		return
 	}
-	if utils.BusinessCode != utils.BusinessCodeRelease {
+	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox {
 		br.Ret = 200
 		br.Success = true
 		br.Msg = "获取成功"

+ 1 - 1
controllers/sys_admin.go

@@ -267,7 +267,7 @@ func (this *SysAdminController) ListSysuser() {
 		}
 	}
 	// 研究方向分组
-	if len(adminIdArr) > 0 && utils.BusinessCode == utils.BusinessCodeRelease {
+	if len(adminIdArr) > 0 && (utils.BusinessCode == utils.BusinessCodeRelease || utils.BusinessCode == utils.BusinessCodeSandbox) {
 		//adminIds := strings.Join(adminIdArr, ",")
 		//researchGroupList, e := system.GetAdminResearchGroupListByAdminId(adminIds)
 		researchGroupList, e := models.GetAdminVarietyTagRelationListByAdminId(adminIdArr)

+ 1 - 1
controllers/variety_tag.go

@@ -24,7 +24,7 @@ func (this *VarietyTagController) TagTree() {
 	}()
 	// 非自用不请求
 	resp := make([]*services.TagTreeItem, 0)
-	if utils.BusinessCode != utils.BusinessCodeRelease {
+	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox {
 		br.Ret = 200
 		br.Success = true
 		br.Msg = "获取成功"

+ 1 - 1
models/db.go

@@ -55,7 +55,7 @@ func init() {
 	gl.SetConnMaxLifetime(10 * time.Minute)
 
 	// 用户主库
-	if utils.MYSQL_WEEKLY_URL != `` && utils.BusinessCode == utils.BusinessCodeRelease {
+	if utils.MYSQL_WEEKLY_URL != `` && (utils.BusinessCode == utils.BusinessCodeRelease || utils.BusinessCode == utils.BusinessCodeSandbox) {
 		_ = orm.RegisterDataBase("weekly", "mysql", utils.MYSQL_WEEKLY_URL)
 		orm.SetMaxIdleConns("weekly", 50)
 		orm.SetMaxOpenConns("weekly", 100)

+ 1 - 1
services/report.go

@@ -405,7 +405,7 @@ func UpdateReportEs(reportId int, publishState int) (err error) {
 			}
 		}
 	} else {
-		if utils.BusinessCode == utils.BusinessCodeRelease {
+		if utils.BusinessCode == utils.BusinessCodeRelease || utils.BusinessCode == utils.BusinessCodeSandbox {
 			permissionList, tmpErr := models.GetChartPermissionNameFromMappingByKeyword(reportInfo.ClassifyNameSecond, "rddp")
 			if tmpErr != nil {
 				return

+ 1 - 1
services/report_push.go

@@ -16,7 +16,7 @@ import (
 
 // SendReportToEmail 发送报告邮件
 func SendReportToEmail(report *models.ReportDetail) (err error) {
-	if utils.BusinessCode != utils.BusinessCodeRelease {
+	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox {
 		// 客户不做报告邮件推送
 		return
 	}

+ 1 - 1
services/user.go

@@ -39,7 +39,7 @@ func SwitchHzUserEnabledByMobile(opEnabled int, mobile string) (err error) {
 
 // DeleteHzUserByMobile 根据手机号删除弘则研究下的联系人
 func DeleteHzUserByMobile(mobile string) (err error) {
-	if utils.BusinessCode != utils.BusinessCodeRelease {
+	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox {
 		return
 	}
 	if mobile == "" {

+ 1 - 1
utils/constants.go

@@ -302,6 +302,6 @@ const BusinessCodeSalt = "dr7WY0OZgGR7upw1"
 
 // 自用商户号
 const (
-	BusinessCodeSandbox = "E2023080700" // 沙箱环境
+	BusinessCodeSandbox = "E2023080700" // 试用平台
 	BusinessCodeRelease = "E2023080900" // 生产环境
 )