fix

services/company_contract/company_contract.go

@@ -129,6 +129,7 @@ func HandleCompanyContract(cont context.Context) (err error) {
 		//研选审批通过的时候研选扣点更新
 		{
 			cygx.YanXuanCompanyApproval(v.CompanyId)
+			cygx.ActivitySpecialCompanyApproval(v.CompanyId)
 		}
 	}
 

services/company_permission.go

@@ -2,7 +2,6 @@ package services
 
 import (
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"hongze/hongze_task/models"
 	"strconv"
 	"strings"
@@ -201,39 +200,3 @@ func addCompany12() {
 		}
 	}
 }
-
-type CompanyReportPermission struct {
-	CompanyReportPermissionId int64 `orm:"column(company_report_permission_id);pk"`
-	CompanyId                 int
-	ReportPermissionId        int
-	CreatedTime               time.Time
-	LastUpdatedTime           time.Time
-	ChartPermissionId         int
-	StartDate                 string    `description:"权限开始日期"`
-	EndDate                   string    `description:"权限结束日期"`
-	ProductId                 int       `description:"产品id"`
-	ProductName               string    `description:"产品名称"`
-	CompanyContractId         int       `description:"合同id"`
-	Status                    string    `description:"'正式','试用','关闭'"`
-	ModifyTime                time.Time `description:"修改时间"`
-	IsUpgrade                 int       `description:"是否升级，1是，0否"`
-	ExpensiveYx               int       `description:"权益研选: 0-3w; 1-5w"`
-}
-
-// GetCompanyReportPermissionUpgrade 获取升级的权限类型
-func GetCompanyReportPermissionUpgrade(companyId, productId int) (items []*CompanyReportPermission, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT
-	re.*
-FROM
-	company_report_permission  as re 
-	INNER JOIN chart_permission as  c ON c.chart_permission_id = re.chart_permission_id
-WHERE
-	re.company_id = ? 
-	AND re.product_id = ? 
-	AND re.is_upgrade = 1 
-	AND c.permission_type = 1
-	AND STATUS = '正式' `
-	_, err = o.Raw(sql, companyId, productId).QueryRows(&items)
-	return
-}

services/company_product.go

@@ -144,7 +144,7 @@ func CompanyTryOut(cont context.Context) (err error) {
 		//正式专试用定时任务更新研选及专项调研扣点
 		{
 			cygx.YanXuanCompanyCompanyTryOut(v.CompanyId)
-			ActivitySpecialCompanyTryOutReduce(v.CompanyId)
+			cygx.ActivitySpecialCompanyTryOutReduce(v.CompanyId)
 		}
 	}
 	return

services/cygx/activity_points_set.go

@@ -1,7 +1,10 @@
 package cygx
 
 import (
+	"errors"
 	"fmt"
+	"hongze/hongze_task/models"
+	"hongze/hongze_task/models/data_manage"
 	"hongze/hongze_task/services/alarm_msg"
 	"hongze/hongze_task/utils"
 	"time"
@@ -69,3 +72,33 @@ func YanXuanCompanyCompanyTryOut(comapnyId int) (err error) {
 	}
 	return
 }
+
+// 审批通过的时候专项调研次数更新
+func ActivitySpecialCompanyApproval(companyId int) (err error) {
+	comapny, e := models.GetCompanyById(companyId)
+	if e != nil {
+		err = errors.New("GetCompanyById err:" + e.Error())
+		return
+	}
+	userType, packageType, _, _, _ := GetUserType(companyId)
+	itemBill := new(data_manage.CygxActivitySpecialTripBill)
+	itemBill.CreateTime = time.Now()
+	itemBill.CompanyId = companyId
+	itemBill.CompanyName = comapny.CompanyName
+	itemBill.Source = 2
+	itemBill.DoType = 2
+	itemBill.Way = 3
+	itemBill.Content = "套餐转正"
+	if userType == 2{
+		packageTypeMap := map[int]int{1: 16, 2: 10}
+		totalTrip := packageTypeMap[packageType]
+		itemBill.BillDetailed = totalTrip
+	} else {
+		itemBill.BillDetailed = 5
+	}
+	err = data_manage.AddCygxActivitySpecialTripBill(itemBill)
+	if err != nil {
+		return
+	}
+	return
+}

services/cygx/activity_special.go

@@ -1,4 +1,4 @@
-package services
+package cygx
 
 import (
 	"errors"

services/cygx/company_permission.go

@@ -0,0 +1,42 @@
+package cygx
+
+import (
+	"github.com/beego/beego/v2/client/orm"
+	"time"
+)
+
+type CompanyReportPermission struct {
+	CompanyReportPermissionId int64 `orm:"column(company_report_permission_id);pk"`
+	CompanyId                 int
+	ReportPermissionId        int
+	CreatedTime               time.Time
+	LastUpdatedTime           time.Time
+	ChartPermissionId         int
+	StartDate                 string    `description:"权限开始日期"`
+	EndDate                   string    `description:"权限结束日期"`
+	ProductId                 int       `description:"产品id"`
+	ProductName               string    `description:"产品名称"`
+	CompanyContractId         int       `description:"合同id"`
+	Status                    string    `description:"'正式','试用','关闭'"`
+	ModifyTime                time.Time `description:"修改时间"`
+	IsUpgrade                 int       `description:"是否升级，1是，0否"`
+	ExpensiveYx               int       `description:"权益研选: 0-3w; 1-5w"`
+}
+
+// GetCompanyReportPermissionUpgrade 获取升级的权限类型
+func GetCompanyReportPermissionUpgrade(companyId, productId int) (items []*CompanyReportPermission, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT
+	re.*
+FROM
+	company_report_permission  as re 
+	INNER JOIN chart_permission as  c ON c.chart_permission_id = re.chart_permission_id
+WHERE
+	re.company_id = ? 
+	AND re.product_id = ? 
+	AND re.is_upgrade = 1 
+	AND c.permission_type = 1
+	AND STATUS = '正式' `
+	_, err = o.Raw(sql, companyId, productId).QueryRows(&items)
+	return
+}