|
@@ -266,14 +266,14 @@ func (this *ActivitySpecialController) SpecialTripAdd() {
|
|
|
|
|
|
if activityInfo.ChartPermissionName == utils.CE_LUE_NAME {
|
|
|
//如果是策略行业,把代扣行业信息放入流水表,取消报名的时候,返点使用
|
|
|
- lastTripBill, err := models.GetCygxActivitySpecialTripBillLastDetialByActivityId(activityInfo.ActivityId, user.UserId)
|
|
|
+ maxChartPermissionId, maxChartPermissionName, err := services.GetSpecialBillMaxChartPermissionId(user)
|
|
|
if err != nil {
|
|
|
br.Msg = "操作失败"
|
|
|
br.ErrMsg = "获取销售信息失败,GetSpecialBillMaxChartPermissionId Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
- itemBill.ChartPermissionId = lastTripBill.ChartPermissionId
|
|
|
- itemBill.ChartPermissionName = lastTripBill.ChartPermissionName
|
|
|
+ itemBill.ChartPermissionId = maxChartPermissionId
|
|
|
+ itemBill.ChartPermissionName = maxChartPermissionName
|
|
|
}
|
|
|
|
|
|
var itemMeeting = new(models.CygxActivitySpecialMeetingDetail)
|
|
@@ -490,17 +490,19 @@ func (this *ActivitySpecialController) Tripcancel() {
|
|
|
itemBill.RegisterPlatform = utils.REGISTER_PLATFORM
|
|
|
itemBill.ChartPermissionId = activityInfo.ChartPermissionId
|
|
|
itemBill.ChartPermissionName = activityInfo.ChartPermissionName
|
|
|
+
|
|
|
if activityInfo.ChartPermissionName == utils.CE_LUE_NAME {
|
|
|
//如果是策略行业,把代扣行业信息放入流水表,取消报名的时候,返点使用
|
|
|
- maxChartPermissionId, maxChartPermissionName, err := services.GetSpecialBillMaxChartPermissionId(user)
|
|
|
+ lastTripBill, err := models.GetCygxActivitySpecialTripBillLastDetialByActivityId(activityInfo.ActivityId, user.UserId)
|
|
|
if err != nil {
|
|
|
br.Msg = "操作失败"
|
|
|
br.ErrMsg = "获取销售信息失败,GetSpecialBillMaxChartPermissionId Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
- itemBill.ChartPermissionId = maxChartPermissionId
|
|
|
- itemBill.ChartPermissionName = maxChartPermissionName
|
|
|
+ itemBill.ChartPermissionId = lastTripBill.ChartPermissionId
|
|
|
+ itemBill.ChartPermissionName = lastTripBill.ChartPermissionName
|
|
|
}
|
|
|
+
|
|
|
resultTime := utils.StrTimeToTime(activityInfo.ActivityTime)
|
|
|
//48小时之内的取消也扣除一次参会记录
|
|
|
var isValid int
|