Merge branch 'master' into feature-channel-contract-20230519

src/main/java/cn/quantgroup/xyqb/controller/internal/user/InnerController.java

@@ -1725,6 +1725,12 @@ public class InnerController implements IBaseController {
     return JsonResult.buildSuccessResult("已经开始清洗");
   }
 
+  @RequestMapping("/delete/session")
+  public JsonResult deleteSession(Long userId){
+    sessionService.deleteByUserId(userId);
+    return JsonResult.buildSuccessResult();
+  }
+
   /**
    * 注销用户
    *

src/main/java/cn/quantgroup/xyqb/controller/modifyphoneno/resp/ModifyPhoneNoResp.java

@@ -4,6 +4,7 @@ import cn.quantgroup.xyqb.entity.ModifyPhoneNo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import java.sql.Timestamp;
 import java.util.Date;
+import java.util.Optional;
 import lombok.Data;
 
 /**
@@ -101,7 +102,7 @@ public class ModifyPhoneNoResp {
         modifyPhoneNoResp.setApplyStatus(modifyPhoneNo.getApplyStatus());
         modifyPhoneNoResp.setApplyStatusReason(modifyPhoneNo.getApplyStatusReason());
         modifyPhoneNoResp.setProcessingStatus(modifyPhoneNo.getProcessingStatus());
-        modifyPhoneNoResp.setApplySource(modifyPhoneNo.getApplySource().ordinal());
+        modifyPhoneNoResp.setApplySource(Optional.ofNullable(modifyPhoneNo.getApplySource()).map(Enum::ordinal).orElse(null));
         return modifyPhoneNoResp;
     }
 }

src/main/java/cn/quantgroup/xyqb/event/CacheEvictPhoneNoUpdateEventListener.java

@@ -44,6 +44,9 @@ public class CacheEvictPhoneNoUpdateEventListener implements ApplicationListener
             User sessionUser = values.getUser();
             //修改 session 中的手机号
             sessionUser.setPhoneNo(user.getPhoneNo());
+            if(user.getPhoneNo().equals(oldPhoneNo)){
+                log.error("修改后的手机号不能是旧手机号");
+            }
             values.setUser(sessionUser);
         }
         sessionService.persistSession(sessionStructList);