Merge branch 'crm/crm_16.9.2_rai' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/cygx/rai_serve.go

@@ -1297,6 +1297,8 @@ func (this *RaiServeCoAntroller) RemarkList() {
 			item.RemarkType = "未续约说明"
 		case "cygx_user_feedback":
 			item.RemarkType = "交流反馈（" + v.RealName + "）"
+		case "company_approval":
+			item.RemarkType = "申请解冻"
 		case "company_history_remark":
 			item.RemarkType = "备注"
 			item.BtnEdit = true

services/company_apply/company_approval.go

@@ -731,6 +731,7 @@ func afterApproved(companyApprovalId int, opUserId int, opUserName string) (err
 			startDate = tmpStartDate
 			endDate = tmpEndDate
 		}
+		go AddCompanyHistoryRemarkByCompanyApply(recodeInfo) //权益销售冻结销售申请试用，审批通过后，将申请内容添加到备注
 
 	case 3: //试用延期
 		tmpCompanyReportPermissionList, tmpEndDate, tmpErr := company.TryOutDelay(recodeInfo.CompanyId, recodeInfo.ProductId, opUser.AdminId, recodeInfo.CompanyApprovalId, opUser.RealName, companyProduct.EndDate, companyProduct.ProductName)

services/company_apply/company_history_remark.go

@@ -0,0 +1,33 @@
+package company_apply
+
+import (
+	"fmt"
+	"hongze/hz_crm_api/models/company"
+	"hongze/hz_crm_api/services/alarm_msg"
+	"time"
+)
+
+// 权益销售冻结销售申请试用，审批通过后，将申请内容添加到备注
+func AddCompanyHistoryRemarkByCompanyApply(recodeInfo *company.CompanyApproval) {
+	var err error
+	defer func() {
+		if err != nil {
+			fmt.Println("err：", err)
+			go alarm_msg.SendAlarmMsg(fmt.Sprint(" 权益销售冻结销售申请试用，审批通过后，将申请内容添加到备注 失败，AddCompanyHistoryRemarkByCompanyApply Err：", err.Error(), recodeInfo), 3)
+		}
+	}()
+
+	item := new(company.CompanyHistoryRemark)
+	item.CompanyId = recodeInfo.CompanyId
+	item.ProductId = 2
+	item.Content = recodeInfo.ApplyReasons
+	item.SysAdminId = recodeInfo.ApplyUserId
+	item.SysAdminName = recodeInfo.ApplyRealName
+	item.CreateTime = time.Now()
+	item.ModifyTime = time.Now()
+	item.ShowTime = time.Now()
+	item.TableName = "company_approval"
+	item.TableId = recodeInfo.CompanyApprovalId
+	err = company.AddCompanyHistoryRemark(item)
+	return
+}