jmash-core-mp 0.1.49 → 0.1.51

package/lib/api/storage/index.d.ts

@@ -1,8 +1,9 @@
 import { ResponseData } from "../../api/types";
-import { StorageOrganInfoReq, StorageOrganInfoList, StorageOrganBrowserUpdateReq, StorageOrganBrowserModel } from "./types";
+import { StorageOrganInfoReq, StorageOrganInfoList, StorageOrganBrowserUpdateReq, StorageOrganBrowserModel, StorageOrganInfoModel } from "./types";
 declare class StorageApiImpl {
     findMyOrganList(data: StorageOrganInfoReq): Promise<ResponseData<StorageOrganInfoList>>;
     findStorageBrowserOrganList(data: StorageOrganInfoReq): Promise<ResponseData<StorageOrganInfoList>>;
+    findOrganTenant(): Promise<ResponseData<StorageOrganInfoModel>>;
     findStorageOrganInfoList(data: StorageOrganInfoReq): Promise<ResponseData<StorageOrganInfoList>>;
     updateStorageOrganBrowser(data: StorageOrganBrowserUpdateReq): Promise<ResponseData<StorageOrganBrowserModel>>;
 }

package/lib/api/storage/index.js

@@ -1,5 +1,6 @@
 import mpx from "@mpxjs/core";
 import { grpc } from "../../utils/grpc";
+import { useOrganStore } from "../../store/organ";
 class StorageApiImpl {
     // 查询我的组织列表
     findMyOrganList(data) {
@@ -18,6 +19,15 @@ class StorageApiImpl {
             method: "GET",
         });
     }
+    // 查询组织租户
+    findOrganTenant() {
+        const config = getApp().globalData.config;
+        const organStore = useOrganStore();
+        return mpx.xfetch.fetch({
+            url: `/v1/storage/storage_organ_info/organ_tenant/${config.tenant}/${organStore.organTenant}`,
+            method: "GET",
+        });
+    }
     // 查询列表信息店铺
     findStorageOrganInfoList(data) {
         const config = getApp().globalData.config;

package/lib/api/storage/types.d.ts

@@ -2,6 +2,10 @@ export interface StorageOrganInfoReq {
     serviceType: string;
     likeOrganName?: string;
 }
+export interface StorageOrganTenant {
+    tenant?: string;
+    organTenant?: string;
+}
 export interface StorageOrganInfoList {
     results: StorageOrganInfoModel[];
 }

package/lib/store/organ.d.ts

@@ -5,5 +5,6 @@ interface OrganState {
 }
 export declare const useOrganStore: import("@mpxjs/pinia").StoreDefinition<"organ", OrganState, {}, {
     setOrganInfo(data: StorageOrganInfoModel): void;
+    setOrganTenant(organTenant: string): void;
 }>;
 export {};

package/lib/store/organ.js

@@ -1,4 +1,5 @@
 import { defineStore } from "@mpxjs/pinia";
+import { storageApi } from "../api/storage";
 import { db } from "../utils/db";
 export const useOrganStore = defineStore("organ", {
     state: () => ({
@@ -6,12 +7,23 @@ export const useOrganStore = defineStore("organ", {
         organInfo: db.getOrganInfo() || {},
     }),
     actions: {
-        //设置组织信息
+        //设置组织信息.
         setOrganInfo(data) {
             this.organInfo = data;
             this.organTenant = data.organTenant;
             db.setOrganInfo(data);
             db.setOrganTenant(data.organTenant);
         },
+        //设置组织租户和组织信息.
+        setOrganTenant(organTenant) {
+            storageApi.findOrganTenant().then((res) => {
+                if (res.statusCode === 200) {
+                    this.organInfo = res.data;
+                    this.organTenant = organTenant;
+                    db.setOrganInfo(res.data);
+                    db.setOrganTenant(organTenant);
+                }
+            });
+        },
     },
 });

package/lib/store/user.d.ts

@@ -6,6 +6,8 @@ interface UserState {
     permCodes: string[];
     accessToken: string;
     expiresDate: number;
+    isSales: boolean;
+    referee: string;
 }
 export declare const useUserStore: import("@mpxjs/pinia").StoreDefinition<"user", UserState, {}, {
     /** 登录检查 */
@@ -27,5 +29,7 @@ export declare const useUserStore: import("@mpxjs/pinia").StoreDefinition<"user"
     setUserInfo(userInfo: UserInfo): void;
     getRolePerm(cache?: boolean): Promise<RolesPerms>;
     refreshToken(): Promise<boolean>;
+    setSales(isSales: boolean): void;
+    setReferee(referee: string): void;
 }>;
 export {};

package/lib/store/user.js

@@ -10,6 +10,10 @@ export const useUserStore = defineStore("user", {
         permCodes: db.getPermCodes() || [],
         accessToken: db.getToken() || "",
         expiresDate: db.getTokenExpiresDate() || 0,
+        // 是否销售员
+        isSales: db.getSales() || false,
+        // 推荐人
+        referee: db.getReferee() || "",
     }),
     actions: {
         /** 登录检查 */
@@ -222,5 +226,15 @@ export const useUserStore = defineStore("user", {
                 return true;
             });
         },
+        // 设置销售员
+        setSales(isSales) {
+            this.isSales = isSales;
+            db.setSales(isSales);
+        },
+        // 设置推荐人
+        setReferee(referee) {
+            this.referee = referee;
+            db.setReferee(referee);
+        },
     },
 });

