fix

services/cygx/activity_special.go

@@ -270,7 +270,7 @@ func GetSpecialSurplusByCompany(companyId int) (specialSurplus string, err error
 			packageTypeMap := map[int]int{1: 16, 2: 10}
 			totalTrip := packageTypeMap[packageType]
 
-			tripRemaining := totalTrip - airborneTotal + TripBillNum
+			tripRemaining := totalTrip + TripBillNum
 			if tripRemaining < 0 {
 				tripRemaining = 0
 			}
@@ -449,11 +449,12 @@ func GetChartPermissionSpecialSurplusByCompany(companyId int) (chartNumMap  map[
 			//for _, v := range airborneList {
 			//	ariborneMap[v.ChartPermissionId] = v.Count
 			//}
-			airborneTotal, e := cygx.GetActivitySpecialTripAirborneCountByActivitySpecial(condition, pars)
-			if e != nil {
-				err = errors.New("GetActivitySpecialTripAirborneCountByActivitySpecial, Err: " + e.Error())
-				return
-			}
+			//到会空降的也加入流水记录表，这里不在做单独计算 2023-07-10
+			//airborneTotal, e := cygx.GetActivitySpecialTripAirborneCountByActivitySpecial(condition, pars)
+			//if e != nil {
+			//	err = errors.New("GetActivitySpecialTripAirborneCountByActivitySpecial, Err: " + e.Error())
+			//	return
+			//}
 			//condition += ` AND is_valid = 1 `
 			//查询当年的数据
 			condition += ` AND create_time >= ?  `
@@ -475,7 +476,7 @@ func GetChartPermissionSpecialSurplusByCompany(companyId int) (chartNumMap  map[
 			packageTypeMap := map[int]int{1: 16, 2: 10}
 			totalTrip := packageTypeMap[packageType]
 
-			tripRemaining := totalTrip - airborneTotal + TripBillNum
+			tripRemaining := totalTrip + TripBillNum
 			if tripRemaining < 0 {
 				tripRemaining = 0
 			}
@@ -514,14 +515,15 @@ func GetChartPermissionSpecialSurplusByCompany(companyId int) (chartNumMap  map[
 			if len(chartList) == 0 {
 				return
 			}
-			airborneList, e := cygx.GetCygxActivitySpecialTripAirborneListByComapnyId(companyId)
-			if e != nil {
-				err = errors.New("获取品种信息失败, Err:" + e.Error())
-				return
-			}
-			for _, v := range airborneList {
-				mapPermissionNameTrip[v.ChartPermissionName] += 1
-			}
+			//到会空降的也加入流水记录表，这里不在做单独计算 2023-07-10
+			//airborneList, e := cygx.GetCygxActivitySpecialTripAirborneListByComapnyId(companyId)
+			//if e != nil {
+			//	err = errors.New("获取品种信息失败, Err:" + e.Error())
+			//	return
+			//}
+			//for _, v := range airborneList {
+			//	mapPermissionNameTrip[v.ChartPermissionName] += 1
+			//}
 
 			var condition string
 			var pars []interface{}