Merge branch 'cygx_10.9.1' into debug

controllers/cygx/activity_special_trip.go

@@ -534,12 +534,12 @@ func (this *ActivitySpecialTripCoAntroller) TripCancel() {
 		return
 	}
 	if userType == 2 {
-		tripRemaining += 1
+		tripRemaining += itemBill.BillDetailed
 		itemBill.Total = strconv.Itoa(tripRemaining) + "次"
 	} else {
 		for k, num := range mapChartName {
 			if activityInfo.ChartPermissionName == k {
-				num += 1
+				num += itemBill.BillDetailed
 			}
 			itemBill.Total += k + strconv.Itoa(num) + "次+"
 		}

services/cygx/activity_special.go

@@ -574,7 +574,6 @@ func ActivitySpecialCompanyApproval(companyId int,companyName string) (err error
 		itemBill.BillDetailed = totalTrip
 		itemBill.Total = strconv.Itoa(totalTrip) + "次"
 	} else {
-		itemBill.BillDetailed = 15
 		list, e := company.GetCompanyReportPermissionUpgrade(companyId, 2)
 		if e != nil && e.Error() != utils.ErrNoRow() {
 			err = errors.New("GetCompanyReportPermissionUpgrade, Err: " + e.Error())
@@ -602,6 +601,7 @@ func ActivitySpecialCompanyApproval(companyId int,companyName string) (err error
 		}
 		for k, v := range mapChartName {
 			if v > 0 {
+				itemBill.BillDetailed += 5
 				itemBill.Total += k + strconv.Itoa(v) + "次+"
 			}
 		}