update

.gitignore

 .idea/
 /web/node_modules
 /web/dist
-
+node_modules
 .DS_Store
 
 # local env files

server/api/v1/course/course_users.go

@@ -296,6 +296,7 @@ func (courseUsersApi *CourseUsersApi) MetaMaskLogin(c *gin.Context) {
 	} else if err != nil {
 		global.GVA_LOG.Error("设置登录状态失败!", zap.Error(err))
 		response.FailWithMessage("设置登录状态失败", c)
+		return
 	} else {
 		var blackJWT system.JwtBlacklist
 		blackJWT.Jwt = jwtStr
@@ -319,6 +320,7 @@ func (courseUsersApi *CourseUsersApi) MetaMaskLogin(c *gin.Context) {
 	} else if err != nil {
 		global.GVA_LOG.Error("设置设备码状态失败!", zap.Error(err))
 		response.FailWithMessage("设置设备码状态失败", c)
+		return
 	} else {
 		var blackJWT system.JwtBlacklist
 		blackJWT.Jwt = deviceStr
@@ -366,6 +368,7 @@ func (courseUsersApi *CourseUsersApi) MetaMaskLogin(c *gin.Context) {
 			return
 		}
 		response.OkWithData(token, c)
+		return
 	}
 
 	// 用户已存在 有邀请人  直接返回token
@@ -383,7 +386,7 @@ func (courseUsersApi *CourseUsersApi) MetaMaskLogin(c *gin.Context) {
 			response.FailWithMessage("邀请者不存在", c)
 			return
 		}
-		iuser,err := courseUsersService.GetCourseUsersByAddr(loginUser.Invitor)
+		_,err = courseUsersService.GetCourseUsersByAddr(loginUser.Invitor)
 		if err != nil && err == gorm.ErrRecordNotFound{
 			response.FailWithMessage("邀请者不存在", c)
 			return
@@ -391,8 +394,8 @@ func (courseUsersApi *CourseUsersApi) MetaMaskLogin(c *gin.Context) {
 			response.FailWithMessage(err.Error(), c)
 			return
 		}
-		iuser.Invitor = loginUser.Invitor
-		err = courseUsersService.UpdateCourseUsers(iuser)
+		user.Invitor = loginUser.Invitor
+		err = courseUsersService.UpdateCourseUsers(user)
 		if err != nil {
 			global.GVA_LOG.Error("更新用户信息失败!", zap.Error(err))
 			response.FailWithMessage("更新用户信息失败", c)

server/model/course/course_users.go

@@ -19,6 +19,7 @@ type CourseUsers struct {
       Position  string `json:"position" form:"position" gorm:"column:position;comment:职务;size:36;"`
       Invitor  string `json:"invitor" form:"invitor" gorm:"column:invitor;comment:邀请者;size:72;"`
       IsAdmin  *bool `json:"isAdmin" form:"isAdmin" gorm:"column:is_admin;default:0;comment:管理员;size:72;"`
+      Number  int `json:"number" form:"number" gorm:"column:number;comment:学号;"`
 
       // CourseSignup `gorm:"foreignKey:Uid"`
       // CourseActionUsers `gorm:"foreignKey:Uid"`

server/service/course/course_signup.go

 package course
 
 import (
+	"errors"
+
 	"courseSign/server/global"
 	"courseSign/server/model/common/request"
 	"courseSign/server/model/course"
 	courseReq "courseSign/server/model/course/request"
+	"go.uber.org/zap"
 )
 
 type CourseSignupService struct {
@@ -34,6 +37,45 @@ func (courseSignupService *CourseSignupService)DeleteCourseSignupByIds(ids reque
 // UpdateCourseSignup 更新CourseSignup记录
 // Author [piexlmax](https://github.com/piexlmax)
 func (courseSignupService *CourseSignupService)UpdateCourseSignup(courseSignup course.CourseSignup) (err error) {
+	var preSign course.CourseSignup
+	var user course.CourseUsers
+	tx := global.GVA_DB.Begin()
+	err = tx.Model(&course.CourseUsers{}).Where("id = ?",courseSignup.Uid).First(&user).Error
+	if err != nil {
+		tx.Rollback()
+		return
+	}
+	err = tx.Model(&course.CourseSignup{}).Where("id = ?",courseSignup.ID).Error
+	if err != nil {
+		tx.Rollback()
+		return
+	}
+	// 审核通过 分配学号
+	if *preSign.IsPass && *courseSignup.IsPass {
+		if user.Number > 0 {
+			err = errors.New("异常！用户已存在学号")
+			return
+		}
+
+		var next int
+		var numberUser course.CourseUsers
+		err = tx.Model(&course.CourseUsers{}).Order("number desc").First(&numberUser).Error
+		if err != nil {
+			tx.Rollback()
+			return
+		}
+		if numberUser.Number == 0 {
+			next = 88800001
+		} else {
+			next = numberUser.Number+1
+		}
+		global.GVA_LOG.Info("UpdateCourseSignup",zap.Int("number pre",next),zap.Int("number next",next))
+		err = tx.Model(&course.CourseUsers{}).Where("id = ?",courseSignup.Uid).Update("number",next).Error
+		if err != nil {
+			tx.Rollback()
+			return
+		}
+	}
 	err = global.GVA_DB.Save(&courseSignup).Error
 	return err
 }