Browse Source

no message

xingzai 1 year ago
parent
commit
117462334d
1 changed files with 7 additions and 6 deletions
  1. 7 6
      services/activity_special_trip.go

+ 7 - 6
services/activity_special_trip.go

@@ -131,11 +131,11 @@ func GetTripRemainingtimesBycompany(user *models.WxUserItem, activityInfo *model
 		condition += ` AND chart_permission_id = ? `
 		pars = append(pars, activityInfo.ChartPermissionId)
 
-		airborneTota, e = models.GetActivitySpecialTripAirborneCountByActivitySpecial(condition, pars)
-		if e != nil {
-			err = errors.New("GetActivitySpecialTripAirborneCountByActivitySpecial, Err: " + e.Error())
-			return
-		}
+		//airborneTota, e = models.GetActivitySpecialTripAirborneCountByActivitySpecial(condition, pars)
+		//if e != nil {
+		//	err = errors.New("GetActivitySpecialTripAirborneCountByActivitySpecial, Err: " + e.Error())
+		//	return
+		//}
 		//查询当年的数据
 		condition += ` AND create_time >= ?  `
 		pars = append(pars, time.Now().Format(utils.FormatYearDate)+"-01-01")
@@ -148,7 +148,8 @@ func GetTripRemainingtimesBycompany(user *models.WxUserItem, activityInfo *model
 		for _, v := range listTripBill {
 			TripBillNum += v.BillDetailed
 		}
-		tripRemaining = 5 - airborneTota + TripBillNum
+		//tripRemaining = 5 - airborneTota + TripBillNum
+		tripRemaining = 5 + TripBillNum
 		if tripRemaining <= 0 {
 			errMsg = msgTemplate
 			return