update

server/api/v1/course/course_action_users.go

@@ -245,12 +245,11 @@ func (courseActionUsersApi *CourseActionUsersApi) SignAction(c *gin.Context) {
 		response.FailWithMessage("报名审核未通过", c)
 		return
 	}
-
 	if err := courseActionUsersService.CreateCourseActionUsers(courseActionUsers); err != nil {
-		global.GVA_LOG.Error("创建失败!", zap.Error(err))
-		response.FailWithMessage("创建失败", c)
+		global.GVA_LOG.Error("签到失败!", zap.Error(err))
+		response.FailWithMessage("签到失败", c)
 	} else {
-		response.OkWithMessage("创建成功", c)
+		response.OkWithMessage("签到成功", c)
 	}
 }
 
@@ -414,9 +413,9 @@ func (courseActionUsersApi *CourseActionUsersApi) WebSignAction(c *gin.Context)
 	courseActionUsers.Aid = &iid
 
 	if err := courseActionUsersService.CreateCourseActionUsers(courseActionUsers); err != nil {
-		global.GVA_LOG.Error("创建失败!", zap.Error(err))
-		response.FailWithMessage("创建失败", c)
+		global.GVA_LOG.Error("签到失败!", zap.Error(err))
+		response.FailWithMessage("签到失败", c)
 	} else {
-		response.OkWithMessage("创建成功", c)
+		response.OkWithMessage("签到成功", c)
 	}
 }

server/api/v1/course/course_users.go

@@ -370,17 +370,17 @@ func (courseUsersApi *CourseUsersApi) MetaMaskLogin(c *gin.Context) {
 // @Summary 分页获取CourseUsers列表
 // @accept application/json
 // @Produce application/json
-// @Param data query courseReq.CourseUsersSearch true "分页获取CourseUsers列表"
+// @Param data query courseReq.ReqId true "获取设备码"
 // @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
 // @Router /courseUsers/getCode [get]
 func (courseUsersApi *CourseUsersApi) GetDeviceCode(c *gin.Context) {
-	var pageInfo courseReq.CourseUsersSearch
+	var pageInfo courseReq.ReqId
 	err := c.ShouldBindQuery(&pageInfo)
 	if err != nil {
 		response.FailWithMessage(err.Error(), c)
 		return
 	}
-
+	var res course.ResponseDeviceCode
 	deviceStr, err := jwtService.GetRedisJWT(c.Request.Header.Get("address"))
 	if err == redis.Nil {
 		response.FailWithMessage("code not exists",c)
@@ -392,5 +392,17 @@ func (courseUsersApi *CourseUsersApi) GetDeviceCode(c *gin.Context) {
 		response.FailWithMessage(err.Error(),c)
 		return
 	}
-	response.OkWithData(claims.DeviceCode,c)
+	user,err := courseUsersService.GetCourseUsersByAddr(c.Request.Header.Get("address"))
+	if err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	res.Code = claims.DeviceCode
+	if pageInfo.Aid > 0 {
+		_,err = courseActionUsersService.GetCourseActionUsersByUidAndAid(pageInfo.Aid,int(user.ID))
+		if err == nil {
+			res.IsSign = true
+		}
+	}
+	response.OkWithData(res,c)
 }
\ No newline at end of file

server/model/course/course_action_users.go

@@ -13,7 +13,7 @@ type CourseActionUsers struct {
       Uid  *int `json:"uid" form:"uid" gorm:"column:uid;comment:用户;size:10;"`
       Cid  *int `json:"cid" form:"cid" gorm:"column:cid;comment:课程;size:10;"`
       Aid  *int `json:"aid" form:"aid" gorm:"column:aid;comment:活动编号;size:10;"`
-      IsSign  *bool `json:"isSign" form:"isSign" gorm:"column:is_sign;comment:签到 0 未签到 1 已签到;"`
+      IsSign  *bool `json:"isSign" form:"isSign" gorm:"column:is_sign;default:0;comment:签到 0 未签到 1 已签到;"`
       SignDate  *time.Time `json:"signDate" form:"signDate" gorm:"column:sign_date;comment:签到日期;"`
 
       Addr string `json:"addr" form:"addr" gorm:"-"`

server/model/course/course_users.go

@@ -31,3 +31,8 @@ func (CourseUsers) TableName() string {
   return "course_users"
 }
 
+
+type ResponseDeviceCode struct {
+      Code string
+      IsSign bool
+}
\ No newline at end of file

server/model/course/request/course_users.go

 package request
 
 import (
-	"courseSign/server/model/course"
-	"courseSign/server/model/common/request"
 	"time"
+
+	"courseSign/server/model/common/request"
+	"courseSign/server/model/course"
 )
 
 type CourseUsersSearch struct{
@@ -12,3 +13,9 @@ type CourseUsersSearch struct{
     EndCreatedAt   *time.Time `json:"endCreatedAt" form:"endCreatedAt"`
     request.PageInfo
 }
+
+type ReqId struct {
+	Id int `json:"id" form:"id"`
+	Cid int `json:"cid" form:"cid"`
+	Aid int `json:"aid" form:"aid"`
+}
\ No newline at end of file

server/service/course/course_action.go

@@ -94,7 +94,7 @@ func (courseActionService *CourseActionService)GetCourseActionInfoList(info cour
 				err = nil
 				continue
 			}
-			courseActions[k].IsSign = *cau.IsSign
+			courseActions[k].IsSign = true
 			courseActions[k].SignDate = cau.SignDate
 		}
 	}