|
@@ -116,12 +116,6 @@ func (this *ActivitySpecialTripCoAntroller) AddUser() {
|
|
|
return
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
infoUser, err := cygx.GetUserAndCompanyNameList(uid)
|
|
|
if err != nil {
|
|
|
br.Msg = "获取失败"
|
|
@@ -138,36 +132,6 @@ func (this *ActivitySpecialTripCoAntroller) AddUser() {
|
|
|
if totalAll > 0 {
|
|
|
continue
|
|
|
}
|
|
|
-
|
|
|
- itemBill := new(cygx.CygxActivitySpecialTripBill)
|
|
|
- itemBill.UserId = infoUser.UserId
|
|
|
- itemBill.ActivityId = activityInfo.ActivityId
|
|
|
- itemBill.CreateTime = time.Now()
|
|
|
- itemBill.Mobile = infoUser.Mobile
|
|
|
- itemBill.Email = infoUser.Email
|
|
|
- itemBill.CompanyId = infoUser.CompanyId
|
|
|
- itemBill.CompanyName = infoUser.CompanyName
|
|
|
- itemBill.RealName = infoUser.RealName
|
|
|
- itemBill.Source = 2
|
|
|
- itemBill.DoType = 1
|
|
|
- itemBill.BillDetailed = -1
|
|
|
- itemBill.RegisterPlatform = 3
|
|
|
- itemBill.ChartPermissionId = activityInfo.ChartPermissionId
|
|
|
- itemBill.ChartPermissionName = activityInfo.ChartPermissionName
|
|
|
- itemBill.AdminId = AdminUser.AdminId
|
|
|
-
|
|
|
-
|
|
|
- if utils.InArrayByStr(utils.ACTIVITY_SPECIAL_TRIP_PERMISSION_NAME_OTHER, activityInfo.ChartPermissionName) {
|
|
|
-
|
|
|
- maxChartPermissionId, maxChartPermissionName, err := cygxService.GetSpecialBillMaxChartPermissionId(infoUser)
|
|
|
- if err != nil {
|
|
|
- br.Msg = "操作失败"
|
|
|
- br.ErrMsg = "获取销售信息失败,GetSpecialBillMaxChartPermissionId Err:" + err.Error()
|
|
|
- return
|
|
|
- }
|
|
|
- itemBill.ChartPermissionId = maxChartPermissionId
|
|
|
- itemBill.ChartPermissionName = maxChartPermissionName
|
|
|
- }
|
|
|
|
|
|
if totalAll == 0 {
|
|
|
item := new(cygx.CygxActivitySpecialTrip)
|
|
@@ -212,46 +176,7 @@ func (this *ActivitySpecialTripCoAntroller) AddUser() {
|
|
|
br.ErrMsg = "二次报名,更改报名是否有效状态失败,Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
- resultTime := utils.StrTimeToTime(activityInfo.ActivityTime)
|
|
|
-
|
|
|
- if time.Now().Add(+time.Hour * 48).After(resultTime) {
|
|
|
- itemBill.BillDetailed = 0
|
|
|
- } else {
|
|
|
- err = cygxService.DeductTripRemainingtimesByUser(infoUser, activityInfo, roleTypeCode)
|
|
|
- if err != nil {
|
|
|
- br.Msg = "操作失败"
|
|
|
- br.ErrMsg = "操作失败,Err:" + err.Error()
|
|
|
- return
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
- totalText, err := cygxService.HandleActivitySpecialTripBillTotalText(infoUser.CompanyId)
|
|
|
- if err != nil {
|
|
|
- br.Msg = "报名失败,"
|
|
|
- br.ErrMsg = "二次报名,更改报名是否有效状态失败,Err:" + err.Error()
|
|
|
- return
|
|
|
}
|
|
|
- itemBill.Total = totalText
|
|
|
- itemsBill = append(itemsBill, itemBill)
|
|
|
-
|
|
|
|
|
|
var itemMeeting = new(cygx.CygxActivitySpecialMeetingDetail)
|
|
|
itemMeeting.UserId = v.UserId
|
|
@@ -265,12 +190,20 @@ func (this *ActivitySpecialTripCoAntroller) AddUser() {
|
|
|
itemsMeet = append(itemsMeet, itemMeeting)
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
err = cygx.AddCygxActivitySpecialTrip(items, itemsBill, itemsMeet)
|
|
|
if err != nil {
|
|
|
br.Msg = "操作失败"
|
|
|
br.ErrMsg = "新增用户失败,Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
+ if len(items) > 0 {
|
|
|
+
|
|
|
+ for _, v := range items {
|
|
|
+ time.Sleep(100 * time.Millisecond)
|
|
|
+ cygxService.SpecialActivityPointsBillSignupAddSpecial(v.ActivityId, v.UserId, AdminUser.AdminId)
|
|
|
+ }
|
|
|
+ }
|
|
|
br.Ret = 200
|
|
|
br.Success = true
|
|
|
br.Msg = "操作成功"
|
|
@@ -555,42 +488,42 @@ func (this *ActivitySpecialTripCoAntroller) TripCancel() {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- itemBill := new(cygx.CygxActivitySpecialTripBill)
|
|
|
- itemBill.UserId = infoUser.UserId
|
|
|
- itemBill.ActivityId = activityInfo.ActivityId
|
|
|
- itemBill.CreateTime = time.Now()
|
|
|
- itemBill.Mobile = infoUser.Mobile
|
|
|
- itemBill.Email = infoUser.Email
|
|
|
- itemBill.CompanyId = infoUser.CompanyId
|
|
|
- itemBill.CompanyName = infoUser.CompanyName
|
|
|
- itemBill.RealName = infoUser.RealName
|
|
|
- itemBill.Source = 2
|
|
|
- itemBill.DoType = 2
|
|
|
- itemBill.BillDetailed = 1
|
|
|
- itemBill.RegisterPlatform = 3
|
|
|
- itemBill.ChartPermissionId = activityInfo.ChartPermissionId
|
|
|
- itemBill.ChartPermissionName = activityInfo.ChartPermissionName
|
|
|
- itemBill.AdminId = sysUser.AdminId
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
|
|
|
- if utils.InArrayByStr(utils.ACTIVITY_SPECIAL_TRIP_PERMISSION_NAME_OTHER, activityInfo.ChartPermissionName) {
|
|
|
-
|
|
|
- lastTripBill, err := cygx.GetCygxActivitySpecialTripBillLastDetialByActivityId(activityInfo.ActivityId, userId)
|
|
|
- if err != nil {
|
|
|
- br.Msg = "操作失败"
|
|
|
- br.ErrMsg = "获取销售信息失败,GetCygxActivitySpecialTripBillLastDetialByActivityId Err:" + err.Error()
|
|
|
- return
|
|
|
- }
|
|
|
- itemBill.ChartPermissionId = lastTripBill.ChartPermissionId
|
|
|
- itemBill.ChartPermissionName = lastTripBill.ChartPermissionName
|
|
|
- }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
resultTime := utils.StrTimeToTime(activityInfo.ActivityTime)
|
|
|
|
|
|
var isValid int
|
|
|
if time.Now().Add(+time.Hour * 48).After(resultTime) {
|
|
|
isValid = 1
|
|
|
- itemBill.BillDetailed = 0
|
|
|
+
|
|
|
} else {
|
|
|
err = cygxService.RebateTripRemainingtimesByUser(infoUser, activityInfo)
|
|
|
if err != nil {
|
|
@@ -623,19 +556,20 @@ func (this *ActivitySpecialTripCoAntroller) TripCancel() {
|
|
|
|
|
|
|
|
|
|
|
|
- totalText, err := cygxService.HandleActivitySpecialTripBillTotalText(infoUser.CompanyId)
|
|
|
- if err != nil {
|
|
|
- br.Msg = "报名失败,"
|
|
|
- br.ErrMsg = "二次报名,更改报名是否有效状态失败,Err:" + err.Error()
|
|
|
- return
|
|
|
- }
|
|
|
- itemBill.Total = totalText
|
|
|
- err = cygx.AddCygxActivitySpecialTripBill(itemBill)
|
|
|
- if err != nil {
|
|
|
- br.Msg = "修改失败"
|
|
|
- br.ErrMsg = "修改失败流水记录添加失败 Err:" + err.Error()
|
|
|
- return
|
|
|
- }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ go cygxService.ActivityPointsBillSignupCancelSpecial(activityId, userId, sysUser.AdminId)
|
|
|
br.Ret = 200
|
|
|
br.Success = true
|
|
|
br.Msg = "操作成功"
|