|
@@ -339,7 +339,7 @@ func YanXuanActivityPointsBillActivityEditReduce(log models.YanXuanActivityPoint
|
|
//查询最新的一条针对这个公司的扣点记录
|
|
//查询最新的一条针对这个公司的扣点记录
|
|
var condition string
|
|
var condition string
|
|
var pars []interface{}
|
|
var pars []interface{}
|
|
- condition += ` AND activity_id = ? AND company_id = ? AND mobile = '' ORDER BY id DESC LIMIT 1 `
|
|
|
|
|
|
+ condition += ` AND activity_id = ? AND company_id = ? AND mobile = '' AND bill_detailed < 0 ORDER BY id DESC LIMIT 1 `
|
|
pars = append(pars, activityId, comapnyId)
|
|
pars = append(pars, activityId, comapnyId)
|
|
activityPointsBillDetail, e := models.GetCygxActivityPointsBillDetailByCondition(condition, pars)
|
|
activityPointsBillDetail, e := models.GetCygxActivityPointsBillDetailByCondition(condition, pars)
|
|
if e != nil && e.Error() != utils.ErrNoRow() {
|
|
if e != nil && e.Error() != utils.ErrNoRow() {
|
|
@@ -351,10 +351,6 @@ func YanXuanActivityPointsBillActivityEditReduce(log models.YanXuanActivityPoint
|
|
var itemCompanys []*models.CygxActivityPointsCompany
|
|
var itemCompanys []*models.CygxActivityPointsCompany
|
|
itemCompany := new(models.CygxActivityPointsCompany)
|
|
itemCompany := new(models.CygxActivityPointsCompany)
|
|
|
|
|
|
- pars = make([]interface{}, 0)
|
|
|
|
- condition = ` AND activity_id = ? AND company_id != ? AND company_id > 0 AND mobile = '' ORDER BY id DESC LIMIT 1 `
|
|
|
|
- pars = append(pars, activityId, comapnyId)
|
|
|
|
-
|
|
|
|
if activityPointsBillDetail == nil { //如果是空的就添加
|
|
if activityPointsBillDetail == nil { //如果是空的就添加
|
|
//获取需要添加的流水信息
|
|
//获取需要添加的流水信息
|
|
//item.UserId = user.UserId
|
|
//item.UserId = user.UserId
|
|
@@ -403,35 +399,6 @@ func YanXuanActivityPointsBillActivityEditReduce(log models.YanXuanActivityPoint
|
|
err = errors.New("UpdateCygxActivityPointsBillMulti, Err: " + e.Error())
|
|
err = errors.New("UpdateCygxActivityPointsBillMulti, Err: " + e.Error())
|
|
return
|
|
return
|
|
}
|
|
}
|
|
- } else {
|
|
|
|
- //item.UserId = user.UserId
|
|
|
|
- item.ActivityId = activityId
|
|
|
|
- item.CreateTime = time.Now()
|
|
|
|
- //item.Mobile = user.Mobile
|
|
|
|
- //item.Email = user.Email
|
|
|
|
- item.CompanyId = comapny.CompanyId
|
|
|
|
- item.CompanyName = comapny.CompanyName
|
|
|
|
- //item.RealName = user.RealName
|
|
|
|
- item.BillDetailed = -activityPointsSetDetail.CompanyPointsNum
|
|
|
|
- item.RegisterPlatform = log.RegisterPlatform
|
|
|
|
- item.AdminId = log.AdminId
|
|
|
|
- item.Source = log.Source
|
|
|
|
- item.ChartPermissionId = activityInfo.ChartPermissionId
|
|
|
|
- item.DoType = 1
|
|
|
|
- item.Content = activityInfo.ActivityName + "--办会"
|
|
|
|
- item.Points = companyPointsNum - activityPointsSetDetail.CompanyPointsNum
|
|
|
|
- items = append(items, item)
|
|
|
|
-
|
|
|
|
- //更新对应机构的剩余点数
|
|
|
|
- itemCompany.CompanyId = comapny.CompanyId
|
|
|
|
- itemCompany.Points = item.Points
|
|
|
|
- itemCompany.ModifyTime = time.Now()
|
|
|
|
- itemCompanys = append(itemCompanys, itemCompany)
|
|
|
|
- e = models.AddCygxActivityPointsBillMulti(items, itemCompanys)
|
|
|
|
- if e != nil && e.Error() != utils.ErrNoRow() {
|
|
|
|
- err = errors.New("AddCygxActivityPointsBillMulti, Err: " + e.Error())
|
|
|
|
- return
|
|
|
|
- }
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return
|
|
return
|