no message

controllers/activity_special.go

@@ -241,8 +241,8 @@ func (this *ActivitySpecialCoAntroller) SpecialTripAdd() {
 			itemBill.CompanyName = user.CompanyName
 			itemBill.RealName = user.RealName
 			itemBill.Source = 1
-			itemBill.DoType = 2
-			itemBill.BillDetailed = 1 // 流水加一
+			itemBill.DoType = 1
+			itemBill.BillDetailed = -1 // 流水减一
 			itemBill.RegisterPlatform = 1
 			itemBill.ChartPermissionId = activityInfo.ChartPermissionId
 
@@ -275,7 +275,6 @@ func (this *ActivitySpecialCoAntroller) SpecialTripAdd() {
 					br.ErrMsg = "操作失败,Err:" + err.Error()
 					return
 				}
-
 				//SignupStatus  int    `description:"返回状态：1：成功 、2 ：人数已满 、3：调研次数已用完、 4：超时"`
 			} else {
 				updateParams := make(map[string]interface{})
@@ -289,7 +288,11 @@ func (this *ActivitySpecialCoAntroller) SpecialTripAdd() {
 					br.ErrMsg = "二次报名，更改报名是否有效状态失败，Err:" + err.Error()
 					return
 				}
-				itemBill.BillDetailed = 0 // 取消报名之后二次报名，不扣除流水记录
+				resultTime := utils.StrTimeToTime(activityInfo.ActivityTime)
+				//48小时之内的取消也扣除一次参会记录
+				if time.Now().Add(+time.Hour * 48).After(resultTime) {
+					itemBill.BillDetailed = 0 //48小时之内，取消报名之后二次报名，不扣除流水记录
+				}
 			}
 			go models.AddCygxActivitySpecialTripBill(itemBill)
 		}
@@ -362,7 +365,7 @@ func (this *ActivitySpecialCoAntroller) Tripcancel() {
 	itemBill.RealName = user.RealName
 	itemBill.Source = 1
 	itemBill.DoType = 2
-	itemBill.BillDetailed = 1 // 流水加一
+	itemBill.BillDetailed = -1 // 流水加一
 	itemBill.RegisterPlatform = 1
 	itemBill.ChartPermissionId = activityInfo.ChartPermissionId
 	resultTime := utils.StrTimeToTime(activityInfo.ActivityTime)

models/activity_special_trip.go

@@ -87,7 +87,7 @@ func GetActivitySpecialTripAirborneCountByActivitySpecial(condition string, pars
 			cygx_activity_special_meeting_detail AS t
 			INNER JOIN cygx_activity_special AS a ON a.activity_id = t.activity_id 
 		WHERE
-			 1= 1 ` + condition
+			 1= 1  	AND YEAR ( t.create_time )= YEAR (NOW()) ` + condition
 	o := orm.NewOrm()
 	err = o.Raw(sqlCount, pars).QueryRow(&count)
 	return

services/activity_special_trip.go

@@ -83,6 +83,9 @@ func GetTripRemainingtimesBycompany(user *models.WxUserItem, activityInfo *model
 			return
 		}
 		//condition += ` AND is_valid = 1 `
+		//查询当年的数据
+		condition += ` AND create_time > ?  `
+		pars = append(pars, time.Now().Format(utils.FormatDate))
 		listTripBill, e := models.GetCygxActivitySpecialTripBill(condition, pars)
 		if e != nil {
 			err = errors.New("GetActivitySpecialTripCountByActivitySpecial, Err: " + e.Error())
@@ -113,7 +116,9 @@ func GetTripRemainingtimesBycompany(user *models.WxUserItem, activityInfo *model
 			err = errors.New("GetActivitySpecialTripAirborneCountByActivitySpecial, Err: " + e.Error())
 			return
 		}
-
+		//查询当年的数据
+		condition += ` AND create_time > ?  `
+		pars = append(pars, time.Now().Format(utils.FormatDate))
 		listTripBill, e := models.GetCygxActivitySpecialTripBill(condition, pars)
 		if e != nil {
 			err = errors.New("GetActivitySpecialTripCountByActivitySpecial, Err: " + e.Error())