no message

services/activity_points.go

@@ -566,6 +566,7 @@ 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
@@ -732,16 +733,15 @@ 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 // 如果用户的扣点记录不存在，那么就不进行返点处理
@@ -934,21 +934,24 @@ func YanXuanActivityPointsBillSubmitMeetingReduce(log models.YanXuanActivityPoin
 			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].BillDetailed < 0 {
+				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.AddCygxActivitySpecialTripBillMulti(items, itemCompanys)