Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into dwb

src/api/account/activate.ts

@@ -0,0 +1,85 @@
+import request from "@/utils/request";
+import { Account_BaseUrl } from "@/api/config";
+const baseURL = Account_BaseUrl + "/admin/activate";
+const API = {
+
+  getList() {
+    return request({
+      url: `${baseURL}`,
+      method: "get",
+    });
+  },
+  edit(data: editRequest) {
+    return request({
+      url: `${baseURL}`,
+      method: "put",
+      data: data,
+    });
+  },
+  add(data: addRequest) {
+    return request({
+      url: `${baseURL}`,
+      method: "post",
+      data: data,
+    });
+  }
+}
+export default API;
+
+export interface addRequest {
+  /**
+   * 充值金额
+   */
+  amount?: number;
+  /**
+   * 优惠卷id
+   */
+  couponId?: number;
+  /**
+   * 赠送金额
+   */
+  giftAmount?: number;
+  /**
+   * 赠送积分
+   */
+  giftPoints?: number;
+  /**
+   * 是否赠送优惠卷 0否 1是
+   */
+  isGiftCoupon?: number;
+  /**
+   * 优惠卷数量
+   */
+  num?: number;
+  [property: string]: any;
+}
+
+export interface editRequest {
+  /**
+   * 充值金额
+   */
+  amount: number;
+  /**
+   * 优惠卷id
+   */
+  couponId?: number;
+  /**
+   * 赠送金额
+   */
+  giftAmount?: number;
+  /**
+   * 赠送积分
+   */
+  giftPoints?: number;
+  id: number;
+  /**
+   * 是否赠送优惠卷 0否 1是
+   */
+  isGiftCoupon?: number;
+  /**
+   * 优惠卷数量
+   */
+  num?: number;
+  shopId?: number;
+  [property: string]: any;
+}

src/api/account/menu.ts

@@ -21,7 +21,7 @@ const MenuApi = {
     return request<any, MenuVO>({
       url: `${baseURL}/detail`,
       method: "get",
-      data: { id }
+      params: { id }
     });
   },
   add(data: addRequest) {
@@ -195,7 +195,7 @@ export interface editRequest {
   /**
    * 上级菜单，不传递则为顶级菜单
    */
-  pid?: number;
+  pid: number | string | null;
   title: string;
   [property: string]: any;
 }

src/api/account/permission.ts

@@ -0,0 +1,22 @@
+import request from "@/utils/request";
+import { Account_BaseUrl } from "@/api/config";
+const baseURL = Account_BaseUrl + "/admin";
+const ShopStaffApi = {
+  // 获取店铺权限列表
+  getshopPermission() {
+    return request<any>({
+      url: `${baseURL}/shopPermission`,
+      method: "get",
+    });
+  },
+  // 获取员工对应的权限id
+  getPermission(id: number | string) {
+    return request<any>({
+      url: `${baseURL}/shopStaff/permission`,
+      method: "get",
+      params: { id }
+    });
+  },
+};
+
+export default ShopStaffApi;

src/api/account/role.ts

@@ -17,20 +17,29 @@ const RoleApi = {
       data,
     });
   },
