|
@@ -15,7 +15,7 @@ import (
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
|
+
|
|
|
func UpdateCygxActivitySpecialSignupNum(cont context.Context) (err error) {
|
|
|
defer func() {
|
|
|
if err != nil {
|
|
@@ -71,7 +71,7 @@ func UpdateCygxActivitySpecialSignupNum(cont context.Context) (err error) {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+
|
|
|
func GetActivityLabelSpecialList(user *models.WxUserItem, isPower int, chartPermissionIds, permissionNameStr string) (item *models.ActivityTypeHome, err error) {
|
|
|
itemList := new(models.ActivityTypeHome)
|
|
|
if user.CompanyId <= 1 {
|
|
@@ -159,7 +159,7 @@ func GetActivityLabelSpecialList(user *models.WxUserItem, isPower int, chartPerm
|
|
|
return
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+
|
|
|
func HandleActivityLabelSpecialPermission(user *models.WxUserItem) (condition string, err error) {
|
|
|
permissionStr, e := GetCompanyPermission(user.CompanyId)
|
|
|
if e != nil {
|
|
@@ -191,7 +191,7 @@ func HandleActivityLabelSpecialPermission(user *models.WxUserItem) (condition st
|
|
|
return
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+
|
|
|
func HandleActivityLabelSpecialTripPermission(user *models.WxUserItem) (condition string, err error) {
|
|
|
permissionStr, e := GetCompanyPermission(user.CompanyId)
|
|
|
if e != nil {
|
|
@@ -223,7 +223,7 @@ func HandleActivityLabelSpecialTripPermission(user *models.WxUserItem) (conditio
|
|
|
return
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+
|
|
|
func GetActivitySpecialPrepareList(user *models.WxUserItem, startSize, pageSize int, keywords string) (list []*models.CygxActivitySpecialDetail, totalPrepare int, err error) {
|
|
|
companyDetail, e := models.GetCompanyDetailByIdGroupTrip(user.CompanyId)
|
|
|
if e != nil {
|
|
@@ -361,7 +361,7 @@ func GetActivityLabelSpecialConfirmList(user *models.WxUserItem, startSize, page
|
|
|
return
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+
|
|
|
func GetSpecialTripUserMap(activityIds []int, userId int) (mapUserId map[int]int, err error) {
|
|
|
var condition string
|
|
|
var pars []interface{}
|
|
@@ -385,7 +385,7 @@ func GetSpecialTripUserMap(activityIds []int, userId int) (mapUserId map[int]int
|
|
|
return
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+
|
|
|
func GetSpecialTripUserSchedule(userId int) (total int, err error) {
|
|
|
var condition string
|
|
|
var pars []interface{}
|
|
@@ -399,7 +399,7 @@ func GetSpecialTripUserSchedule(userId int) (total int, err error) {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+
|
|
|
func GetActivitySpecialList(user *models.WxUserItem, currentIndex, pageSize int, keywords string) (list []*models.CygxActivitySpecialDetail, total int, err error) {
|
|
|
listConfirm, totalConfirm, e := GetActivityLabelSpecialConfirmList(user, (currentIndex-1)*pageSize, pageSize, 4, keywords)
|
|
|
if e != nil {
|
|
@@ -487,7 +487,7 @@ func GetActivitySpecialList(user *models.WxUserItem, currentIndex, pageSize int,
|
|
|
return
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+
|
|
|
func HandleActivitySpecialShow(activityDetail *models.CygxActivitySpecialDetail, user *models.WxUserItem) (item *models.CygxActivitySpecialDetail, err error) {
|
|
|
var activityIds []int
|
|
|
resultTimeStart := utils.StrTimeToTime(activityDetail.ActivityTime)
|
|
@@ -521,7 +521,7 @@ func HandleActivitySpecialShow(activityDetail *models.CygxActivitySpecialDetail,
|
|
|
return
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+
|
|
|
func GetActivitySpecialSearcheList(user *models.WxUserItem, condition string, startSize, pageSize int, keywords string) (items []*models.ActivityDetail, total int, err error) {
|
|
|
var conditionSpecil string
|
|
|
var pars, parsSpecil []interface{}
|
|
@@ -536,46 +536,47 @@ func GetActivitySpecialSearcheList(user *models.WxUserItem, condition string, st
|
|
|
err = errors.New("GetActivitySpecialSearcheList, Err: " + e.Error())
|
|
|
return
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
- conditionActivityIk, e := GetActivityonditionList(user, "", "", "", "", "", 0, 1, keyword, 0, 2)
|
|
|
- if e != nil && e.Error() != utils.ErrNoRow() {
|
|
|
- err = errors.New("GetActivityonditionList, Err: " + e.Error())
|
|
|
- return
|
|
|
- }
|
|
|
- conditionActivityIk += " AND art.is_limit_people = 1 AND art.publish_status = 1 "
|
|
|
-
|
|
|
- totalIk, e := models.GetActivityCount(conditionActivityIk, 0, pars, 0)
|
|
|
- if e != nil {
|
|
|
- err = errors.New("GetActivityonditionList, Err: " + e.Error())
|
|
|
- return
|
|
|
- }
|
|
|
- total = totalSearche + totalIk
|
|
|
keyWordArr, e := GetIndustryMapNameSliceV3(keywords)
|
|
|
if e != nil {
|
|
|
err = errors.New("GetActivityonditionList, Err: " + e.Error())
|
|
|
return
|
|
|
}
|
|
|
- keyWordArr = RemoveDuplicatesAndEmpty(keyWordArr)
|
|
|
- startSizeIk := startSize - totalSearche
|
|
|
- if startSizeIk < 0 {
|
|
|
- startSizeIk = 0
|
|
|
- }
|
|
|
- var pageSizeIk int
|
|
|
- pageSizeIk = pageSize - len(list)
|
|
|
- if pageSizeIk > 0 {
|
|
|
-
|
|
|
- conditionActivityIk += ` ORDER BY art.activity_time DESC , art.active_state ASC `
|
|
|
- listIk, e := models.GetActivityListNew(conditionActivityIk, pars, user.UserId, startSizeIk, pageSizeIk, 0, 0, "")
|
|
|
+ var totalIk int
|
|
|
+ if len(keyWordArr) > 1 {
|
|
|
+
|
|
|
+
|
|
|
+ conditionActivityIk, e := GetActivityonditionList(user, "", "", "", "", "", 0, 1, keyword, 0, 2)
|
|
|
+ if e != nil && e.Error() != utils.ErrNoRow() {
|
|
|
+ err = errors.New("GetActivityonditionList, Err: " + e.Error())
|
|
|
+ return
|
|
|
+ }
|
|
|
+ conditionActivityIk += " AND art.is_limit_people = 1 AND art.publish_status = 1 "
|
|
|
+ totalIk, e = models.GetActivityCount(conditionActivityIk, 0, pars, 0)
|
|
|
if e != nil {
|
|
|
err = errors.New("GetActivityonditionList, Err: " + e.Error())
|
|
|
return
|
|
|
}
|
|
|
- for _, item := range listIk {
|
|
|
- list = append(list, item)
|
|
|
+ keyWordArr = RemoveDuplicatesAndEmpty(keyWordArr)
|
|
|
+ startSizeIk := startSize - totalSearche
|
|
|
+ if startSizeIk < 0 {
|
|
|
+ startSizeIk = 0
|
|
|
+ }
|
|
|
+ var pageSizeIk int
|
|
|
+ pageSizeIk = pageSize - len(list)
|
|
|
+ if pageSizeIk > 0 {
|
|
|
+
|
|
|
+ conditionActivityIk += ` ORDER BY art.activity_time DESC , art.active_state ASC `
|
|
|
+ listIk, e := models.GetActivityListNew(conditionActivityIk, pars, user.UserId, startSizeIk, pageSizeIk, 0, 0, "")
|
|
|
+ if e != nil {
|
|
|
+ err = errors.New("GetActivityonditionList, Err: " + e.Error())
|
|
|
+ return
|
|
|
+ }
|
|
|
+ for _, item := range listIk {
|
|
|
+ list = append(list, item)
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+ total = totalSearche + totalIk
|
|
|
items, e = HandleActivityListButton(list, user)
|
|
|
if e != nil {
|
|
|
err = errors.New("HandleActivityListButton, Err: " + e.Error())
|
|
@@ -584,7 +585,7 @@ func GetActivitySpecialSearcheList(user *models.WxUserItem, condition string, st
|
|
|
return
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+
|
|
|
func GetActivitySpecialUserType(companyId int) (userType int, permissionStrnew string, err error) {
|
|
|
var permissionStr string
|
|
|
if companyId <= 1 {
|
|
@@ -642,8 +643,8 @@ func GetActivitySpecialUserType(companyId int) (userType int, permissionStrnew s
|
|
|
return
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
func GetSpecialUserType(user *models.WxUserItem) (userType int, err error) {
|
|
|
companyId := user.CompanyId
|
|
|
companyDetail, e := models.GetCompanyDetailByIdGroupTrip(companyId)
|
|
@@ -687,7 +688,7 @@ func GetSpecialUserType(user *models.WxUserItem) (userType int, err error) {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+
|
|
|
func GetSpecialDetailUserPower(user *models.WxUserItem, activityInfo *models.CygxActivitySpecialDetail) (havePower bool, err error) {
|
|
|
permissionStr, e := GetCompanyPermissionUpgrade(user.CompanyId)
|
|
|
if e != nil {
|
|
@@ -729,7 +730,7 @@ func GetSpecialDetailUserPower(user *models.WxUserItem, activityInfo *models.Cyg
|
|
|
return
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+
|
|
|
func SendWxMsgActivitySpecial10(activityInfo *models.CygxActivitySpecialDetail) (err error) {
|
|
|
activityId := activityInfo.ActivityId
|
|
|
var msg string
|
|
@@ -797,7 +798,7 @@ func SendWxMsgActivitySpecial10(activityInfo *models.CygxActivitySpecialDetail)
|
|
|
return
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+
|
|
|
func SendWxMsgActivitySpecialTwoDays(cont context.Context) (err error) {
|
|
|
var msg string
|
|
|
defer func() {
|
|
@@ -904,7 +905,7 @@ func SendWxMsgActivitySpecialTwoDays(cont context.Context) (err error) {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+
|
|
|
func SendWxMsgActivitySpecialCancel(cont context.Context) (err error) {
|
|
|
var msg string
|
|
|
defer func() {
|