no message

models/activity_special_permission_points.go

@@ -8,7 +8,7 @@ import (
 type CygxActivitySpecialPermissionPoints struct {
 	Id                  int       `orm:"column(id);pk"`
 	CompanyId           int       `description:"公司ID"`
-	Points              int       `description:"剩余点数"`
+	Points              float64   `description:"剩余点数"`
 	CompanyName         string    `description:"公司名称"`
 	ChartPermissionId   int       `description:"行业id"`
 	ChartPermissionName string    `description:"行业名称"`
@@ -35,9 +35,25 @@ func GetCygxActivitySpecialPermissionPointsList(condition string, pars []interfa
 }
 
 // 更新公司每个行业剩余研选点数
-func UpdateCygxActivitySpecialPermissionPoints(points, companyId, chartPermissionId int) (err error) {
+func UpdateCygxActivitySpecialPermissionPoints(points float64, companyId, chartPermissionId int) (err error) {
 	o := orm.NewOrm()
 	sql := `UPDATE cygx_activity_special_permission_points SET points = ?  WHERE company_id=?  AND chart_permission_id=? `
 	_, err = o.Raw(sql, points, companyId, chartPermissionId).Exec()
 	return
 }
+
+// 获取公司剩余点数
+func GetCygxActivitySpecialPermissionPoints(companyId int) (comapnyPointsNum float64, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT points FROM cygx_activity_special_permission_points  WHERE company_id=? `
+	err = o.Raw(sql, companyId).QueryRow(&comapnyPointsNum)
+	return
+}
+
+// 获取数量
+func GetCygxActivitySpecialPermissionPointsCountByCompanyId(companyId int) (count int, err error) {
+	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_activity_special_permission_points WHERE company_id=?  `
+	o := orm.NewOrm()
+	err = o.Raw(sqlCount, companyId).QueryRow(&count)
+	return
+}

models/activity_special_trip_bill.go

@@ -17,7 +17,7 @@ type CygxActivitySpecialTripBill struct {
 	RealName            string    `description:"用户实际名称"`
 	AdminId             int       `description:"销售/管理员ID"`
 	Source              int       `description:"来源，1小程序，2后台添加, 3开发人员手动添加"`
-	BillDetailed        int       `description:"流水明细，判断是进账还是出账"`
+	BillDetailed        float64   `description:"流水明细，判断是进账还是出账"`
 	DoType              int       `description:"操作方式，1报名，2取消报名"`
 	RegisterPlatform    int       `description:"来源 1小程序，2：网页"`
 	ChartPermissionId   int       `description:"行业id"`
@@ -25,6 +25,7 @@ type CygxActivitySpecialTripBill struct {
 	Way                 int       `description:"1报名，取消报名。2到会取消到会 3转正或清零 4取消活动"`
 	Content             string    `description:"内容"`
 	Total               string    `description:"总和"`
+	TableSource         string    `description:"活动类型来源 活动 ：activity 、专项调研活动：activityspecial"`
 }
 
 // 添加
@@ -80,111 +81,14 @@ func GetCygxActivitySpecialTripBillList(condition string, pars []interface{}) (i
 	return
 }
 
-type SpecialBillInitBig struct {
+// 通过查询条件获取详情
-	ApprovalTime time.Time
+func GetCygxActivitySpecialTripBillByCondition(condition string, pars []interface{}) (item *CygxActivitySpecialTripBill, err error) {
-	CompanyId    int
+	if condition == "" {
-	CompanyName  string
+		return
-}
-
-func GetActivitySecialTirpBillForInit(packageType int) (item []*SpecialBillInitBig, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT
-	a.approve_time,d.company_id,c.company_name 
-FROM
-	company_approval a
-	INNER JOIN company_contract b ON a.company_contract_id = b.company_contract_id
-	INNER JOIN company c ON a.company_id = c.company_id
-	INNER JOIN cygx_company_user_type d ON a.company_id = d.company_id
-WHERE
-	a.apply_method = 1 
-	AND a.product_id = 2 
-	AND a.approve_status = '已审批' 
-	AND b.product_id = 2 
-	AND d.package_type = ?
-	GROUP BY d.company_id `
-	_, err = o.Raw(sql, packageType).QueryRows(&item)
-	return
-}
-
-type SpecialBillInitNotBig struct {
-	ApprovalTime       time.Time
-	CompanyId          int
-	CompanyName        string
-	ChartPermissionIds string
-}
-
-func GetActivitySecialTirpBillForInitNotBig() (item []*SpecialBillInitNotBig, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT
-	a.approve_time,d.company_id,d.company_name,GROUP_CONCAT(DISTINCT c.chart_permission_id) AS chart_permission_ids
-FROM
-	company_approval a
-	INNER JOIN company_contract b ON a.company_contract_id = b.company_contract_id
-	INNER JOIN company_report_permission c ON a.company_id = c.company_id 
-	INNER JOIN company d ON a.company_id = d.company_id
-WHERE
-	a.apply_method = 1 
-	AND a.product_id = 2 
-	AND a.approve_status = '已审批' 
-	AND b.product_id = 2 
-	AND c.product_id = 2
-	AND c.is_upgrade = 1
-	GROUP BY d.company_id `
-	_, err = o.Raw(sql).QueryRows(&item)
-	return
-}
-
-// 批量添加
-func AddCygxActivitySpecialTripBillMulti(items []*CygxActivitySpecialTripBill) (err error) {
-	o := orm.NewOrm()
-	if len(items) > 0 {
-		//批量添加
-		_, err = o.InsertMulti(len(items), items)
 	}
-	return
-}
-
-type SpecialBillInitReduce struct {
-	CreateTime  time.Time
-	CompanyId   int
-	CompanyName string
-}
-
-func GetActivitySecialTirpBillForReduce() (item []*SpecialBillInitReduce, err error) {
 	o := orm.NewOrm()
-	sql := ` SELECT
+	sql := `SELECT * FROM cygx_activity_special_trip_bill  WHERE 1 = 1  ` + condition
-	a.create_time,a.company_id,c.company_name 
+	err = o.Raw(sql, pars).QueryRow(&item)
-FROM
-	company_operation_record a
-	INNER JOIN company c ON a.company_id = c.company_id
-	INNER JOIN company_report_permission e ON a.company_id = e.company_id 
-WHERE
-	a.operation = 'try_out' 
-	AND a.product_id = 2 
-	AND e.status NOT IN ('正式','永续')
-	GROUP BY a.company_id `
-	_, err = o.Raw(sql).QueryRows(&item)
-	return
-}
-
-func GetCygxActivitySpecialTripBillForInit() (item []*CygxActivitySpecialTripBill, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT * FROM cygx_activity_special_trip_bill GROUP BY company_id `
-	_, err = o.Raw(sql).QueryRows(&item)
-	return
-}
-
-func GetCygxActivitySpecialTripBillByCompanyIdForInit(companyId int) (item []*CygxActivitySpecialTripBill, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT * FROM cygx_activity_special_trip_bill WHERE company_id = ? ORDER BY create_time DESC  `
-	_, err = o.Raw(sql, companyId).QueryRows(&item)
-	return
-}
-
-func UpdateCygxActivitySpecialTripBillByCompanyIdForInit(total string, id int) (err error) {
-	o := orm.NewOrm()
-	sql := ` UPDATE cygx_activity_special_trip_bill SET total=? WHERE id = ?  `
-	_, err = o.Raw(sql, total, id).Exec()
 	return
 }
 
@@ -198,3 +102,37 @@ func GetCygxActivitySpecialTripBillLastDetialByActivityId(activityId, userId int
 	err = o.Raw(sql, activityId, userId).QueryRow(&item)
 	return
 }
+
+// AddCygxActivitySpecialTripBillMulti 批量添加
+func AddCygxActivitySpecialTripBillMulti(items []*CygxActivitySpecialTripBill, itemsUpdate []*CygxActivitySpecialPermissionPoints) (err error) {
+	o, err := orm.NewOrm().Begin()
+	if err != nil {
+		return
+	}
+	defer func() {
+		if err == nil {
+			o.Commit()
+		} else {
+			o.Rollback()
+		}
+	}()
+	if len(items) > 0 {
+		//批量添加流水信息
+		_, err = o.InsertMulti(len(items), items)
+	}
+	//批量修改公司剩余点数
+	p, err := o.Raw("UPDATE cygx_activity_special_permission_points SET points = ?, modify_time = ? WHERE company_id = ?").Prepare()
+	if err != nil {
+		return
+	}
+	defer func() {
+		_ = p.Close() // 别忘记关闭 statement
+	}()
+	for _, v := range itemsUpdate {
+		_, err = p.Exec(v.Points, v.ModifyTime, v.CompanyId)
+		if err != nil {
+			return
+		}
+	}
+	return
+}

services/activity_points.go

@@ -229,7 +229,7 @@ func YanXuanActivityPointsBillSignupAddReduce(log models.YanXuanActivityPointsRe
 	}
 	companyId := user.CompanyId
 	//判断公司是不是满足扣点情况，如果是后台超管手动给试用客户报名，就写入一条点数初始化数据
-	total, e := models.GetCygxActivityPointsCompanyCountByCompanyId(companyId)
+	total, e := models.GetCygxActivitySpecialPermissionPointsCountByCompanyId(companyId)
 	if e != nil {
 		err = errors.New("GetCygxActivityPointsCompanyCountByCompanyId, Err: " + e.Error())
 		return
@@ -237,31 +237,30 @@ func YanXuanActivityPointsBillSignupAddReduce(log models.YanXuanActivityPointsRe
 	var companyPointsNum float64
 	if total == 0 {
 		companyPointsNum = 0
-		itemPointsCompany := new(models.CygxActivityPointsCompany)
+		itemPointsCompany := new(models.CygxActivitySpecialPermissionPoints)
 
 		itemPointsCompany.CompanyId = companyId
 		itemPointsCompany.CompanyName = user.CompanyName
 		itemPointsCompany.CreateTime = time.Now()
 		itemPointsCompany.ModifyTime = time.Now()
 
-		e = models.AddCygxActivityPointsCompany(itemPointsCompany)
+		e = models.AddCygxActivitySpecialPermissionPoints(itemPointsCompany)
 		if e != nil {
-			err = errors.New("AddCygxActivityPointsCompany, Err: " + e.Error())
+			err = errors.New("AddCygxActivitySpecialPermissionPoints, Err: " + e.Error())
 			return
 		}
 	} else {
 		// 获取用户所在公司剩余的点
-		companyPointsNum, e = models.GetCompanyPoints(user.CompanyId)
+		companyPointsNum, e = models.GetCygxActivitySpecialPermissionPoints(user.CompanyId)
 		if e != nil && e.Error() != utils.ErrNoRow() {
-			err = errors.New("GetCompanyPoints, Err: " + e.Error())
+			err = errors.New("GetCygxActivitySpecialPermissionPoints, Err: " + e.Error())
 			return
 		}
-
 	}
 
 	//获取需要添加的流水信息
-	var items []*models.CygxActivityPointsBill
+	var items []*models.CygxActivitySpecialTripBill
-	item := new(models.CygxActivityPointsBill)
+	item := new(models.CygxActivitySpecialTripBill)
 	item.UserId = user.UserId
 	item.ActivityId = activityId
 	item.CreateTime = time.Now()
@@ -277,18 +276,19 @@ func YanXuanActivityPointsBillSignupAddReduce(log models.YanXuanActivityPointsRe
 	item.ChartPermissionId = activityInfo.ChartPermissionId
 	item.DoType = 1
 	item.Content = activityInfo.ActivityName + "--报名"
-	item.Points = companyPointsNum - activityPointsSetDetail.UserPointsNum
+	item.Total = fmt.Sprint(companyPointsNum-activityPointsSetDetail.UserPointsNum, "次")
+	item.TableSource = utils.CYGX_OBJ_ACTIVITY
 	items = append(items, item)
 
 	//更新对应机构的剩余点数
-	var itemCompanys []*models.CygxActivityPointsCompany
+	var itemCompanys []*models.CygxActivitySpecialPermissionPoints
-	itemCompany := new(models.CygxActivityPointsCompany)
+	itemCompany := new(models.CygxActivitySpecialPermissionPoints)
 	itemCompany.CompanyId = user.CompanyId
-	itemCompany.Points = item.Points
+	itemCompany.Points = companyPointsNum - activityPointsSetDetail.UserPointsNum
 	itemCompany.ModifyTime = time.Now()
 	itemCompanys = append(itemCompanys, itemCompany)
 
-	err = models.AddCygxActivityPointsBillMulti(items, itemCompanys)
+	err = models.AddCygxActivitySpecialTripBillMulti(items, itemCompanys)
 	return
 }
 
@@ -333,7 +333,7 @@ func YanXuanActivityPointsBillSignupCancelReduce(log models.YanXuanActivityPoint
 	}
 
 	// 获取用户所在公司剩余的点
-	companyPointsNum, e := models.GetCompanyPoints(user.CompanyId)
+	companyPointsNum, e := models.GetCygxActivitySpecialPermissionPoints(user.CompanyId)
 	if e != nil && e.Error() != utils.ErrNoRow() {
 		err = errors.New("GetCompanyPoints, Err: " + e.Error())
 		return
@@ -344,15 +344,15 @@ func YanXuanActivityPointsBillSignupCancelReduce(log models.YanXuanActivityPoint
 	var pars []interface{}
 	condition += ` AND activity_id = ? AND user_id = ?  AND bill_detailed < 0   ORDER BY id DESC LIMIT 1  `
 	pars = append(pars, activityId, userId)
-	activityPointsBillDetail, e := models.GetCygxActivityPointsBillDetailByCondition(condition, pars)
+	activityPointsBillDetail, e := models.GetCygxActivitySpecialTripBillByCondition(condition, pars)
 	if e != nil {
-		err = errors.New("activityPointsBillDetail" + e.Error())
+		err = errors.New("GetCygxActivitySpecialTripBillByCondition" + e.Error())
 		return
 	}
 
 	//获取需要添加的流水信息
-	var items []*models.CygxActivityPointsBill
+	var items []*models.CygxActivitySpecialTripBill
-	item := new(models.CygxActivityPointsBill)
+	item := new(models.CygxActivitySpecialTripBill)
 	item.UserId = user.UserId
 	item.ActivityId = activityId
 	item.CreateTime = time.Now()
@@ -361,25 +361,26 @@ func YanXuanActivityPointsBillSignupCancelReduce(log models.YanXuanActivityPoint
 	item.CompanyId = user.CompanyId
 	item.CompanyName = user.CompanyName
 	item.RealName = user.RealName
-	item.BillDetailed = -activityPointsBillDetail.BillDetailed
+	item.BillDetailed = -activityPointsSetDetail.UserPointsNum
 	item.RegisterPlatform = log.RegisterPlatform
 	item.AdminId = log.AdminId
 	item.Source = log.Source
 	item.ChartPermissionId = activityInfo.ChartPermissionId
 	item.DoType = 2
 	item.Content = activityInfo.ActivityName + "--取消报名"
-	item.Points = companyPointsNum - activityPointsBillDetail.BillDetailed
+	item.Total = fmt.Sprint(companyPointsNum-activityPointsBillDetail.BillDetailed, "次")
+	item.TableSource = utils.CYGX_OBJ_ACTIVITY
 	items = append(items, item)
 
 	//更新对应机构的剩余点数
-	var itemCompanys []*models.CygxActivityPointsCompany
+	var itemCompanys []*models.CygxActivitySpecialPermissionPoints
-	itemCompany := new(models.CygxActivityPointsCompany)
+	itemCompany := new(models.CygxActivitySpecialPermissionPoints)
 	itemCompany.CompanyId = user.CompanyId
-	itemCompany.Points = item.Points
+	itemCompany.Points = companyPointsNum - activityPointsSetDetail.UserPointsNum
 	itemCompany.ModifyTime = time.Now()
 	itemCompanys = append(itemCompanys, itemCompany)
 
-	err = models.AddCygxActivityPointsBillMulti(items, itemCompanys)
+	err = models.AddCygxActivitySpecialTripBillMulti(items, itemCompanys)
 	return
 }
 

services/activity_signup.go

@@ -98,7 +98,7 @@ func CheckActivityPoints(activityInfo *models.ActivityDetail, wxUser *models.WxU
 			return
 		}
 		// 获取用户所在公司剩余的点
-		companyPointsNum, e := models.GetCompanyPoints(wxUser.CompanyId)
+		companyPointsNum, e := models.GetCygxActivitySpecialPermissionPoints(wxUser.CompanyId)
 		if e != nil && e.Error() != utils.ErrNoRow() {
 			err = errors.New("GetCompanyPoints, Err: " + e.Error())
 			return

services/activity_special_trip.go

@@ -238,7 +238,7 @@ func DeductTripRemainingtimesByUser(user *models.WxUserItem, activityInfo *model
 	var condition string
 	var pars []interface{}
 	var maxChartPermissionId int // 剩余点数最多的行业
-	var points int               // 剩余点数
+	var points float64           // 剩余点数
 	var activitySpecialPermissionPointsList []*models.CygxActivitySpecialPermissionPoints
 	//永续客户不限次数需要单独处理
 	if companyProduct.Status == utils.COMPANY_STATUS_FOREVER {
@@ -334,7 +334,7 @@ func RebateTripRemainingtimesByUser(user *models.WxUserItem, activityInfo *model
 	}
 
 	var maxChartPermissionId int // 剩余点数最多的行业(返点行业)
-	var points int               // 剩余点数
+	var points float64           // 剩余点数
 	for _, v := range activitySpecialPermissionPointsList {
 		maxChartPermissionId = v.ChartPermissionId
 		points = v.Points + 1
@@ -369,7 +369,7 @@ func HandleActivitySpecialTripBillTotalText(companyId int) (totalText string, er
 	}
 	//永续客户次数累加
 	if companyDetail.Status == utils.COMPANY_STATUS_FOREVER {
-		var points int
+		var points float64
 		for _, v := range activitySpecialPermissionPointsList {
 			points += v.Points
 		}

services/init_10.9.1.go

@@ -1,281 +0,0 @@
-package services
-
-import (
-	"errors"
-	"fmt"
-	"hongze/hongze_cygx/models"
-	"hongze/hongze_cygx/utils"
-	"strconv"
-	"strings"
-)
-
-// 大套餐的
-func InitActivitySpecialTripBillBig() (err error) {
-	defer func() {
-		if err != nil {
-			fmt.Println(err)
-		}
-	}()
-	// 70w 16次
-	list70, err := models.GetActivitySecialTirpBillForInit(1)
-	if err != nil {
-		return
-	}
-	items70 := make([]*models.CygxActivitySpecialTripBill, 0)
-	for _, v := range list70 {
-		itemBill := new(models.CygxActivitySpecialTripBill)
-		itemBill.CreateTime = v.ApprovalTime
-		itemBill.CompanyId = v.CompanyId
-		itemBill.CompanyName = v.CompanyName
-		itemBill.Source = 2
-		itemBill.DoType = 2
-		itemBill.Way = 3
-		itemBill.Content = "70w大套餐转正"
-		itemBill.BillDetailed = 16
-		itemBill.Total = strconv.Itoa(itemBill.BillDetailed) + "次"
-		items70 = append(items70, itemBill)
-		fmt.Println("CompanyId: ", v.CompanyId)
-		fmt.Println("CompanyName: ", v.CompanyName)
-	}
-	err = models.AddCygxActivitySpecialTripBillMulti(items70)
-	if err != nil {
-		return
-	}
-
-	// 45w 10次
-	list45, err := models.GetActivitySecialTirpBillForInit(2)
-	if err != nil {
-		return
-	}
-	items45 := make([]*models.CygxActivitySpecialTripBill, 0)
-	for _, v := range list45 {
-		itemBill := new(models.CygxActivitySpecialTripBill)
-		itemBill.CreateTime = v.ApprovalTime
-		itemBill.CompanyId = v.CompanyId
-		itemBill.CompanyName = v.CompanyName
-		itemBill.Source = 2
-		itemBill.DoType = 2
-		itemBill.Way = 3
-		itemBill.Content = "45w大套餐转正"
-		itemBill.BillDetailed = 10
-		itemBill.Total = strconv.Itoa(itemBill.BillDetailed) + "次"
-		items45 = append(items45, itemBill)
-		fmt.Println("CompanyId: ", v.CompanyId)
-		fmt.Println("CompanyName: ", v.CompanyName)
-	}
-	err = models.AddCygxActivitySpecialTripBillMulti(items45)
-	if err != nil {
-		return
-	}
-	return
-}
-
-// 非大套餐的，根据行业权限添加
-func InitActivitySpecialTripBillNotBig() (err error) {
-	defer func() {
-		if err != nil {
-			fmt.Println(err)
-		}
-	}()
-	list, err := models.GetActivitySecialTirpBillForInitNotBig()
-	if err != nil {
-		return
-	}
-	items := make([]*models.CygxActivitySpecialTripBill, 0)
-	for _, item := range list {
-		chartPermissionIdSlice := strings.Split(item.ChartPermissionIds, ",")
-
-		mapChartName := make(map[string]int)
-		mapPermissionNameTrip := make(map[string]int)
-
-		chartList, e := models.GetChartPermissionByIds(chartPermissionIdSlice)
-		if e != nil {
-			err = errors.New("获取品种信息失败, Err:" + e.Error())
-			return
-		}
-
-		for _, v := range chartList {
-			mapChartName[v.PermissionName] = 5 + mapPermissionNameTrip[v.PermissionName]
-		}
-		itemBill := new(models.CygxActivitySpecialTripBill)
-		itemBill.CreateTime = item.ApprovalTime
-		itemBill.CompanyId = item.CompanyId
-		itemBill.CompanyName = item.CompanyName
-		itemBill.Source = 2
-		itemBill.DoType = 2
-		itemBill.Way = 3
-		for k, v := range mapChartName {
-			if v > 0 {
-				itemBill.BillDetailed += v
-				itemBill.Total += k + strconv.Itoa(v) + "次+"
-			}
-		}
-		itemBill.Content = "行业升级套餐转正"
-		itemBill.Total = strings.TrimRight(itemBill.Total, "+")
-		items = append(items, itemBill)
-		fmt.Println("CompanyId: ", item.CompanyId)
-		fmt.Println("CompanyName: ", item.CompanyName)
-	}
-	err = models.AddCygxActivitySpecialTripBillMulti(items)
-	if err != nil {
-		return
-	}
-	return
-}
-
-// 到期清零和加入继承表
-func ActivitySpecialCompanyTryOutReduce() (err error) {
-	defer func() {
-		if err != nil {
-			fmt.Println(err)
-		}
-	}()
-
-	list, err := models.GetActivitySecialTirpBillForReduce()
-	if err != nil {
-		return
-	}
-	for _, v := range list {
-		userType, tripRemaining, mapChartName, e := GetChartPermissionSpecialSurplusByCompanyForInit(v.CompanyId)
-		if e != nil {
-			err = e
-			fmt.Println("err :", err)
-			continue
-		}
-
-		itemBill := new(models.CygxActivitySpecialTripBill)
-		itemBill.CreateTime = v.CreateTime
-		itemBill.Source = 2
-		itemBill.DoType = 1
-		itemBill.Way = 3
-		itemBill.BillDetailed = -tripRemaining
-		itemBill.CompanyId = v.CompanyId
-		itemBill.CompanyName = v.CompanyName
-		itemBill.Content = "到期清零"
-		itemBill.Total = "0"
-		if tripRemaining == 0 {
-			continue
-		}
-		err = models.AddCygxActivitySpecialTripBill(itemBill)
-		if err != nil {
-			return
-		}
-		fmt.Println("CompanyId: ", v.CompanyId)
-		fmt.Println("CompanyName: ", v.CompanyName)
-		// 删除公司之前的继承表
-		err = models.DelCygxActivitySpecialInheritPointsByCompanyId(v.CompanyId)
-		if err != nil {
-			return
-		}
-		chartMap := map[string]int{utils.YI_YAO_NAME: utils.YI_YAO_ID, utils.XIAO_FEI_NAME: utils.XIAO_FEI_ID, utils.KE_JI_NAME: utils.KE_JI_ID, utils.ZHI_ZAO_NAME: utils.ZHI_ZAO_ID}
-		//添加继承点数表
-		inheritItems := make([]*models.CygxActivitySpecialInheritPointsCompany, 0)
-		if userType == 2 {
-			inheritItem := new(models.CygxActivitySpecialInheritPointsCompany)
-			inheritItem.CompanyId = v.CompanyId
-			inheritItem.CompanyName = v.CompanyName
-			inheritItem.CreateTime = v.CreateTime
-			inheritItem.ModifyTime = v.CreateTime
-			inheritItem.Points = tripRemaining
-			if tripRemaining > 0 {
-				inheritItems = append(inheritItems, inheritItem)
-			}
-		} else {
-			for k, num := range mapChartName {
-				inheritItem := new(models.CygxActivitySpecialInheritPointsCompany)
-				inheritItem.CompanyId = v.CompanyId
-				inheritItem.CompanyName = v.CompanyName
-				inheritItem.CreateTime = v.CreateTime
-				inheritItem.ModifyTime = v.CreateTime
-				inheritItem.Points = num
-				inheritItem.ChartPermissionName = k
-				if _, ok := chartMap[k]; ok {
-					inheritItem.ChartPermissionId = chartMap[k]
-				}
-				if num > 0 {
-					inheritItems = append(inheritItems, inheritItem)
-				}
-			}
-		}
-		if len(inheritItems) > 0 {
-			err = models.AddCygxActivitySpecialInheritPointsCompanyMulti(inheritItems)
-			if err != nil {
-				return
-			}
-		}
-	}
-
-	return
-}
-
-// 补充total
-func ActivitySpecialBillTotalInit() (err error) {
-	defer func() {
-		if err != nil {
-			fmt.Println(err)
-		}
-	}()
-
-	billList, err := models.GetCygxActivitySpecialTripBillForInit()
-	if err != nil {
-		return
-	}
-	chartMap := map[int]string{utils.YI_YAO_ID: utils.YI_YAO_NAME, utils.XIAO_FEI_ID: utils.XIAO_FEI_NAME, utils.KE_JI_ID: utils.KE_JI_NAME, utils.ZHI_ZAO_ID: utils.ZHI_ZAO_NAME}
-
-	for _, billItem := range billList {
-		userType, tripRemaining, mapChartName, e := GetChartPermissionSpecialSurplusByCompanyForInitTotal(billItem.CompanyId)
-		if e != nil {
-			err = e
-			continue
-		}
-		fmt.Println("CompanyId: ", billItem.CompanyId)
-		fmt.Println("CompanyName: ", billItem.CompanyName)
-		list, e := models.GetCygxActivitySpecialTripBillByCompanyIdForInit(billItem.CompanyId)
-		if e != nil {
-			err = e
-			return
-		}
-
-		if userType == 2 {
-			for i, v := range list {
-				if v.ActivityId == 0 {
-					continue
-				}
-				if i == 0 {
-					v.Total = strconv.Itoa(tripRemaining) + "次"
-				} else {
-					v.Total = strconv.Itoa(tripRemaining+v.BillDetailed) + "次"
-				}
-
-				fmt.Println("v.Total:",v.Total)
-				err = models.UpdateCygxActivitySpecialTripBillByCompanyIdForInit(v.Total, v.Id)
-				if err != nil {
-					return
-				}
-			}
-		} else {
-			for i, v := range list {
-				if chart, ok := chartMap[v.ChartPermissionId]; ok {
-					v.Total = ``
-					for k, num := range mapChartName {
-						if k == chart {
-							if i > 0 {
-								num += v.BillDetailed
-							}
-						}
-						v.Total += k + strconv.Itoa(num) + "次+"
-					}
-					v.Total = strings.TrimRight(v.Total, "+")
-					fmt.Println("v.Total:",v.Total)
-					err = models.UpdateCygxActivitySpecialTripBillByCompanyIdForInit(v.Total, v.Id)
-					if err != nil {
-						return
-					}
-				}
-			}
-		}
-
-	}
-
-	return
-}