package/lib/utils/db.d.ts

@@ -1,5 +1,5 @@
 import type { TokenModel, UserInfo } from "../api/auth/types";
-import { StorageOrganInfoModel } from "@/api/storage/types";
+import { StorageOrganInfoModel } from "../api/storage/types";
 declare class LocalStorage {
     getToken(): string;
     getUserTenant(): string;
@@ -16,6 +16,16 @@ declare class LocalStorage {
     setRoleCodes(codes: string[]): void;
     getPermCodes(): any;
     setPermCodes(codes: string[]): void;
+    getSales(): boolean;
+    setSales(isSales: boolean): void;
+    /**
+     * 获取推荐人
+     */
+    getReferee(): string;
+    /**
+     * 设置推荐人
+     */
+    setReferee(referee: string): void;
     getOrganTenant(): string;
     setOrganTenant(organTenant: string): void;
     getOrganInfo(): StorageOrganInfoModel;

package/lib/utils/db.js

@@ -75,6 +75,26 @@ class LocalStorage {
     setPermCodes(codes) {
         mpx.setStorageSync("permCodes", codes);
     }
+    // 用户是否销售员
+    getSales() {
+        return mpx.getStorageSync("isSales") || false;
+    }
+    // 设置销售员
+    setSales(isSales) {
+        mpx.setStorageSync("isSales", isSales);
+    }
+    /**
+     * 获取推荐人
+     */
+    getReferee() {
+        return mpx.getStorageSync("refereeUserId") || "";
+    }
+    /**
+     * 设置推荐人
+     */
+    setReferee(referee) {
+        mpx.setStorageSync("refereeUserId", referee);
+    }
     //获取组织租户
     getOrganTenant() {
         const config = getApp().globalData.config;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jmash-core-mp",
-  "version": "0.1.49",
+  "version": "0.1.51",
   "private": false,
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/src/api/storage/index.ts

@@ -1,11 +1,13 @@
 import mpx from "@mpxjs/core";
 import { ResponseData } from "../../api/types";
 import { grpc } from "../../utils/grpc";
+import { useOrganStore } from "../../store/organ";
 import {
   StorageOrganInfoReq,
   StorageOrganInfoList,
   StorageOrganBrowserUpdateReq,
   StorageOrganBrowserModel,
+  StorageOrganInfoModel,
 } from "./types";
 
 class StorageApiImpl {
@@ -32,6 +34,16 @@ class StorageApiImpl {
     });
   }
 
+  // 查询组织租户
+  findOrganTenant(): Promise<ResponseData<StorageOrganInfoModel>> {
+    const config = getApp().globalData.config;
+    const organStore = useOrganStore();
+    return mpx.xfetch.fetch({
+      url: `/v1/storage/storage_organ_info/organ_tenant/${config.tenant}/${organStore.organTenant}`,
+      method: "GET",
+    });
+  }
+
   // 查询列表信息店铺
   findStorageOrganInfoList(
     data: StorageOrganInfoReq

package/src/api/storage/types.ts

@@ -5,6 +5,15 @@ export interface StorageOrganInfoReq {
   // 组织名称模糊检索
   likeOrganName?: string;
 }
+
+// 组织租户
+export interface StorageOrganTenant {
+  // 租户
+  tenant?: string;
+  // 组织租户
+  organTenant?: string;
+}
+
 // 组织列表
 export interface StorageOrganInfoList {
   // 当前内容

package/src/store/organ.ts

@@ -1,4 +1,5 @@
 import { defineStore } from "@mpxjs/pinia";
+import { storageApi } from "../api/storage";
 import { StorageOrganInfoModel } from "../api/storage/types";
 import { db } from "../utils/db";
 
@@ -15,12 +16,23 @@ export const useOrganStore = defineStore("organ", {
     organInfo: db.getOrganInfo() || {},
   }),
   actions: {
-    //设置组织信息
+    //设置组织信息.
     setOrganInfo(data: StorageOrganInfoModel) {
       this.organInfo = data;
       this.organTenant = data.organTenant;
       db.setOrganInfo(data);
       db.setOrganTenant(data.organTenant);
     },
+    //设置组织租户和组织信息.
+    setOrganTenant(organTenant: string) {
+      storageApi.findOrganTenant().then((res) => {
+        if (res.statusCode === 200) {
+          this.organInfo = res.data;
+          this.organTenant = organTenant;
+          db.setOrganInfo(res.data);
+          db.setOrganTenant(organTenant);
+        }
+      });
+    },
   },
 });

package/src/store/user.ts

@@ -25,6 +25,10 @@ interface UserState {
   accessToken: string;
   //Token过期时间
   expiresDate: number;
+  // 是否销售员
+  isSales: boolean;
+  // 推荐人
+  referee: string;
 }
 
 export const useUserStore = defineStore("user", {
@@ -34,6 +38,10 @@ export const useUserStore = defineStore("user", {
     permCodes: (db.getPermCodes() as string[]) || [],
     accessToken: (db.getToken() as string) || "",
     expiresDate: (db.getTokenExpiresDate() as number) || 0,
+    // 是否销售员
+    isSales: db.getSales() || false,
+    // 推荐人
+    referee: db.getReferee() || "",
   }),
   actions: {
     /** 登录检查 */
@@ -265,5 +273,15 @@ export const useUserStore = defineStore("user", {
           return true;
         });
     },
+    // 设置销售员
+    setSales(isSales: boolean): void {
+      this.isSales = isSales;
+      db.setSales(isSales);
+    },
+    // 设置推荐人
+    setReferee(referee: string): void {
+      this.referee = referee;
+      db.setReferee(referee);
+    },
   },
 });

package/src/utils/db.ts

@@ -1,6 +1,6 @@
 import mpx from "@mpxjs/core";
 import type { TokenModel, UserInfo } from "../api/auth/types";
-import { StorageOrganInfoModel } from "@/api/storage/types";
+import { StorageOrganInfoModel } from "../api/storage/types";
 
 // 本地存储
 class LocalStorage {
@@ -92,6 +92,28 @@ class LocalStorage {
     mpx.setStorageSync("permCodes", codes);
   }
 
+  // 用户是否销售员
+  getSales(): boolean {
+    return mpx.getStorageSync("isSales") || false;
+  }
+  // 设置销售员
+  setSales(isSales: boolean): void {
+    mpx.setStorageSync("isSales", isSales);
+  }
+
+  /**
+   * 获取推荐人
+   */
+  getReferee(): string {
+    return mpx.getStorageSync("refereeUserId") || "";
+  }
+  /**
+   * 设置推荐人
+   */
+  setReferee(referee: string): void {
+    mpx.setStorageSync("refereeUserId", referee);
+  }
+
   //获取组织租户
   getOrganTenant(): string {
     const config = getApp().globalData.config;