|
@@ -266,14 +266,14 @@ func (this *ActivitySpecialController) SpecialTripAdd() {
|
|
|
|
|
|
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
|
|
|
}
|
|
|
|
|
|
var itemMeeting = new(models.CygxActivitySpecialMeetingDetail)
|
|
@@ -453,6 +453,16 @@ func (this *ActivitySpecialController) Tripcancel() {
|
|
|
return
|
|
|
}
|
|
|
activityId := req.ActivityId
|
|
|
+ total, err := models.GetUserActivitySpecialTripCount(user.UserId, activityId)
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "获取信息失败"
|
|
|
+ br.ErrMsg = "获取日程数量信息失败,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if total == 0 {
|
|
|
+ br.Msg = "报名已取消!"
|
|
|
+ return
|
|
|
+ }
|
|
|
activityInfo, errInfo := models.GetCygxActivitySpecialDetailById(uid, activityId)
|
|
|
if activityInfo == nil {
|
|
|
br.Msg = "操作失败"
|