Merge branch 'yb/5.2' into debug

# Conflicts:
#	utils/config.go

controllers/approval.go

@@ -674,7 +674,7 @@ func (c *ApprovalCommon) ApplyApproveOld() {
 			} else {
 				approvalStatus = 3
 			}
-			go services.AddCompanyApprovalMessage(sysUser.AdminId, approvalItem.ApplyUserId, req.CompanyId, approvalItem.CompanyApprovalId, 2, 1, approvalStatus, companyProduct.CompanyName, content, content, approvalSysUser.Mobile)
+			go services.AddCompanyApprovalMessage(sysUser.AdminId, approvalItem.ApplyUserId, req.CompanyId, approvalItem.CompanyApprovalId, 2, 1, approvalStatus, companyProduct.CompanyName, content, content, approvalSysUser.Mobile, "")
 		}
 	}
 	c.OkWithMessage("审批操作成功")

controllers/message.go

@@ -11,10 +11,12 @@ import (
 	"hongze/hongze_mobile_admin/models/tables/contract_approval_record"
 	"hongze/hongze_mobile_admin/models/tables/yb_community_question"
 	"hongze/hongze_mobile_admin/models/tables/yb_community_question_comment"
+	"hongze/hongze_mobile_admin/services"
 	"hongze/hongze_mobile_admin/utils"
 	"sort"
 	"strconv"
 	"strings"
+	"time"
 )
 
 //消息模块
