update

server/api/v1/course/course_action.go

@@ -201,7 +201,7 @@ func (courseActionApi *CourseActionApi) FindCourseActionWeb(c *gin.Context) {
 		response.FailWithMessage(err.Error(), c)
 		return
 	}
-	if recourseAction, err := courseActionService.GetCourseAction(courseAction.ID); err != nil {
+	if recourseAction, err := courseActionService.GetCourseActionByIdAddr(courseAction.ID,courseAction.Address); err != nil {
 		global.GVA_LOG.Error("查询失败!", zap.Error(err))
 		response.FailWithMessage("查询失败", c)
 	} else {

server/api/v1/course/course_signup.go

@@ -224,10 +224,12 @@ func (courseSignupApi *CourseSignupApi) SignCourse(c *gin.Context) {
 	}
 
 	if err == nil && !*cs.IsPass{
-		response.OkWithMessage("已报名,等待审核", c)
+		response.OkWithDetailed(*courseSignup.Cid,"已报名,等待审核", c)
+		// response.OkWithMessage("已报名,等待审核", c)
 		return
 	} else if err == nil && *cs.IsPass {
-		response.OkWithMessage("已报名", c)
+		response.OkWithDetailed(*courseSignup.Cid,"已报名", c)
+		// response.OkWithMessage("已报名", c)
 		return
 	}
 
@@ -242,7 +244,8 @@ func (courseSignupApi *CourseSignupApi) SignCourse(c *gin.Context) {
 			response.FailWithMessage("更新用户信息失败", c)
 			return
 		}
-		response.OkWithMessage("报名成功", c)
+		response.OkWithDetailed(*courseSignup.Cid,"报名成功", c)
+		// response.OkWithMessage("报名成功", c)
 	}
 }
 

server/api/v1/example/exa_file_upload_download.go

 package example
 
 import (
-	"github.com/gin-gonic/gin"
-	"go.uber.org/zap"
 	"courseSign/server/global"
 	"courseSign/server/model/common/request"
 	"courseSign/server/model/common/response"
 	"courseSign/server/model/example"
 	exampleRes "courseSign/server/model/example/response"
+	"github.com/gin-gonic/gin"
+	"go.uber.org/zap"
 )
 
 type FileUploadAndDownloadApi struct{}

server/service/course/course_action.go

@@ -46,6 +46,28 @@ func (courseActionService *CourseActionService)GetCourseAction(id uint) (courseA
 	return
 }
 
+// GetCourseAction 根据id获取CourseAction记录
+// Author [piexlmax](https://github.com/piexlmax)
+func (courseActionService *CourseActionService)GetCourseActionByIdAddr(id uint,addr string) (courseAction course.CourseAction, err error) {
+	err = global.GVA_DB.Where("id = ?", id).First(&courseAction).Error
+	if addr != "" {
+		var user course.CourseUsers
+		err = global.GVA_DB.Model(&course.CourseUsers{}).Where("address = ?",addr).First(&user).Error
+		if err != nil {
+			return
+		}
+		var cas course.CourseActionUsers
+		err = global.GVA_DB.Model(&course.CourseActionUsers{}).Where("aid = ? and uid = ?",id,user.ID).First(&cas).Error
+		if err != nil && err != gorm.ErrRecordNotFound {
+			return
+		}
+		if err == nil {
+			courseAction.IsSign = true
+		}
+	}
+	return
+}
+
 // GetCourseActionInfoList 分页获取CourseAction记录
 // Author [piexlmax](https://github.com/piexlmax)
 func (courseActionService *CourseActionService)GetCourseActionInfoList(info courseReq.CourseActionSearch) (list []course.CourseAction, total int64, err error) {