提交

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginUser.java

@@ -28,11 +28,21 @@ public class LoginUser implements Serializable {
     private String tenantId;
 
     /**
+     * 主账号id
+     */
+    private Long masterId;
+
+    /**
      * 用户ID
      */
     private Long userId;
 
     /**
+     * 是否开票
+     */
+    private Boolean invoice;
+
+    /**
      * 部门ID
      */
     private Long deptId;

ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java

@@ -38,6 +38,8 @@ public class LoginHelper {
     public static final String DEPT_KEY = "deptId";
     public static final String CLIENT_KEY = "clientid";
     public static final String TENANT_ADMIN_KEY = "isTenantAdmin";
+    public static final String MASTER_ID_KEY = "masterId";
+    public static final String INVOICE_KEY = "invoice";
 
     /**
      * 登录系统 基于 设备类型
@@ -56,7 +58,10 @@ public class LoginHelper {
         StpUtil.login(loginUser.getLoginId(),
                 model.setExtra(TENANT_KEY, loginUser.getTenantId())
                         .setExtra(USER_KEY, loginUser.getUserId())
-                        .setExtra(DEPT_KEY, loginUser.getDeptId()));
+                        .setExtra(DEPT_KEY, loginUser.getDeptId())
+                        .setExtra(MASTER_ID_KEY, loginUser.getMasterId())
+                        .setExtra(INVOICE_KEY, loginUser.getInvoice())
+        );
         StpUtil.getTokenSession().set(LOGIN_USER_KEY, loginUser);
     }
 
@@ -85,6 +90,20 @@ public class LoginHelper {
     }
 
     /**
+     * 获取主账号id
+     */
+    public static Long getMasterId() {
+        return Convert.toLong(getExtra(MASTER_ID_KEY));
+    }
+
+    /**
+     * 获取是否开票
+     */
+    public static Boolean isInvoice() {
+        return Convert.toBool(getExtra(INVOICE_KEY));
+    }
+
+    /**
      * 获取用户id
      */
     public static Long getUserId() {