no message

models/activity_special_trip_bill.go

@@ -136,3 +136,12 @@ func AddCygxActivitySpecialTripBillMulti(items []*CygxActivitySpecialTripBill, i
 	}
 	return
 }
+
+// 删除
+func DelCygxActivitySpecialTripBillById(id int) (err error) {
+	o := orm.NewOrm()
+	sql := ` DELETE FROM cygx_activity_special_trip_bill  WHERE id   = ?  `
+	_, err = o.Raw(sql, id).Exec()
+
+	return
+}

services/activity_points.go

@@ -502,29 +502,27 @@ func YanXuanActivityPointsBillActivityEditReduce(log models.YanXuanActivityPoint
 	item := new(models.CygxActivitySpecialTripBill)
 	var itemCompanys []*models.CygxActivitySpecialPermissionPoints
 	itemCompany := new(models.CygxActivitySpecialPermissionPoints)
-
+	//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
+	item.Total = fmt.Sprint(companyPointsNum-activityPointsSetDetail.CompanyPointsNum, "次")
+	item.TableSource = utils.CYGX_OBJ_ACTIVITY
 	if activityPointsBillDetail == nil { //如果是空的就添加
 		//获取需要添加的流水信息
-		//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
-		item.Total = fmt.Sprint(companyPointsNum-activityPointsSetDetail.CompanyPointsNum, "次")
-		item.TableSource = utils.CYGX_OBJ_ACTIVITY
 		items = append(items, item)
-
 		//更新对应机构的剩余点数
 		itemCompany.CompanyId = comapny.CompanyId
 		itemCompany.Points = companyPointsNum - activityPointsSetDetail.CompanyPointsNum
@@ -538,7 +536,7 @@ func YanXuanActivityPointsBillActivityEditReduce(log models.YanXuanActivityPoint
 	} else {
 		//如果存在就进行对比修改
 		if activityPointsSetDetail.CompanyPointsNum != -activityPointsBillDetail.BillDetailed {
-			item.Id = activityPointsBillDetail.Id
+			//item.Id = activityPointsBillDetail.Id
 			item.BillDetailed = -activityPointsSetDetail.CompanyPointsNum
 			item.Total = fmt.Sprint(companyPointsNum-activityPointsBillDetail.BillDetailed-activityPointsSetDetail.CompanyPointsNum, "次")
 			items = append(items, item)
@@ -548,6 +546,12 @@ func YanXuanActivityPointsBillActivityEditReduce(log models.YanXuanActivityPoint
 			itemCompany.Points = companyPointsNum - activityPointsBillDetail.BillDetailed - activityPointsSetDetail.CompanyPointsNum
 			itemCompany.ModifyTime = time.Now()
 			itemCompanys = append(itemCompanys, itemCompany)
+
+			e = models.DelCygxActivitySpecialTripBillById(activityPointsBillDetail.Id)
+			if e != nil {
+				err = errors.New("DelCygxActivitySpecialTripBillById, Err: " + e.Error())
+				return
+			}
 			e = models.AddCygxActivitySpecialTripBillMulti(items, itemCompanys)
 			if e != nil && e.Error() != utils.ErrNoRow() {
 				err = errors.New("AddCygxActivitySpecialTripBillMulti, Err: " + e.Error())