@@ -144,8 +146,8 @@ func (c *MessageCommon) MessageList() {
 	_ = company_approval_message.ModifyAllCompanyApprovalMessageStatus(sysUserId, sourceType)
 
 	switch sourceType {
-	case 5:
-		err = getQuestionMessage(list)
+	case 5, 6:
+		err = getMessageInfo(list)
 		resp := message.CompanyApprovalMessageListResp{
 			List:  list,
 			Total: total,
@@ -156,19 +158,6 @@ func (c *MessageCommon) MessageList() {
 		}
 		c.OkDetailed(resp, "获取成功")
 		return
-	case 6:
-		err = getQuestionCommentMessage(list)
-		resp := message.CompanyApprovalMessageListResp{
-			List:  list,
-			Total: total,
-		}
-		if err != nil {
-			c.FailWithMessage("获取失败", "获取问答失败，Err:"+err.Error())
-			return
-		}
-		c.OkDetailed(resp, "获取成功")
-		return
-
 	}
 
 	companyApprovalIds := make([]string, 0)
@@ -338,6 +327,37 @@ func getQuestionCommentMessage(companyApprovalMessageList []*company_approval_me
 	return
 }
 
+// getMessageInfo 从消息主体中获取的消息
+func getMessageInfo(companyApprovalMessageList []*company_approval_message.CompanyApprovalMessageList) (err error) {
+	errMsgList := make([]string, 0)
+	defer func() {
+		if len(errMsgList) > 0 {
+			fmt.Println("errMsg:", strings.Join(errMsgList, "\n"))
+		}
+	}()
+	for _, v := range companyApprovalMessageList {
+		var tmpMessageInfo services.MessageInfo
+		if v.MessageInfo != `` {
+			tmpErr := json.Unmarshal([]byte(v.MessageInfo), &tmpMessageInfo)
+			if tmpErr != nil {
+				errMsgList = append(errMsgList, fmt.Sprintf("%d格式化消息失败，err：%s", v.CompanyApprovalId, v.MessageInfo))
+				continue
+			}
+		}
+
+		createTime, _ := time.ParseInLocation(utils.FormatDateTime, tmpMessageInfo.CreateTime.Format(utils.FormatDateTime), time.Local)
+		approvalInfo := company_approval_message.ApprovalInfo{
+			ApplyName:   tmpMessageInfo.UserName,
+			Title:       tmpMessageInfo.Content,
+			ApplyTime:   createTime,
+			Content:     tmpMessageInfo.Content,
+			CompanyName: tmpMessageInfo.CompanyName,
+		}
+		v.ApprovalInfo = approvalInfo
+	}
+	return
+}
+
 // @Title 消息已读
 // @Description 消息已读接口
 // @Param	request	body company.CompanyApprovalMessageReadReq true "type json string"

models/tables/company_approval_message/company_approval_message.go

@@ -21,6 +21,7 @@ type CompanyApprovalMessage struct {
 	ApprovalStatus    int       `description:"审批结果:1:待审批，2:已审批，3:已驳回"`
 	OperationStatus   int       `description:"消息状态:1:待审批，2:已审批"`
 	MessageType       int       `description:"1:申请消息，2:审批结果"`
+	MessageInfo       string    `description:"消息主要内容，json数据"`
 }
 
 //添加审批消息
@@ -53,6 +54,7 @@ type CompanyApprovalMessageList struct {
 	CreateTime        time.Time    `description:"创建时间"`
 	RealName          string       `description:"销售名称"`
 	CompanyApprovalId int          `description:"审批单id"`
+	MessageInfo       string       `description:"消息主要内容，json数据" json:"-"`
 	ApprovalInfo      ApprovalInfo `description:"审批单信息"`
 }
 
@@ -141,7 +143,7 @@ func ModifyAllCompanyApprovalMessageStatus(receiveUserId, sourceType int) (err e
 	return
 }
 
-//消息作废
+// CancelCompanyApprovalMessage 消息作废
 func CancelCompanyApprovalMessage(companyApprovalId, sourceType int) (err error) {
 	o := orm.NewOrm()
 	sql := `UPDATE company_approval_message SET message_status=2,modify_time=NOW() 

services/company_approval/company_approval.go

@@ -308,7 +308,7 @@ func Reject(approvalRecord *contract_approval_record.ContractApprovalRecord, opU
 		//content := contractInfo.CompanyName + " 合同模板已驳回"
 		content := companyInfo.CompanyName + " " + recordInfo.ApproveContent + "审批驳回"
 		approvalSysUser, _ := admin.GetAdminById(approval.ApplyUserId)
-		go services.AddCompanyApprovalMessage(opUserId, approval.ApplyUserId, companyInfo.CompanyId, approval.ContractId, 2, sourceType, 3, companyInfo.CompanyName, content, content, approvalSysUser.Mobile)
+		go services.AddCompanyApprovalMessage(opUserId, approval.ApplyUserId, companyInfo.CompanyId, approval.ContractId, 2, sourceType, 3, companyInfo.CompanyName, content, content, approvalSysUser.Mobile, "")
 	}
 	return
 }
@@ -392,7 +392,7 @@ func Approved(approvalRecord *contract_approval_record.ContractApprovalRecord, o
 		//待办通知（通知销售已经审核通过了）
 		{
 			approvalSysUser, _ := admin.GetAdminById(approval.ApplyUserId)
-			go services.AddCompanyApprovalMessage(opUserId, approval.ApplyUserId, companyInfo.CompanyId, approval.ContractId, 2, sourceType, 2, companyInfo.CompanyName, content, content, approvalSysUser.Mobile)
+			go services.AddCompanyApprovalMessage(opUserId, approval.ApplyUserId, companyInfo.CompanyId, approval.ContractId, 2, sourceType, 2, companyInfo.CompanyName, content, content, approvalSysUser.Mobile, "")
 		}
 
 		// 客户单审批后的异步操作（修改客户单信息、修改合同权限等）
@@ -479,7 +479,7 @@ func approvedByCc(approvedRemark string, sourceApprovalRecord *contract_approval
 		//待办通知
 		{
 			approvalSysUser, _ := admin.GetAdminById(approval.ApplyUserId)
-			go services.AddCompanyApprovalMessage(sourceApprovalRecord.ApproveUserId, approval.ApplyUserId, companyInfo.CompanyId, approval.ContractId, 2, sourceType, 2, companyInfo.CompanyName, content, content, approvalSysUser.Mobile)
+			go services.AddCompanyApprovalMessage(sourceApprovalRecord.ApproveUserId, approval.ApplyUserId, companyInfo.CompanyId, approval.ContractId, 2, sourceType, 2, companyInfo.CompanyName, content, content, approvalSysUser.Mobile, "")
 		}
 
 		//客户单审批后的异步操作（修改客户单信息、修改合同权限等）
@@ -552,7 +552,7 @@ func messageToUser(contractApprovalRecordList []*contract_approval_record.Contra
 		//接收人，就是审批记录里面的待审核人（抄送人）
 		receiveUserId := contractApprovalRecord.ApproveUserId
 
-		go services.AddCompanyApprovalMessage(createUserId, receiveUserId, companyId, companyApprovalId, messageType, sourceType, approvalStatus, companyName, content, content, sysUserMobile)
+		go services.AddCompanyApprovalMessage(createUserId, receiveUserId, companyId, companyApprovalId, messageType, sourceType, approvalStatus, companyName, content, content, sysUserMobile, "")
 	}
 	return
 }

services/company_approval_message.go

@@ -8,8 +8,44 @@ import (
 	"time"
 )
 
+//消息来源类型，1:客户，2：合同，3：用印，4：指标替换，5：问答社区，6：问答评论
+const (
+	CompanyApprovalMessageSourceTypeByCompany         = 1
+	CompanyApprovalMessageSourceTypeByContract        = 2
+	CompanyApprovalMessageSourceTypeBySeal            = 3
+	CompanyApprovalMessageSourceTypeByEdbInfo         = 4
+	CompanyApprovalMessageSourceTypeByQuestion        = 5
+	CompanyApprovalMessageSourceTypeByQuestionComment = 6
+)
+
+// 1:申请消息，2:审批结果，3：消息通知
+const (
+	CompanyApprovalMessageMessageTypeByApply          = 1
+	CompanyApprovalMessageMessageTypeByApprovalResult = 2
+	CompanyApprovalMessageMessageTypeByMessage        = 3
+)
+
+//审批状态,1:待审批，2:已审批，3:已驳回
+const (
+	CompanyApprovalMessageApprovalStatusByPending  = 1
+	CompanyApprovalMessageApprovalStatusByApproved = 2
+	CompanyApprovalMessageApprovalStatusByRejected = 3
+)
+
+// MessageInfo 消息主要内容
+type MessageInfo struct {
+	CompanyName          string    `json:"company_name"`
+	ProductId            int       `json:"product_id"`
+	CompanyProductStatus string    `json:"company_product_status"`
+	Title                string    `json:"title"`
+	Content              string    `json:"content"`
+	UserId               uint64    `json:"user_id"`
+	UserName             string    `json:"user_name"`
+	CreateTime           time.Time `json:"create_time"`
+}
+
 // AddCompanyApprovalMessage 添加待办消息
-func AddCompanyApprovalMessage(createUserId, receiveUserId, companyId, companyApprovalId, msgType, sourceType, approvalStatus int, companyName, remark, content, mobile string) (err error) {
+func AddCompanyApprovalMessage(createUserId, receiveUserId, companyId, companyApprovalId, msgType, sourceType, approvalStatus int, companyName, remark, content, mobile, messageInfo string) (err error) {
 	defer func() {
 		if err != nil {
 			fmt.Println("异常提醒:"+utils.RunMode, "给用户发送消息失败，ERR:"+err.Error()+"", utils.EmailSendToUsers)
@@ -35,6 +71,7 @@ func AddCompanyApprovalMessage(createUserId, receiveUserId, companyId, companyAp
 	msgItem.MessageType = msgType           //1:申请消息，2:审批结果，3：消息通知
 	msgItem.SourceType = sourceType         //消息来源，1:客户，2：合同，3：用印
 	msgItem.ApprovalStatus = approvalStatus //审批状态,1:待审批，2:已审批，3:已驳回
+	msgItem.MessageInfo = messageInfo       //消息主要内容，json数据
 	err = company_approval_message.AddCompanyApprovalMessage(msgItem)
 	if mobile != "" {
 		//跳转地址

services/contract/contract_approval.go

@@ -374,7 +374,7 @@ func Reject(contractInfo *contract.Contract, approvalInfo *contract_approval.Con
 	{
 		content := contractInfo.CompanyName + " 合同模板已驳回"
 		approvalSysUser, _ := admin.GetAdminById(contractInfo.SellerId)
-		go services.AddCompanyApprovalMessage(opUserId, contractInfo.SellerId, 0, contractApprovalRecord.ContractApprovalRecordId, 2, 2, 3, contractInfo.CompanyName, content, content, approvalSysUser.Mobile)
+		go services.AddCompanyApprovalMessage(opUserId, contractInfo.SellerId, 0, contractApprovalRecord.ContractApprovalRecordId, 2, 2, 3, contractInfo.CompanyName, content, content, approvalSysUser.Mobile, "")
 
 		//发送消息给所有的抄送人
 		//go messageToAllCcUser(opUserId, contractApprovalRecord.ContractApprovalId, 2, 3, contractInfo.CompanyName, content)
@@ -445,7 +445,7 @@ func Approved(contractInfo *contract.Contract, approvalInfo *contract_approval.C
 		{
 			content := contractInfo.CompanyName + " 合同模板已审核"
 			approvalSysUser, _ := admin.GetAdminById(contractInfo.SellerId)
-			go services.AddCompanyApprovalMessage(opUserId, contractInfo.SellerId, 0, contractApprovalRecord.ContractApprovalRecordId, 2, 2, 2, contractInfo.CompanyName, content, content, approvalSysUser.Mobile)
+			go services.AddCompanyApprovalMessage(opUserId, contractInfo.SellerId, 0, contractApprovalRecord.ContractApprovalRecordId, 2, 2, 2, contractInfo.CompanyName, content, content, approvalSysUser.Mobile, "")
 		}
 
 		//审核通过后的异步操作（pdf生成、修改数据等）
@@ -533,7 +533,7 @@ func approved(contractInfo *contract.Contract, contractApprovalRecord *contract_
 		{
 			content := contractInfo.CompanyName + " 合同模板已审核"
 			approvalSysUser, _ := admin.GetAdminById(contractInfo.SellerId)
-			go services.AddCompanyApprovalMessage(opUserId, contractInfo.SellerId, 0, contractApprovalRecord.ContractApprovalRecordId, 2, 2, 2, contractInfo.CompanyName, content, content, approvalSysUser.Mobile)
+			go services.AddCompanyApprovalMessage(opUserId, contractInfo.SellerId, 0, contractApprovalRecord.ContractApprovalRecordId, 2, 2, 2, contractInfo.CompanyName, content, content, approvalSysUser.Mobile, "")
 		}
 
 		//审核通过后的异步操作（pdf生成、修改数据等）
@@ -610,7 +610,7 @@ func approvedByCc(approvedRemark string, sourceContractApprovalRecord *contract_
 		//待办通知
 		{
 			approvalSysUser, _ := admin.GetAdminById(contractInfo.SellerId)
-			go services.AddCompanyApprovalMessage(sourceContractApprovalRecord.ApproveUserId, contractInfo.SellerId, 0, sourceContractApprovalRecord.ContractApprovalRecordId, 2, 2, 2, contractInfo.CompanyName, content, content, approvalSysUser.Mobile)
+			go services.AddCompanyApprovalMessage(sourceContractApprovalRecord.ApproveUserId, contractInfo.SellerId, 0, sourceContractApprovalRecord.ContractApprovalRecordId, 2, 2, 2, contractInfo.CompanyName, content, content, approvalSysUser.Mobile, "")
 		}
 
 		//审核通过后的异步操作（pdf生成、修改数据等）
@@ -681,7 +681,7 @@ func messageToUser(contractApprovalRecordList []*contract_approval_record.Contra
 		}
 		//接收人，就是审批记录里面的待审核人（抄送人）
 		receiveUserId := contractApprovalRecord.ApproveUserId
-		go services.AddCompanyApprovalMessage(createUserId, receiveUserId, 0, contractApprovalRecord.ContractApprovalRecordId, messageType, 2, approvalStatus, companyName, content, content, sysUserMobile)
+		go services.AddCompanyApprovalMessage(createUserId, receiveUserId, 0, contractApprovalRecord.ContractApprovalRecordId, messageType, 2, approvalStatus, companyName, content, content, sysUserMobile, "")
 	}
 	return
 }

services/seal/approval.go

@@ -43,8 +43,8 @@ func Apply(sealInfo *seal.Seal) (err error) {
 
 // GetFlowTypeBySealType 根据盖章类型(多选,逗号拼接)获取审批流的类型
 func GetFlowTypeBySealType(sealType string) (flowType int) {
-	flowType = 5	// 合同章
-	longFlow := "公章,法人章"	// 盖章类型包含其中之一则审批流变成6
+	flowType = 5         // 合同章
+	longFlow := "公章,法人章" // 盖章类型包含其中之一则审批流变成6
 	sealTypeArr := strings.Split(sealType, ",")
 	for _, itemType := range sealTypeArr {
 		if strings.Contains(longFlow, itemType) {
@@ -314,7 +314,7 @@ func Reject(sealInfo *seal.Seal, approvalInfo *contract_approval.ContractApprova
 	{
 		content := sealInfo.CompanyName + " 用印已驳回"
 		approvalSysUser, _ := admin.GetAdminById(sealInfo.UserId)
-		go services.AddCompanyApprovalMessage(opUser.AdminId, sealInfo.UserId, 0, approvalRecord.ContractApprovalRecordId, 2, sourceType, 3, sealInfo.CompanyName, content, content, approvalSysUser.Mobile)
+		go services.AddCompanyApprovalMessage(opUser.AdminId, sealInfo.UserId, 0, approvalRecord.ContractApprovalRecordId, 2, sourceType, 3, sealInfo.CompanyName, content, content, approvalSysUser.Mobile, "")
 
 		//发送消息给所有的抄送人
 		//go messageToAllCcUser(opUserId, approvalRecord.ContractApprovalId, 2, 3, sealInfo.CompanyName, content)
@@ -457,7 +457,7 @@ func Approved(sealInfo *seal.Seal, approvalInfo *contract_approval.ContractAppro
 		{
 			content := sealInfo.CompanyName + " 用印已审核"
 			approvalSysUser, _ := admin.GetAdminById(sealInfo.UserId)
-			go services.AddCompanyApprovalMessage(opUserId, sealInfo.UserId, 0, approvalRecord.ContractApprovalRecordId, 2, sourceType, 2, sealInfo.CompanyName, content, content, approvalSysUser.Mobile)
+			go services.AddCompanyApprovalMessage(opUserId, sealInfo.UserId, 0, approvalRecord.ContractApprovalRecordId, 2, sourceType, 2, sealInfo.CompanyName, content, content, approvalSysUser.Mobile, "")
 		}
 	} else {
 		//获取下级节点信息
@@ -532,7 +532,7 @@ func approvedByCc(approvedRemark string, sourceApprovalRecord *contract_approval
 		{
 			content = sealInfo.CompanyName + " 用印已审核"
 			approvalSysUser, _ := admin.GetAdminById(sealInfo.UserId)
-			go services.AddCompanyApprovalMessage(sourceApprovalRecord.ApproveUserId, sealInfo.UserId, 0, sourceApprovalRecord.ContractApprovalRecordId, 2, sourceType, 2, sealInfo.CompanyName, content, content, approvalSysUser.Mobile)
+			go services.AddCompanyApprovalMessage(sourceApprovalRecord.ApproveUserId, sealInfo.UserId, 0, sourceApprovalRecord.ContractApprovalRecordId, 2, sourceType, 2, sealInfo.CompanyName, content, content, approvalSysUser.Mobile, "")
 		}
 	} else {
 		//获取下级节点信息
@@ -607,7 +607,7 @@ func messageToUser(contractApprovalRecordList []*contract_approval_record.Contra
 		}
 		//接收人，就是审批记录里面的待审核人（抄送人）
 		receiveUserId := contractApprovalRecord.ApproveUserId
-		go services.AddCompanyApprovalMessage(createUserId, receiveUserId, 0, contractApprovalRecord.ContractApprovalRecordId, messageType, sourceType, approvalStatus, companyName, content, content, sysUserMobile)
+		go services.AddCompanyApprovalMessage(createUserId, receiveUserId, 0, contractApprovalRecord.ContractApprovalRecordId, messageType, sourceType, approvalStatus, companyName, content, content, sysUserMobile, "")
 	}
 	return
 }

services/seal/seal.go

@@ -337,7 +337,7 @@ func checkEdit(sealInfo *seal.Seal, updateCol []string, approvalRecordId int, co
 	if sysUser != nil {
 		sysUserMobile = sysUser.Mobile
 	}
-	go services.AddCompanyApprovalMessage(opUser.AdminId, sealInfo.UserId, 0, approvalRecordId, 3, sourceType, 2, sealInfo.CompanyName, content, content, sysUserMobile)
+	go services.AddCompanyApprovalMessage(opUser.AdminId, sealInfo.UserId, 0, approvalRecordId, 3, sourceType, 2, sealInfo.CompanyName, content, content, sysUserMobile, "")
 	return
 }
 
@@ -409,7 +409,7 @@ func Invalid(sealId int, opUser *custom.AdminWx, isInvalidContract bool) (err er
 				if sysUser != nil {
 					sysUserMobile = sysUser.Mobile
 				}
-				go services.AddCompanyApprovalMessage(opUser.AdminId, contractApprovalRecord.ApproveUserId, 0, contractApprovalRecord.ContractApprovalRecordId, 3, sourceType, 2, sealInfo.CompanyName, content, content, sysUserMobile)
+				go services.AddCompanyApprovalMessage(opUser.AdminId, contractApprovalRecord.ApproveUserId, 0, contractApprovalRecord.ContractApprovalRecordId, 3, sourceType, 2, sealInfo.CompanyName, content, content, sysUserMobile, "")
 
 			}
 		}

services/yb/community_question.go

@@ -6,6 +6,7 @@ import (
 	ybResponse "hongze/hongze_mobile_admin/models/response/yb"
 	"hongze/hongze_mobile_admin/models/tables/admin"
 	"hongze/hongze_mobile_admin/models/tables/company"
+	"hongze/hongze_mobile_admin/models/tables/company_approval_message"
 	"hongze/hongze_mobile_admin/models/tables/sys_role"
 	"hongze/hongze_mobile_admin/models/tables/sys_role_admin"
 	"hongze/hongze_mobile_admin/models/tables/user_record"
@@ -274,6 +275,9 @@ func SoftDeleteQuestion(questionId int) (err error) {
 	if e := yb_community_question.DeleteQuestion(questionId); e != nil {
 		err = errors.New("删除提问失败 Err:" + e.Error())
 	}
+
+	// 删除问答后的逻辑处理
+	go afterDeleteQuestion(questionId)
 	return
 }
 
@@ -380,3 +384,15 @@ func CheckCommunityQuestionPermission(adminId int) (errMsg string, err error) {
 	}
 	return
 }
+
+// afterDeleteQuestion 删除问答后的逻辑处理
+func afterDeleteQuestion(questionId int) {
+	var err error
+	defer func() {
+		if err != nil {
+			go alarm_msg.SendAlarmMsg("问答信息删除后，标记站内消息失败"+time.Now().Format(utils.FormatDateTime)+";Err:"+err.Error(), 3)
+		}
+	}()
+	err = company_approval_message.CancelCompanyApprovalMessage(questionId, services.CompanyApprovalMessageSourceTypeByQuestion)
+	return
+}

services/yb/community_question_comment.go

@@ -4,8 +4,11 @@ import (
 	"errors"
 	"fmt"
 	ybResponse "hongze/hongze_mobile_admin/models/response/yb"
+	"hongze/hongze_mobile_admin/models/tables/company_approval_message"
 	"hongze/hongze_mobile_admin/models/tables/wx_user"
 	"hongze/hongze_mobile_admin/models/tables/yb_community_question_comment"
+	"hongze/hongze_mobile_admin/services"
+	"hongze/hongze_mobile_admin/services/alarm_msg"
 	"hongze/hongze_mobile_admin/utils"
 	"strings"
 	"time"
@@ -95,7 +98,11 @@ func SoftDeleteQuestionComment(questionCommentId int) (err error, errMsg string)
 	err = questionCommentInfo.Update([]string{"Enabled", "ModifyTime"})
 	if err != nil {
 		errMsg = "删除提问失败"
+		return
 	}
+
+	// 删除评论后的逻辑处理
+	go afterDeleteComment(questionCommentInfo)
 	return
 }
 
@@ -127,3 +134,15 @@ func SetHotQuestionComment(questionCommentId int) (err error, errMsg string) {
 	}
 	return
 }
+
+// afterDeleteComment 删除评论后的逻辑处理
+func afterDeleteComment(communityQuestionComment *yb_community_question_comment.YbCommunityQuestionComment) {
+	var err error
+	defer func() {
+		if err != nil {
+			go alarm_msg.SendAlarmMsg("问答评论信息删除后，标记站内消息失败"+time.Now().Format(utils.FormatDateTime)+";Err:"+err.Error(), 3)
+		}
+	}()
+	err = company_approval_message.CancelCompanyApprovalMessage(int(communityQuestionComment.CommunityQuestionCommentId), services.CompanyApprovalMessageSourceTypeByQuestionComment)
+	return
+}

utils/config.go

@@ -202,7 +202,7 @@ func wxConfig() {
 		WxMsgTemplateIdWithRoadshowDeleteNotice = "CB7bOl7f3viMG4s1uhRo7WM0Jbx3WvodKuIZ8A_z8fM" //路演->研究员收到活动删除通知
 
 		WxMsgTemplateIdWithSealApplyFinished   = "CB7bOl7f3viMG4s1uhRo7WM0Jbx3WvodKuIZ8A_z8fM"   // 用印申请-已签回通知
-
+		
 		// 研报小程序
 		WxMsgTemplateIdWithYbCommunityQuestion = "CB7bOl7f3viMG4s1uhRo7WM0Jbx3WvodKuIZ8A_z8fM" // 研报小程序->问答社区回复通知
 	}