待绑定卡在首次完善时更新状态

ie-admin/src/main/java/com/ruoyi/web/service/SysRegisterService.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.google.common.collect.Lists;
 import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.enums.BindStatus;
 import com.ruoyi.common.enums.UserRegStatus;
 import com.ruoyi.common.exception.base.BaseException;
 import com.ruoyi.common.utils.NumberUtils;
@@ -116,6 +117,7 @@ public class SysRegisterService
             upCard.setDistributeStatus(exist.getDistributeStatus());
             upCard.setDays(exist.getDays());
             upUser.setUserId(loginUser.getUserId());
+            upUser.setBindStatus(loginUser.getUser().getBindStatus());
         }
         upUser.setUserName(username);
         if (StringUtils.isEmpty(username)) {
@@ -230,10 +232,13 @@ public class SysRegisterService
             card.setSchoolId(register.getSchoolId());
             card.setClassId(register.getClassId());
 
-            if(null == user.getCardId() || !user.getCardId().equals(card.getCardId())) { // 未绑定或换绑时激活卡
+            if(null == user.getCardId() || !user.getCardId().equals(card.getCardId()) || BindStatus.Pend.code().equals(user.getBindStatus())) { // 未绑定或换绑时激活卡
                 if(!CardDistributeStatus.Assign.getVal().equals(card.getDistributeStatus()) || !CardStatus.Free.getVal().equals(card.getStatus())) {
                     throw new RuntimeException("无效卡");
                 }
+                if(BindStatus.Pend.code().equals(user.getBindStatus())) {
+                    user.setBindStatus(BindStatus.Bind.code());
+                }
                 user.setEvalCounts("{\"1\":1,\"2\":1,\"3\":1,\"4\":1,\"9\":1,\"11\":1,\"0\":0}");
                 user.setCardId(card.getCardId());
                 user.setRegStatus(UserRegStatus.Student);