|
@@ -258,6 +258,18 @@ func YanXuanActivityPointsBillSignupCancelReduce(log models.YanXuanActivityPoint
|
|
|
err = errors.New("GetCompanyPoints, Err: " + e.Error())
|
|
|
return
|
|
|
}
|
|
|
+
|
|
|
+ //查询最新的一条针对这个用户的扣点记录
|
|
|
+ var condition string
|
|
|
+ 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)
|
|
|
+ if e != nil {
|
|
|
+ err = errors.New("activityPointsBillDetail" + e.Error())
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
//获取需要添加的流水信息
|
|
|
var items []*models.CygxActivityPointsBill
|
|
|
item := new(models.CygxActivityPointsBill)
|
|
@@ -269,14 +281,14 @@ func YanXuanActivityPointsBillSignupCancelReduce(log models.YanXuanActivityPoint
|
|
|
item.CompanyId = user.CompanyId
|
|
|
item.CompanyName = user.CompanyName
|
|
|
item.RealName = user.RealName
|
|
|
- item.BillDetailed = activityPointsSetDetail.UserPointsNum
|
|
|
+ item.BillDetailed = -activityPointsBillDetail.BillDetailed
|
|
|
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 + activityPointsSetDetail.UserPointsNum
|
|
|
+ item.Points = companyPointsNum - activityPointsBillDetail.BillDetailed
|
|
|
items = append(items, item)
|
|
|
|
|
|
//更新对应机构的剩余点数
|
|
@@ -807,6 +819,7 @@ func YanXuanCompanyApprovalReduce(log models.YanXuanActivityPointsRedis) (err er
|
|
|
var itemCompanys []*models.CygxActivityPointsCompany
|
|
|
itemCompany := new(models.CygxActivityPointsCompany)
|
|
|
itemCompany.CompanyId = comapny.CompanyId
|
|
|
+ itemCompany.CompanyName = comapny.CompanyName
|
|
|
itemCompany.Points = item.Points
|
|
|
itemCompany.CreateTime = time.Now()
|
|
|
itemCompany.ModifyTime = time.Now()
|