Merge branch 'master' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

services/cygx/activity_points_set.go

@@ -68,21 +68,21 @@ func CheckActivityPointsSet(pointsSet *cygx.CygxActivityPointsSetRsq, activityId
 
 	companyId := pointsSet.CompanyId
 	if companyId > 0 {
-		pointsCompany, e := cygx.GetCygxActivityPointsCompanyByCompanyId(companyId)
+		pointsCompany, e := cygx.GetCygxActivitySpecialPermissionPointsCount(companyId)
 		if e != nil && e.Error() != utils.ErrNoRow() {
 			err = errors.New("GetCygxActivityPointsCompanyByCompanyId，Err" + e.Error())
 			return
 		}
-		if pointsCompany == nil {
-			errMsg = "公司剩余点数不足"
-			return
-		}
+		//if pointsCompany == nil {
+		//	errMsg = "公司剩余点数不足"
+		//	return
+		//}
 		companyPointsNum, _ := strconv.ParseFloat(pointsSet.CompanyPointsNum, 2)
 		if companyPointsNum == 0 {
 			errMsg = "办会人扣点数量设置有误" + pointsSet.CompanyPointsNum
 		}
 		if activityId == 0 {
-			if companyPointsNum > pointsCompany.Points {
+			if companyPointsNum > pointsCompany {
 				errMsg = "公司剩余点数不足"
 			}
 		} else {
@@ -93,29 +93,29 @@ func CheckActivityPointsSet(pointsSet *cygx.CygxActivityPointsSetRsq, activityId
 			}
 			if pointsSetDetail != nil {
 				if pointsSetDetail.CompanyId != companyId {
-					if companyPointsNum > pointsCompany.Points {
+					if companyPointsNum > pointsCompany {
 						errMsg = "公司剩余点数不足"
 					}
 				} else {
 					//查询最新的一条针对这个公司的扣点记录
 					var condition string
 					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 table_source = 'activityspecial'   ORDER BY id DESC LIMIT 1  `
 					pars = append(pars, activityId, companyId)
-					activityPointsBillDetail, e := cygx.GetCygxActivityPointsBillDetailByCondition(condition, pars)
+					activityPointsBillDetail, e := cygx.GetCygxActivitySpecialTripBill(condition, pars)
 					if e != nil && e.Error() != utils.ErrNoRow() {
 						err = errors.New("GetCompanyPoints, Err: " + e.Error())
 						return
 					}
 					if activityPointsBillDetail != nil {
 						CompanyPointsNumOld, _ := strconv.ParseFloat(pointsSetDetail.CompanyPointsNum, 2)
-						if pointsCompany.Points-companyPointsNum+CompanyPointsNumOld < 0 {
+						if pointsCompany-companyPointsNum+CompanyPointsNumOld < 0 {
 							errMsg = "公司剩余点数不足"
 						}
 					}
 				}
 			} else {
-				if companyPointsNum > pointsCompany.Points {
+				if companyPointsNum > pointsCompany {
 					errMsg = "公司剩余点数不足"
 				}
 			}