update

server/api/v1/course/course_action_users.go

@@ -269,11 +269,11 @@ func (courseActionUsersApi *CourseActionUsersApi) GetMyAction(c *gin.Context) {
 		return
 	}
 
-	// user,err := courseUsersService.GetCourseUsersByAddr(pageInfo.Addr)
-	// if err != nil {
-	// 	response.FailWithMessage(err.Error(), c)
-	// 	return
-	// }
+	user,err := courseUsersService.GetCourseUsersByAddr(pageInfo.Addr)
+	if err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
 	// courseInfo,err := courseListService.GetCourseList(uint(*pageInfo.Cid))
 	// if err != nil {
 	// 	response.FailWithMessage(err.Error(), c)
@@ -286,7 +286,7 @@ func (courseActionUsersApi *CourseActionUsersApi) GetMyAction(c *gin.Context) {
 	// 	return
 	// }
 
-	if list, total, err := courseActionUsersService.GetCourseActionUsersInfoList(pageInfo); err != nil {
+	if list, total, err := courseActionUsersService.GetMyCourseActionList(pageInfo,user.ID); err != nil {
 		global.GVA_LOG.Error("获取失败!", zap.Error(err))
 		response.FailWithMessage("获取失败", c)
 	} else {

server/model/course/course_action.go

@@ -17,6 +17,10 @@ type CourseAction struct {
       ActionEnd  *time.Time `json:"actionEnd" form:"actionEnd" gorm:"column:action_end;NOT NULL;comment:活动结束时间;"`
       IsShow  *bool `json:"isShow" form:"isShow" gorm:"column:is_show;comment:上下线;"`
       Qr  string `json:"qr" form:"qr" gorm:"column:qr;comment:二维码;size:128;"`
+
+      IsSign bool `json:"isSign" form:"isSign" gorm:"-"`
+      SignDate  *time.Time `json:"signDate" form:"signDate" gorm:"-"`
+      Address string `json:"address" form:"address" gorm:"-"`
 }
 
 

server/service/course/course_action.go

@@ -5,6 +5,7 @@ import (
 	"courseSign/server/model/common/request"
 	"courseSign/server/model/course"
 	courseReq "courseSign/server/model/course/request"
+	"gorm.io/gorm"
 )
 
 type CourseActionService struct {
@@ -78,5 +79,25 @@ func (courseActionService *CourseActionService)GetCourseActionInfoList(info cour
     }
 
 	err = db.Limit(limit).Offset(offset).Find(&courseActions).Error
+	if info.Address != "" {
+		var user course.CourseUsers
+		err = global.GVA_DB.Model(&course.CourseUsers{}).Where("address = ?",info.Address).First(&user).Error
+		if err != nil {
+			return
+		}
+		for k, v := range courseActions {
+			var cau course.CourseActionUsers
+			err = global.GVA_DB.Model(&course.CourseActionUsers{}).Where("uid = ? and cid = ? and aid = ?",user.ID,v.Cid,v.ID).First(&cau).Error
+			if err != nil && err != gorm.ErrRecordNotFound {
+				return
+			} else if err != nil && err == gorm.ErrRecordNotFound {
+				err = nil
+				continue
+			}
+			courseActions[k].IsSign = *cau.IsSign
+			courseActions[k].SignDate = cau.SignDate
+		}
+	}
+
 	return  courseActions, total, err
 }

server/service/course/course_action_users.go

@@ -86,7 +86,7 @@ func (courseActionUsersService *CourseActionUsersService)GetCourseActionUsersInf
     }
 	err = db.Limit(limit).Offset(offset).Find(&courseActionUserss).Error
 
-	for _,v := range courseActionUserss {
+	for k,v := range courseActionUserss {
 		var courseInfo course.CourseList
 		err = global.GVA_DB.Model(&course.CourseList{}).Where("id = ?",v.Cid).First(&courseInfo).Error
 		if err != nil {
@@ -97,11 +97,42 @@ func (courseActionUsersService *CourseActionUsersService)GetCourseActionUsersInf
 		if err != nil {
 			return
 		}
-		v.CourseName = courseInfo.CourseName
-		v.ActionName = actionInfo.ActionName
-		v.ActionStart = actionInfo.ActionStart
-		v.ActionEnd = actionInfo.ActionEnd
-		v.IsShow = actionInfo.IsShow
+		courseActionUserss[k].CourseName = courseInfo.CourseName
+		courseActionUserss[k].ActionName = actionInfo.ActionName
+		courseActionUserss[k].ActionStart = actionInfo.ActionStart
+		courseActionUserss[k].ActionEnd = actionInfo.ActionEnd
+		courseActionUserss[k].IsShow = actionInfo.IsShow
+	}
+	return  courseActionUserss, total, err
+}
+
+
+// GetMyCourseActionList 分页获取CourseActionUsers记录
+// Author [piexlmax](https://github.com/piexlmax)
+func (courseActionUsersService *CourseActionUsersService)GetMyCourseActionList(info courseReq.CourseActionUsersSearch,uid uint) (list []course.CourseActionUsers, total int64, err error) {
+	var courseSignup []course.CourseSignup
+	err = global.GVA_DB.Model(&course.CourseSignup{}).Where("uid = ? and is_pass = ?",uid,true).Find(&courseSignup).Error
+	if err != nil {
+		return
+	}
+	var courseActionUserss []course.CourseActionUsers
+
+	for k,v := range courseActionUserss {
+		var courseInfo course.CourseList
+		err = global.GVA_DB.Model(&course.CourseList{}).Where("id = ?",v.Cid).First(&courseInfo).Error
+		if err != nil {
+			return
+		}
+		var actionInfo course.CourseAction
+		err = global.GVA_DB.Model(&course.CourseAction{}).Where("id = ?",v.Aid).First(&actionInfo).Error
+		if err != nil {
+			return
+		}
+		courseActionUserss[k].CourseName = courseInfo.CourseName
+		courseActionUserss[k].ActionName = actionInfo.ActionName
+		courseActionUserss[k].ActionStart = actionInfo.ActionStart
+		courseActionUserss[k].ActionEnd = actionInfo.ActionEnd
+		courseActionUserss[k].IsShow = actionInfo.IsShow
 	}
 	return  courseActionUserss, total, err
 }
\ No newline at end of file