Merge branch 'cygx/cygx_14_5' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/report_selection.go

@@ -46,7 +46,7 @@ func (this *ReportSelectionController) Detail() {
 		isBestNew = true
 		if isBestNew {
 			tbdb := "cygx_report_selection"
-			condition := ` AND publish_status = 1  `
+			condition := ` AND publish_status = 1    `
 			var pars []interface{}
 			list, err := models.GetReportSelectionListPublic(condition, "1", tbdb, pars, 0, 1)
 			if err != nil {
@@ -97,6 +97,13 @@ func (this *ReportSelectionController) Detail() {
 		resp.IsShow = true
 	}
 	resp.HasPermission = hasPermission
+	if !resp.IsShow {
+		br.Ret = 201
+		br.Success = true
+		br.Msg = "获取成功"
+		br.Data = resp
+		return
+	}
 	if hasPermission != 1 || !resp.IsShow {
 		resp.Detail = detail
 		br.Ret = 200

models/report_selection_subject_history.go

@@ -19,7 +19,6 @@ type CygxReportSelectionSubjectHistory struct {
 	IndustrialManagementId int       `description:"产业Id"`
 	RegisterPlatform       int       `description:"来源 1小程序，2：网页"`
 	ThirdId                int       `description:"类似产业、标的的三方ID"`
-	LableName              string    `description:"标签名称"`
 }
 
 type AddCygxReportSelectionSubjectHistoryReq struct {

services/activity_points.go

@@ -167,15 +167,15 @@ func YanXuanActivityPointsBillReduce() (err error) {
 				go YanXuanActivityPointsBillSubmitMeetingReduce(log)
 				fmt.Println("5：活动到会研选扣点处理。")
 			case 6:
-				go YanXuanCompanyApprovalReduce(log)
+				//go YanXuanCompanyApprovalReduce(log)
 				fmt.Println("6：研选审批通过的时候研选扣点更新。")
 				break
 			case 7:
-				go YanXuanCompanyCompanyTryOutReduce(log)
+				//go YanXuanCompanyCompanyTryOutReduce(log)
 				fmt.Println("7：正式专试用定时任务更新研选扣点。")
 				break
 			case 8:
-				go YanXuanActivityVivoPointsBillSignupReduce(log)
+				//go YanXuanActivityVivoPointsBillSignupReduce(log)
 				fmt.Println("8：播放研选扣点音视频。")
 				break
 			default:
@@ -343,7 +343,7 @@ func YanXuanActivityPointsBillSignupCancelReduce(log models.YanXuanActivityPoint
 	//查询最新的一条针对这个用户的扣点记录
 	var condition string
 	var pars []interface{}
-	condition += ` AND activity_id = ? AND user_id = ?  AND bill_detailed < 0   ORDER BY id DESC LIMIT 1  `
+	condition += ` AND activity_id = ? AND user_id = ? AND table_source = 'activity'  AND bill_detailed < 0   ORDER BY id DESC LIMIT 1  `
 	pars = append(pars, activityId, userId)
 	activityPointsBillDetail, e := models.GetCygxActivitySpecialTripBillByCondition(condition, pars)
 	if e != nil {
@@ -434,17 +434,17 @@ func YanXuanActivityPointsBillActivityEditReduce(log models.YanXuanActivityPoint
 	//查询最新的一条针对这个公司的扣点记录
 	var condition string
 	var pars []interface{}
-	condition += ` AND activity_id = ? AND company_id = ? AND mobile = '' AND bill_detailed < 0   ORDER BY id DESC LIMIT 1  `
+	condition += ` AND activity_id = ? AND company_id = ? AND mobile = ''  AND table_source = 'activity'  AND bill_detailed < 0   ORDER BY id DESC LIMIT 1  `
 	pars = append(pars, activityId, comapnyId)
-	activityPointsBillDetail, e := models.GetCygxActivityPointsBillDetailByCondition(condition, pars)
+	activityPointsBillDetail, e := models.GetCygxActivitySpecialTripBillByCondition(condition, pars)
 	if e != nil && e.Error() != utils.ErrNoRow() {
 		err = errors.New("GetCompanyPoints, Err: " + e.Error())
 		return
 	}
-	var items []*models.CygxActivityPointsBill
-	item := new(models.CygxActivityPointsBill)
-	var itemCompanys []*models.CygxActivityPointsCompany
-	itemCompany := new(models.CygxActivityPointsCompany)
+	var items []*models.CygxActivitySpecialTripBill
+	item := new(models.CygxActivitySpecialTripBill)
+	var itemCompanys []*models.CygxActivitySpecialPermissionPoints
+	itemCompany := new(models.CygxActivitySpecialPermissionPoints)
 
 	if activityPointsBillDetail == nil { //如果是空的就添加
 		//获取需要添加的流水信息
@@ -463,17 +463,19 @@ func YanXuanActivityPointsBillActivityEditReduce(log models.YanXuanActivityPoint
 		item.ChartPermissionId = activityInfo.ChartPermissionId
 		item.DoType = 1
 		item.Content = activityInfo.ActivityName + "--办会"
-		item.Points = companyPointsNum - activityPointsSetDetail.CompanyPointsNum
+		//item.Points = companyPointsNum - activityPointsSetDetail.CompanyPointsNum
+		item.Total = fmt.Sprint(companyPointsNum-activityPointsSetDetail.CompanyPointsNum, "次")
+		item.TableSource = utils.CYGX_OBJ_ACTIVITY
 		items = append(items, item)
 
 		//更新对应机构的剩余点数
 		itemCompany.CompanyId = comapny.CompanyId
-		itemCompany.Points = item.Points
+		itemCompany.Points = companyPointsNum - activityPointsSetDetail.CompanyPointsNum
 		itemCompany.ModifyTime = time.Now()
 		itemCompanys = append(itemCompanys, itemCompany)
-		e = models.AddCygxActivityPointsBillMulti(items, itemCompanys)
+		e = models.AddCygxActivitySpecialTripBillMulti(items, itemCompanys)
 		if e != nil && e.Error() != utils.ErrNoRow() {
-			err = errors.New("AddCygxActivityPointsBillMulti, Err: " + e.Error())
+			err = errors.New("AddCygxActivitySpecialTripBillMulti, Err: " + e.Error())
 			return
 		}
 	} else {
@@ -481,17 +483,17 @@ func YanXuanActivityPointsBillActivityEditReduce(log models.YanXuanActivityPoint
 		if activityPointsSetDetail.CompanyPointsNum != -activityPointsBillDetail.BillDetailed {
 			item.Id = activityPointsBillDetail.Id
 			item.BillDetailed = -activityPointsSetDetail.CompanyPointsNum
-			item.Points = companyPointsNum - activityPointsBillDetail.BillDetailed - activityPointsSetDetail.CompanyPointsNum
+			item.Total = fmt.Sprint(companyPointsNum-activityPointsBillDetail.BillDetailed-activityPointsSetDetail.CompanyPointsNum, "次")
 			items = append(items, item)
 
 			//更新对应机构的剩余点数
 			itemCompany.CompanyId = comapny.CompanyId
-			itemCompany.Points = item.Points
+			itemCompany.Points = companyPointsNum - activityPointsBillDetail.BillDetailed - activityPointsSetDetail.CompanyPointsNum
 			itemCompany.ModifyTime = time.Now()
 			itemCompanys = append(itemCompanys, itemCompany)
-			e = models.UpdateCygxActivityPointsBillMulti(items, itemCompanys)
+			e = models.AddCygxActivitySpecialTripBillMulti(items, itemCompanys)
 			if e != nil && e.Error() != utils.ErrNoRow() {
-				err = errors.New("UpdateCygxActivityPointsBillMulti, Err: " + e.Error())
+				err = errors.New("AddCygxActivitySpecialTripBillMulti, Err: " + e.Error())
 				return
 			}
 		}
@@ -533,9 +535,9 @@ func YanXuanActivityPointsBillActivityPublishAndCancelReduce(log models.YanXuanA
 	}
 
 	comapnyId := activityPointsSetDetail.CompanyId
-	var items []*models.CygxActivityPointsBill
+	var items []*models.CygxActivitySpecialTripBill
 
-	var itemCompanys []*models.CygxActivityPointsCompany
+	var itemCompanys []*models.CygxActivitySpecialPermissionPoints
 	mapCompanyPoints := make(map[int]float64) //一组公司的剩余点数
 	if publishStatus == 1 {
 		fmt.Println("//活动发布")
@@ -551,7 +553,7 @@ func YanXuanActivityPointsBillActivityPublishAndCancelReduce(log models.YanXuanA
 				err = errors.New("GetCompanyPoints, Err: " + e.Error())
 				return
 			}
-			item := new(models.CygxActivityPointsBill)
+			item := new(models.CygxActivitySpecialTripBill)
 			item.ActivityId = activityId
 			item.CreateTime = time.Now()
 			//item.Mobile = user.Mobile
@@ -564,18 +566,21 @@ func YanXuanActivityPointsBillActivityPublishAndCancelReduce(log models.YanXuanA
 			item.AdminId = log.AdminId
 			item.Source = log.Source
 			item.ChartPermissionId = activityInfo.ChartPermissionId
+			item.ChartPermissionName = activityInfo.ChartPermissionName
 			item.DoType = 1
 			item.Content = activityInfo.ActivityName + "--办会"
-			item.Points = companyPointsNum - activityPointsSetDetail.CompanyPointsNum
+			//item.Points = companyPointsNum - activityPointsSetDetail.CompanyPointsNum
+			item.Total = fmt.Sprint(companyPointsNum-activityPointsSetDetail.CompanyPointsNum, "次")
+			item.TableSource = utils.CYGX_OBJ_ACTIVITY
 			items = append(items, item)
 
 			//更新对应机构的剩余点数
-			itemCompany := new(models.CygxActivityPointsCompany)
+			itemCompany := new(models.CygxActivitySpecialPermissionPoints)
 			itemCompany.CompanyId = comapny.CompanyId
-			itemCompany.Points = item.Points
+			itemCompany.Points = companyPointsNum - activityPointsSetDetail.CompanyPointsNum
 			itemCompany.ModifyTime = time.Now()
 			itemCompanys = append(itemCompanys, itemCompany)
-			mapCompanyPoints[comapnyId] = item.Points
+			mapCompanyPoints[comapnyId] = companyPointsNum - activityPointsSetDetail.CompanyPointsNum
 		}
 
 		if activityPointsSetDetail.UserPointsNum > 0 && activityPointsSetDetail.PointsType == 1 {
@@ -600,9 +605,9 @@ func YanXuanActivityPointsBillActivityPublishAndCancelReduce(log models.YanXuanA
 				pars = append(pars, companyIds)
 
 				//获取这些公司剩余的点数
-				conpanyList, e := models.GetCygxActivityPointsCompanyList(condition, pars)
+				conpanyList, e := models.GetCygxActivitySpecialPermissionPointsList(condition, pars)
 				if e != nil && e.Error() != utils.ErrNoRow() {
-					err = errors.New("GetCygxActivityPointsCompanyList, Err: " + e.Error())
+					err = errors.New("GetCygxActivitySpecialPermissionPointsList, Err: " + e.Error())
 					return
 				}
 
@@ -613,7 +618,7 @@ func YanXuanActivityPointsBillActivityPublishAndCancelReduce(log models.YanXuanA
 				}
 
 				for _, user := range listSignup {
-					item := new(models.CygxActivityPointsBill)
+					item := new(models.CygxActivitySpecialTripBill)
 					item.ActivityId = activityId
 					item.CreateTime = time.Now()
 					item.Mobile = user.Mobile
@@ -630,16 +635,18 @@ func YanXuanActivityPointsBillActivityPublishAndCancelReduce(log models.YanXuanA
 					item.DoType = 1
 					item.Content = activityInfo.ActivityName + "--发布活动"
 					mapCompanyPoints[user.CompanyId] -= activityPointsSetDetail.UserPointsNum //通过map处理机构剩余点数
-					item.Points = mapCompanyPoints[user.CompanyId]
+					//item.Points = mapCompanyPoints[user.CompanyId]
+					item.Total = fmt.Sprint(mapCompanyPoints[user.CompanyId], "次")
+					item.TableSource = utils.CYGX_OBJ_ACTIVITY
 					items = append(items, item)
 
 					//更新对应机构的剩余点数
-					itemCompany := new(models.CygxActivityPointsCompany)
+					itemCompany := new(models.CygxActivitySpecialPermissionPoints)
 					itemCompany.CompanyId = user.CompanyId
-					itemCompany.Points = item.Points
+					itemCompany.Points = mapCompanyPoints[user.CompanyId]
 					itemCompany.ModifyTime = time.Now()
 					itemCompanys = append(itemCompanys, itemCompany)
-					mapCompanyPoints[user.CompanyId] = item.Points
+					mapCompanyPoints[user.CompanyId] = mapCompanyPoints[user.CompanyId]
 				}
 			}
 		}
@@ -660,7 +667,7 @@ func YanXuanActivityPointsBillActivityPublishAndCancelReduce(log models.YanXuanA
 				err = errors.New("GetCompanyPoints, Err: " + e.Error())
 				return
 			}
-			item := new(models.CygxActivityPointsBill)
+			item := new(models.CygxActivitySpecialTripBill)
 			item.ActivityId = activityId
 			item.CreateTime = time.Now()
 			//item.Mobile = user.Mobile
@@ -675,15 +682,17 @@ func YanXuanActivityPointsBillActivityPublishAndCancelReduce(log models.YanXuanA
 			item.ChartPermissionId = activityInfo.ChartPermissionId
 			item.DoType = 2
 			item.Content = activityInfo.ActivityName + "--取消办会"
-			item.Points = companyPointsNum + activityPointsSetDetail.CompanyPointsNum
+			//item.Points = companyPointsNum + activityPointsSetDetail.CompanyPointsNum
+			item.Total = fmt.Sprint(companyPointsNum+activityPointsSetDetail.CompanyPointsNum, "次")
+			item.TableSource = utils.CYGX_OBJ_ACTIVITY
 			items = append(items, item)
 			//更新对应机构的剩余点数
-			itemCompany := new(models.CygxActivityPointsCompany)
+			itemCompany := new(models.CygxActivitySpecialPermissionPoints)
 			itemCompany.CompanyId = comapny.CompanyId
-			itemCompany.Points = item.Points
+			itemCompany.Points = companyPointsNum + activityPointsSetDetail.CompanyPointsNum
 			itemCompany.ModifyTime = time.Now()
 			itemCompanys = append(itemCompanys, itemCompany)
-			mapCompanyPoints[comapnyId] = item.Points
+			mapCompanyPoints[comapnyId] = companyPointsNum + activityPointsSetDetail.CompanyPointsNum
 		}
 
 		if activityPointsSetDetail.UserPointsNum > 0 && activityPointsSetDetail.PointsType == 1 {
@@ -708,9 +717,9 @@ func YanXuanActivityPointsBillActivityPublishAndCancelReduce(log models.YanXuanA
 				pars = append(pars, companyIds)
 
 				//获取这些公司剩余的点数
-				conpanyList, e := models.GetCygxActivityPointsCompanyList(condition, pars)
+				conpanyList, e := models.GetCygxActivitySpecialPermissionPointsList(condition, pars)
 				if e != nil && e.Error() != utils.ErrNoRow() {
-					err = errors.New("GetCygxActivityPointsCompanyList, Err: " + e.Error())
+					err = errors.New("GetCygxActivitySpecialPermissionPointsList, Err: " + e.Error())
 					return
 				}
 
@@ -724,21 +733,20 @@ func YanXuanActivityPointsBillActivityPublishAndCancelReduce(log models.YanXuanA
 				condition = ` AND activity_id = ?   `
 				pars = append(pars, activityId)
 				//获取扣点的流水记录
-				activityPointsBillList, e := models.GetCygxActivityPointsBillList(condition, pars)
+				activityPointsBillList, e := models.GetCygxActivitySpecialTripBill(condition, pars)
 				if e != nil && e.Error() != utils.ErrNoRow() {
-					err = errors.New("GetCygxActivityPointsBillList" + e.Error())
+					err = errors.New("GetCygxActivitySpecialTripBill" + e.Error())
 					return
 				}
 				mapUserBill := make(map[int]bool)
 				for _, v := range activityPointsBillList {
 					mapUserBill[v.UserId] = true
 				}
-
 				for _, user := range listSignup {
 					if !mapUserBill[user.UserId] {
 						continue // 如果用户的扣点记录不存在，那么就不进行返点处理
 					}
-					item := new(models.CygxActivityPointsBill)
+					item := new(models.CygxActivitySpecialTripBill)
 					item.ActivityId = activityId
 					item.CreateTime = time.Now()
 					item.Mobile = user.Mobile
@@ -755,23 +763,27 @@ func YanXuanActivityPointsBillActivityPublishAndCancelReduce(log models.YanXuanA
 					item.DoType = 2
 					item.Content = activityInfo.ActivityName + "--取消活动"
 					mapCompanyPoints[user.CompanyId] += activityPointsSetDetail.UserPointsNum //通过map处理机构剩余点数
-					item.Points = mapCompanyPoints[user.CompanyId]
+					//item.Points = mapCompanyPoints[user.CompanyId]
+
+					item.Total = fmt.Sprint(mapCompanyPoints[user.CompanyId], "次")
+					item.TableSource = utils.CYGX_OBJ_ACTIVITY
+
 					items = append(items, item)
 
 					//更新对应机构的剩余点数
-					itemCompany := new(models.CygxActivityPointsCompany)
+					itemCompany := new(models.CygxActivitySpecialPermissionPoints)
 					itemCompany.CompanyId = user.CompanyId
-					itemCompany.Points = item.Points
+					itemCompany.Points = mapCompanyPoints[user.CompanyId]
 					itemCompany.ModifyTime = time.Now()
 					itemCompanys = append(itemCompanys, itemCompany)
-					mapCompanyPoints[user.CompanyId] = item.Points
+					//mapCompanyPoints[user.CompanyId] = item.Points
 				}
 			}
 		}
 	}
-	e = models.AddCygxActivityPointsBillMulti(items, itemCompanys)
+	e = models.AddCygxActivitySpecialTripBillMulti(items, itemCompanys)
 	if e != nil && e.Error() != utils.ErrNoRow() {
-		err = errors.New("AddCygxActivityPointsBillMulti, Err: " + e.Error())
+		err = errors.New("AddCygxActivitySpecialTripBillMulti, Err: " + e.Error())
 		return
 	}
 	return
@@ -817,7 +829,7 @@ func YanXuanActivityPointsBillSubmitMeetingReduce(log models.YanXuanActivityPoin
 	mapCompanyPoints := make(map[int]float64) //一组公司的剩余点数
 	var condition string
 	var pars []interface{}
-	condition += ` AND activity_id = ? AND  is_meeting = 1 `
+	condition += ` AND activity_id = ?  `
 	pars = append(pars, activityId)
 
 	//获取提交到会的人员信息
@@ -834,22 +846,22 @@ func YanXuanActivityPointsBillSubmitMeetingReduce(log models.YanXuanActivityPoin
 
 		companyId := v.CompanyId
 		//判断公司是不是满足扣点情况，如果是后台超管手动给试用客户报名，就写入一条点数初始化数据
-		total, e := models.GetCygxActivityPointsCompanyCountByCompanyId(companyId)
+		total, e := models.GetCygxActivitySpecialPermissionPointsCountByCompanyId(companyId)
 		if e != nil {
-			err = errors.New("GetCygxActivityPointsCompanyCountByCompanyId, Err: " + e.Error())
+			err = errors.New("GetCygxActivitySpecialPermissionPointsCountByCompanyId, Err: " + e.Error())
 			return
 		}
 
 		if total == 0 {
-			itemPointsCompany := new(models.CygxActivityPointsCompany)
+			itemPointsCompany := new(models.CygxActivitySpecialPermissionPoints)
 			itemPointsCompany.CompanyId = companyId
 			itemPointsCompany.CompanyName = v.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
 			}
 		}
@@ -860,24 +872,26 @@ func YanXuanActivityPointsBillSubmitMeetingReduce(log models.YanXuanActivityPoin
 	condition = ` AND company_id IN (` + utils.GetOrmInReplace(len(companyIds)) + `)`
 	pars = append(pars, companyIds)
 	//获取这些公司剩余的点数
-	conpanyList, e := models.GetCygxActivityPointsCompanyList(condition, pars)
+	conpanyList, e := models.GetCygxActivitySpecialPermissionPointsList(condition, pars)
 	if e != nil && e.Error() != utils.ErrNoRow() {
-		err = errors.New("GetCygxActivityPointsCompanyList, Err: " + e.Error())
+		err = errors.New("GetCygxActivitySpecialPermissionPointsList, Err: " + e.Error())
 		return
 	}
 
 	pars = make([]interface{}, 0)
-	condition = ` AND activity_id = ? AND  mobile  != ''  `
+	condition = ` AND activity_id = ? AND  mobile  != ''  ORDER BY  id DESC   `
 	pars = append(pars, activityId)
 	//获取扣点的流水记录
-	activityPointsBillList, e := models.GetCygxActivityPointsBillList(condition, pars)
+	activityPointsBillList, e := models.GetCygxActivitySpecialTripBill(condition, pars)
 	if e != nil && e.Error() != utils.ErrNoRow() {
-		err = errors.New("GetCygxActivityPointsBillList" + e.Error())
+		err = errors.New("GetCygxActivitySpecialTripBill" + e.Error())
 		return
 	}
-	mapActivityPointsBill := make(map[string]*models.CygxActivityPointsBill)
-	for _, v := range activityPointsBillList {
-		mapActivityPointsBill[v.Mobile] = v
+	mapActivityPointsBill := make(map[string]*models.CygxActivitySpecialTripBill)
+	for _, v := range activityPointsBillList { //获取这场活动，某个手机号最后一次的扣点记录
+		if mapActivityPointsBill[v.Mobile] == nil {
+			mapActivityPointsBill[v.Mobile] = v
+		}
 	}
 	//return
 	for _, v := range conpanyList {
@@ -887,10 +901,10 @@ func YanXuanActivityPointsBillSubmitMeetingReduce(log models.YanXuanActivityPoin
 	}
 
 	//return
-	var items []*models.CygxActivityPointsBill
-	var itemCompanys []*models.CygxActivityPointsCompany
+	var items []*models.CygxActivitySpecialTripBill
+	var itemCompanys []*models.CygxActivitySpecialPermissionPoints
 	for _, user := range signUpDetailList {
-		item := new(models.CygxActivityPointsBill)
+		item := new(models.CygxActivitySpecialTripBill)
 		item.ActivityId = activityId
 		item.CreateTime = time.Now()
 		item.UserId = user.UserId
@@ -903,42 +917,51 @@ func YanXuanActivityPointsBillSubmitMeetingReduce(log models.YanXuanActivityPoin
 		item.AdminId = log.AdminId
 		item.Source = log.Source
 		item.ChartPermissionId = activityInfo.ChartPermissionId
-		//如果没有扣点记录就对他们进行扣点处理
-		if mapActivityPointsBill[user.Mobile] == nil {
-			item.BillDetailed = -activityPointsSetDetail.UserPointsNum
-			item.DoType = 1
-			item.Content = activityInfo.ActivityName + "--活动到会"
-			item.Points = mapCompanyPoints[user.CompanyId] - activityPointsSetDetail.UserPointsNum
-			items = append(items, item)
-			//更新对应机构的剩余点数
-			itemCompany := new(models.CygxActivityPointsCompany)
-			itemCompany.CompanyId = user.CompanyId
-			itemCompany.Points = item.Points
-			itemCompany.ModifyTime = time.Now()
-			itemCompanys = append(itemCompanys, itemCompany)
-			mapCompanyPoints[user.CompanyId] = item.Points
+		if user.IsMeeting == 1 {
+			//如果没有扣点记录就对他们进行扣点处理
+			if mapActivityPointsBill[user.Mobile] == nil || mapActivityPointsBill[user.Mobile].BillDetailed > 0 {
+				points := mapCompanyPoints[user.CompanyId] - activityPointsSetDetail.UserPointsNum
+				item.BillDetailed = -activityPointsSetDetail.UserPointsNum
+				item.DoType = 1
+				item.Content = activityInfo.ActivityName + "--活动到会"
+				item.Total = fmt.Sprint(points, "次")
+				item.TableSource = utils.CYGX_OBJ_ACTIVITY
+				//item.Points = mapCompanyPoints[user.CompanyId] - activityPointsSetDetail.UserPointsNum
+				items = append(items, item)
+				//更新对应机构的剩余点数
+				itemCompany := new(models.CygxActivitySpecialPermissionPoints)
+				itemCompany.CompanyId = user.CompanyId
+				itemCompany.Points = points
+				itemCompany.ModifyTime = time.Now()
+				itemCompanys = append(itemCompanys, itemCompany)
+				mapCompanyPoints[user.CompanyId] = points
+			}
 		} else {
 			////第二次提交改成未到会的，对其进行返点处理
-			//if mapActivityPointsBill[user.Mobile].BillDetailed < 0 {
-			//	item.BillDetailed = activityPointsSetDetail.UserPointsNum
-			//	item.DoType = 2
-			//	item.Content = activityInfo.ActivityName + "--活动取消到会"
-			//	item.Points = mapCompanyPoints[user.CompanyId] + activityPointsSetDetail.UserPointsNum
-			//	items = append(items, item)
-			//
-			//	//更新对应机构的剩余点数
-			//	itemCompany := new(models.CygxActivityPointsCompany)
-			//	itemCompany.CompanyId = user.CompanyId
-			//	itemCompany.Points = item.Points
-			//	itemCompany.ModifyTime = time.Now()
-			//	itemCompanys = append(itemCompanys, itemCompany)
-			//	mapCompanyPoints[user.CompanyId] = item.Points
-			//}
+			if mapActivityPointsBill[user.Mobile] != nil && mapActivityPointsBill[user.Mobile].BillDetailed < 0 {
+				fmt.Println("取消到会了")
+				points := mapCompanyPoints[user.CompanyId] + activityPointsSetDetail.UserPointsNum
+				item.BillDetailed = activityPointsSetDetail.UserPointsNum
+				item.DoType = 2
+				item.Content = activityInfo.ActivityName + "--活动取消到会"
+				//item.Points =points
+				item.Total = fmt.Sprint(points, "次")
+				item.TableSource = utils.CYGX_OBJ_ACTIVITY
+				items = append(items, item)
+
+				//更新对应机构的剩余点数
+				itemCompany := new(models.CygxActivitySpecialPermissionPoints)
+				itemCompany.CompanyId = user.CompanyId
+				itemCompany.Points = points
+				itemCompany.ModifyTime = time.Now()
+				itemCompanys = append(itemCompanys, itemCompany)
+				mapCompanyPoints[user.CompanyId] = points
+			}
 		}
 	}
-	e = models.AddCygxActivityPointsBillMulti(items, itemCompanys)
+	e = models.AddCygxActivitySpecialTripBillMulti(items, itemCompanys)
 	if e != nil && e.Error() != utils.ErrNoRow() {
-		err = errors.New("AddCygxActivityPointsBillMulti, Err: " + e.Error())
+		err = errors.New("AddCygxActivitySpecialTripBillMulti, Err: " + e.Error())
 		return
 	}
 	return

services/wx_user_rai_label.go

@@ -1659,81 +1659,6 @@ func initCrm16_5ReportHistory() {
 	fmt.Println("endAddWxUserRaiLabelLogMultiInit")
 }
 
-func initCrm16_5ReportHistory_2() {
-
-	listReportHistory, err := models.GetCygxReportSelectionSubjectHistory()
-
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-	var mobiles []string
-	mapMobile := make(map[string]bool)
-	for _, v := range listReportHistory {
-		if mapMobile[v.Mobile] || v.Mobile == "" {
-			continue
-		}
-		mapMobile[v.Mobile] = true
-		mobiles = append(mobiles, v.Mobile)
-	}
-
-	listUser, err := models.GetWxUserListByMobileArr(mobiles)
-
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-
-	mapUser := make(map[string]*models.WxUserItem)
-	for _, v := range listUser {
-		mapUser[v.Mobile] = v
-	}
-
-	var items []*models.WxUserRaiLabelLog
-	for _, v := range listReportHistory {
-		if mapUser[v.Mobile] == nil || v.Mobile == "" || v.LableName == "" {
-			continue
-		}
-		wxUser := mapUser[v.Mobile]
-		item := new(models.WxUserRaiLabelLog)
-		item.UserId = wxUser.UserId
-		item.RealName = wxUser.RealName
-		item.Mobile = wxUser.Mobile
-		item.Email = wxUser.Email
-		item.CompanyId = wxUser.CompanyId
-		item.CompanyName = wxUser.CompanyName
-		item.Label = v.LableName
-		item.SourceType = 8
-		item.CreateTime = v.CreateTime
-		item.ModifyTime = time.Now()
-		item.RegisterPlatform = v.RegisterPlatform
-		items = append(items, item)
-	}
-	fmt.Println("items", len(items))
-
-	var itemsAdd []*models.WxUserRaiLabelLog
-	if len(items) > 0 {
-		for _, v := range items {
-			itemsAdd = append(itemsAdd, v)
-			if len(items)%2000 == 0 {
-				err = models.AddWxUserRaiLabelLogMultiInit(items)
-				if err != nil {
-					return
-				}
-				itemsAdd = make([]*models.WxUserRaiLabelLog, 0)
-			}
-
-		}
-	}
-	if len(itemsAdd) > 0 {
-		err = models.AddWxUserRaiLabelLogMultiInit(itemsAdd)
-		if err != nil {
-			return
-		}
-	}
-	fmt.Println("endAddWxUserRaiLabelLogMultiInit")
-}
-
 func initCrm16_5Roadshow() {
 	var condition string
 	var pars []interface{}