Merge branch 'cygx_10.7' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

services/activity_points.go

@@ -655,6 +655,9 @@ func YanXuanActivityPointsBillSubmitMeetingReduce(log models.YanXuanActivityPoin
 		err = errors.New("GetSignupDetailList" + e.Error())
 		return
 	}
+	if len(signUpDetailList) == 0 {
+		return
+	}
 	for _, v := range signUpDetailList {
 		companyIds = append(companyIds, v.CompanyId)
 	}
@@ -730,6 +733,33 @@ func YanXuanActivityPointsBillSubmitMeetingReduce(log models.YanXuanActivityPoin
 				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
+			} else {
+				//第三次提交改成已到会的，对其进行扣点处理
+				item := new(models.CygxActivityPointsBill)
+				item.ActivityId = activityId
+				item.CreateTime = time.Now()
+				item.UserId = user.UserId
+				item.Mobile = user.Mobile
+				item.Email = user.Email
+				item.CompanyId = user.CompanyId
+				item.CompanyName = user.CompanyName
+				item.RealName = user.RealName
+				item.RegisterPlatform = log.RegisterPlatform
+				item.AdminId = log.AdminId
+				item.Source = log.Source
+				item.ChartPermissionId = activityInfo.ChartPermissionId
+				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