-  update(data: editRequest) {
-    return request<any, editResponse>({
+  update(id: number | string | null, data: editRequest) {
+    const requestData = { ...data, id };
+    return request<any>({
       url: `${baseURL}`,
       method: "put",
-      data,
+      data: requestData,
     });
   },
   delete(data: delRequest) {
     return request<any, delResponse>({
       url: `${baseURL}`,
-      method: "put",
+      method: "delete",
       data,
     });
   },
+  // 获取角色对应的菜单id
+  getMenu(id: number) {
+    return request<any>({
+      url: `${baseURL}/menu`,
+      method: "get",
+      params: { id },
+    });
+  },
 };
 
 export default RoleApi;
@@ -226,3 +235,4 @@ export interface delResponse {
   [property: string]: any;
 }
 /** delete end */
+

src/api/account/shopMerchant.ts

@@ -0,0 +1,55 @@
+import request from "@/utils/request";
+import { Account_BaseUrl } from "@/api/config";
+const baseURL = Account_BaseUrl + "/admin/shopMerchant";
+const API = {
+  get(shopId: string | number) {
+    return request({
+      url: `${baseURL}`,
+      method: "get",
+      headers: {
+        shopId: shopId
+      }
+    });
+  },
+  edit(shopId: string | number, data: shopMerchantType) {
+    return request({
+      url: `${baseURL}`,
+      method: "put",
+      data: data,
+      headers: {
+        shopId: shopId
+      }
+    });
+  }
+}
+export default API;
+/**
+ * ShopMerchantEditDTO
+ */
+export interface shopMerchantType {
+  /**
+   * 支付宝appid
+   */
+  alipaySmallAppid: null | string;
+  /**
+   * 商户应用id
+   */
+  appId: null | string;
+  /**
+   * 商户秘钥
+   */
+  appSecret: null | string;
+  /**
+   * 支付密码
+   */
+  payPassword: null | string;
+  /**
+   * 支付系统商户id
+   */
+  storeId: null | string;
+  /**
+   * 微信appid
+   */
+  wechatSmallAppid: null | string;
+  [property: string]: any;
+}

src/api/account/shopUser.ts

@@ -0,0 +1,160 @@
+import request from "@/utils/request";
+import { Account_BaseUrl } from "@/api/config";
+const baseURL = Account_BaseUrl + "/admin/shopUser";
+const API = {
+  // 获取店铺用户概述信息
+  getSummary(data: getSummaryRequest) {
+    return request({
+      url: `${baseURL}/summary`,
+      method: "get",
+      params: data
+    });
+  },
+  getList(data: getListRequest) {
+    return request({
+      url: `${baseURL}`,
+      method: "get",
+      params: data
+    });
+  },
+  edit(shopId: string | number, data: editRequest) {
+    return request({
+      url: `${baseURL}`,
+      method: "put",
+      data: data,
+      headers: {
+        shopId: shopId
+      }
+    });
+  },
+  // 店铺用户余额修改
+  editMoney(shopId: string | number, data: editMoneyRequest) {
+    return request({
+      url: `${baseURL}/money`,
+      method: "put",
+      data: data,
+      headers: {
+        shopId: shopId
+      }
+    });
+  },
+  add(shopId: string | number, data: addRequest) {
+    return request({
+      url: `${baseURL}`,
+      method: "post",
+      data: data,
+      headers: {
+        shopId: shopId
+      }
+    });
+  }
+}
+export default API;
+
+export interface getSummaryRequest {
+  /**
+   * 0 非vip 1 vip
+   */
+  isVip?: number;
+  [property: string]: any;
+}
+export interface getListRequest {
+  /**
+   * 0 非vip 1 vip
+   */
+  isVip?: number;
+  /**
+   * 昵称或手机号
+   */
+  key?: string;
+  [property: string]: any;
+}
+
+/**
+ * ShopUserEditDTO
+ */
+export interface editRequest {
+  /**
+   * 生日
+   */
+  birthDay?: null | string;
+  /**
+   * 对应shopUserid
+   */
+  id: number | null;
+  /**
+   * 昵称
+   */
+  nickName?: null | string;
+  /**
+   * 性别 0女 1男
+   */
+  sex?: number | null;
+  [property: string]: any;
+}
+
+/**
+ * ShopUserMoneyEditDTO
+ */
+export interface editMoneyRequest {
+  /**
+   * 对应shopUserid
+   */
+  id: number | null;
+  /**
+   * 浮动金额
+   */
+  money: number | null;
+  /**
+   * 备注
+   */
+  remark?: null | string;
+  /**
+   * 0减少 1增加
+   */
+  type: number | null;
+  [property: string]: any;
+}
+
+/**
+ * ShopUserAddDTO
+ */
+export interface addRequest {
+  /**
+   * 账户积分
+   */
+  accountPoints?: number | null;
+  /**
+   * 钱包余额
+   */
+  amount?: number | null;
+  /**
+   * 会员生日
+   */
+  birthDay?: null | string;
+  /**
+   * 用户头像
+   */
+  headImg?: null | string;
+  /**
+   * 是否会员，
+   */
+  isVip?: number | null;
+  /**
+   * 用户昵称
+   */
+  nickName: null | string;
+  /**
+   * 电话号码
+   */
+  phone: null | string;
+  /**
+   * 0-女 1男
+   */
+  sex?: number | null;
+  /**
+   * 用户Id
+   */
+  userId: number | null;
+  [property: string]: any;
+}

src/api/account/table.ts

@@ -0,0 +1,128 @@
+import request from "@/utils/request";
+import { Account_BaseUrl } from "@/api/config";
+const baseURL = Account_BaseUrl + "/admin/shopTable";
+const API = {
+  // 批量生成桌码
+  fasetAdd(num: number) {
+    return request({
+      url: `${baseURL}/code`,
+      method: "post",
+      data: { num },
+    });
+  },
+  getList(data: getListRequest) {
+    return request({
+      url: `${baseURL}`,
+      method: "get",
+      params: data
+    });
+  },
+  edit(data: editRequest) {
+    return request({
+      url: `${baseURL}`,
+      method: "put",
+      data: data,
+    });
+  },
+  add(data: addRequest) {
+    return request({
+      url: `${baseURL}`,
+      method: "post",
+      data: data,
+    });
+  },
+  delete(id: number | string) {
+    return request({
+      url: `${baseURL}`,
+      method: "post",
+      data: { id },
+    });
+  }
+}
+export default API;
+/**
+ * ShopTableAddDTO
+ */
+export interface addRequest {
+  /**
+   * 区域id
+   */
+  areaId?: number | null;
+  /**
+   * 是否自动清台
+   */
+  autoClear?: number | null;
+  /**
+   * 客座数
+   */
+  capacity: number | null;
+  /**
+   * 结束数字
+   */
+  end: number | null;
+  /**
+   * 台桌前缀
+   */
+  sign: null | string;
+  /**
+   * 起始数字
+   */
+  start: number | null;
+  [property: string]: any;
+}
+
+/**
+ * ShopTableDTO
+ */
+export interface editRequest {
+  /**
+   * 区域Id
+   */
+  areaId?: number | null;
+  /**
+   * 自动清台 0手动 1自动
+   */
+  autoClear?: number | null;
+  /**
+   * 自增id
+   */
+  id: number | null;
+  /**
+   * 是否接受网络预定
+   */
+  isPredate?: number | null;
+  /**
+   * 客座数,允许的客座数量
+   */
+  maxCapacity?: number | null;
+  name?: null | string;
+  /**
+   * 网络预定台桌支付金额
+   */
+  predateAmount?: number | null;
+  /**
+   * 二维码
+   */
+  qrcode?: null | string;
+  /**
+   * 台桌排序
+   */
+  sort?: number | null;
+  /**
+   * idle-空闲 using-使用中 subscribe预定，closed--关台， opening 开台中，cleaning 台桌清理中
+   */
+  status?: null | string;
+  [property: string]: any;
+}
+
+export interface getListRequest {
+  /**
+   * 区域id
+   */
+  areaId?: number;
+  /**
+   * 桌码
+   */
+  tableCode?: string;
+  [property: string]: any;
+}

src/api/system/user.ts

@@ -216,7 +216,7 @@ export default UserAPI;
 export interface UserInfo {
   /** 用户ID */
   userId?: number;
-
+  id?: number | string;
   /** 用户名 */
   username?: string;