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

services/activity_points.go

@@ -386,7 +386,24 @@ func YanXuanActivityPointsBillActivityEditReduce(log models.YanXuanActivityPoint
 			return
 		}
 	} else {
-		if activityPointsBillDetail.BillDetailed > 0 {
+		//如果存在就进行对比修改
+		if activityPointsSetDetail.CompanyPointsNum != -activityPointsBillDetail.BillDetailed {
+			item.Id = activityPointsBillDetail.Id
+			item.BillDetailed = -activityPointsSetDetail.CompanyPointsNum
+			item.Points = companyPointsNum - activityPointsBillDetail.BillDetailed - activityPointsSetDetail.CompanyPointsNum
+			items = append(items, item)
+
+			//更新对应机构的剩余点数
+			itemCompany.CompanyId = comapny.CompanyId
+			itemCompany.Points = item.Points
+			itemCompany.ModifyTime = time.Now()
+			itemCompanys = append(itemCompanys, itemCompany)
+			e = models.UpdateCygxActivityPointsBillMulti(items, itemCompanys)
+			if e != nil && e.Error() != utils.ErrNoRow() {
+				err = errors.New("UpdateCygxActivityPointsBillMulti, Err: " + e.Error())
+				return
+			}
+		} else {
 			//item.UserId = user.UserId
 			item.ActivityId = activityId
 			item.CreateTime = time.Now()
@@ -415,27 +432,7 @@ func YanXuanActivityPointsBillActivityEditReduce(log models.YanXuanActivityPoint
 				err = errors.New("AddCygxActivityPointsBillMulti, Err: " + e.Error())
 				return
 			}
-		} else {
-			//如果存在就进行对比修改
-			if activityPointsSetDetail.CompanyPointsNum != -activityPointsBillDetail.BillDetailed {
-				item.Id = activityPointsBillDetail.Id
-				item.BillDetailed = -activityPointsSetDetail.CompanyPointsNum
-				item.Points = companyPointsNum - activityPointsBillDetail.BillDetailed - activityPointsSetDetail.CompanyPointsNum
-				items = append(items, item)
-
-				//更新对应机构的剩余点数
-				itemCompany.CompanyId = comapny.CompanyId
-				itemCompany.Points = item.Points
-				itemCompany.ModifyTime = time.Now()
-				itemCompanys = append(itemCompanys, itemCompany)
-				e = models.UpdateCygxActivityPointsBillMulti(items, itemCompanys)
-				if e != nil && e.Error() != utils.ErrNoRow() {
-					err = errors.New("UpdateCygxActivityPointsBillMulti, Err: " + e.Error())
-					return
-				}
-			}
 		}
-
 	}
 	return
 }