修复已知问题

src/api/shop/shopMerchant/index.ts

@@ -0,0 +1,106 @@
+import request from '@/utils/request';
+import type { ApiResult, PageResult } from '@/api';
+import type { ShopMerchant, ShopMerchantParam } from './model';
+import { MODULES_API_URL } from '@/config/setting';
+
+/**
+ * 分页查询商户
+ */
+export async function pageShopMerchant(params: ShopMerchantParam) {
+  const res = await request.get<ApiResult<PageResult<ShopMerchant>>>(
+    MODULES_API_URL + '/shop/shop-merchant/page',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 查询商户列表
+ */
+export async function listShopMerchant(params?: ShopMerchantParam) {
+  const res = await request.get<ApiResult<ShopMerchant[]>>(
+    MODULES_API_URL + '/shop/shop-merchant',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 添加商户
+ */
+export async function addShopMerchant(data: ShopMerchant) {
+  const res = await request.post<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-merchant',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 修改商户
+ */
+export async function updateShopMerchant(data: ShopMerchant) {
+  const res = await request.put<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-merchant',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 删除商户
+ */
+export async function removeShopMerchant(id?: number) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-merchant/' + id
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 批量删除商户
+ */
+export async function removeBatchShopMerchant(data: (number | undefined)[]) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-merchant/batch',
+    {
+      data
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 根据id查询商户
+ */
+export async function getShopMerchant(id: number) {
+  const res = await request.get<ApiResult<ShopMerchant>>(
+    MODULES_API_URL + '/shop/shop-merchant/' + id
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/api/shop/shopMerchant/model/index.ts

@@ -0,0 +1,87 @@
+import type { PageParam } from '@/api';
+
+/**
+ * 商户
+ */
+export interface ShopMerchant {
+  // ID
+  merchantId?: number;
+  // 商户名称
+  merchantName?: string;
+  // 商户编号
+  merchantCode?: string;
+  // 商户类型
+  type?: number;
+  // 商户图标
+  image?: string;
+  // 商户手机号
+  phone?: string;
+  // 商户姓名
+  realName?: string;
+  // 店铺类型
+  shopType?: string;
+  // 项目分类
+  itemType?: string;
+  // 商户分类
+  category?: string;
+  // 商户经营分类
+  merchantCategoryId?: number;
+  // 商户分类
+  merchantCategoryTitle?: string;
+  // 经纬度
+  lngAndLat?: string;
+  // 
+  lng?: string;
+  // 
+  lat?: string;
+  // 所在省份
+  province?: string;
+  // 所在城市
+  city?: string;
+  // 所在辖区
+  region?: string;
+  // 详细地址
+  address?: string;
+  // 手续费
+  commission?: string;
+  // 关键字
+  keywords?: string;
+  // 资质图片
+  files?: string;
+  // 营业时间
+  businessTime?: string;
+  // 文章内容
+  content?: string;
+  // 每小时价格
+  price?: string;
+  // 是否自营
+  ownStore?: number;
+  // 是否推荐
+  recommend?: number;
+  // 是否需要审核
+  goodsReview?: number;
+  // 管理入口
+  adminUrl?: string;
+  // 备注
+  comments?: string;
+  // 所有人
+  userId?: number;
+  // 是否删除, 0否, 1是
+  deleted?: number;
+  // 状态
+  status?: number;
+  // 排序号
+  sortNumber?: number;
+  // 租户id
+  tenantId?: number;
+  // 创建时间
+  createTime?: string;
+}
+
+/**
+ * 商户搜索条件
+ */
+export interface ShopMerchantParam extends PageParam {
+  merchantId?: number;
+  keywords?: string;
+}

src/api/shop/shopMerchantAccount/index.ts

@@ -0,0 +1,106 @@
+import request from '@/utils/request';
+import type { ApiResult, PageResult } from '@/api';
+import type { ShopMerchantAccount, ShopMerchantAccountParam } from './model';
+import { MODULES_API_URL } from '@/config/setting';
+
+/**
+ * 分页查询商户账号
+ */
+export async function pageShopMerchantAccount(params: ShopMerchantAccountParam) {
+  const res = await request.get<ApiResult<PageResult<ShopMerchantAccount>>>(
+    MODULES_API_URL + '/shop/shop-merchant-account/page',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 查询商户账号列表
+ */
+export async function listShopMerchantAccount(params?: ShopMerchantAccountParam) {
+  const res = await request.get<ApiResult<ShopMerchantAccount[]>>(
+    MODULES_API_URL + '/shop/shop-merchant-account',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 添加商户账号
+ */
+export async function addShopMerchantAccount(data: ShopMerchantAccount) {
+  const res = await request.post<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-merchant-account',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 修改商户账号
+ */
+export async function updateShopMerchantAccount(data: ShopMerchantAccount) {
+  const res = await request.put<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-merchant-account',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 删除商户账号
+ */
+export async function removeShopMerchantAccount(id?: number) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-merchant-account/' + id
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 批量删除商户账号
+ */
+export async function removeBatchShopMerchantAccount(data: (number | undefined)[]) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-merchant-account/batch',
+    {
+      data
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 根据id查询商户账号
+ */
+export async function getShopMerchantAccount(id: number) {
+  const res = await request.get<ApiResult<ShopMerchantAccount>>(
+    MODULES_API_URL + '/shop/shop-merchant-account/' + id
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/api/shop/shopMerchantAccount/model/index.ts

@@ -0,0 +1,39 @@
+import type { PageParam } from '@/api';
+
+/**
+ * 商户账号
+ */
+export interface ShopMerchantAccount {
+  // ID
+  id?: number;
+  // 商户手机号
+  phone?: string;
+  // 真实姓名
+  realName?: string;
+  // 商户ID
+  merchantId?: number;
+  // 角色ID
+  roleId?: number;
+  // 角色名称
+  roleName?: string;
+  // 用户ID
+  userId?: number;
+  // 备注
+  comments?: string;
+  // 状态
+  status?: number;
+  // 排序号
+  sortNumber?: number;
+  // 租户id
+  tenantId?: number;
+  // 创建时间
+  createTime?: string;
+}
+
+/**
+ * 商户账号搜索条件
+ */
+export interface ShopMerchantAccountParam extends PageParam {
+  id?: number;
+  keywords?: string;
+}

src/api/shop/shopMerchantApply/index.ts

@@ -0,0 +1,106 @@
+import request from '@/utils/request';
+import type { ApiResult, PageResult } from '@/api';
+import type { ShopMerchantApply, ShopMerchantApplyParam } from './model';
+import { MODULES_API_URL } from '@/config/setting';
+
+/**
+ * 分页查询商户入驻申请
+ */
+export async function pageShopMerchantApply(params: ShopMerchantApplyParam) {
+  const res = await request.get<ApiResult<PageResult<ShopMerchantApply>>>(
+    MODULES_API_URL + '/shop/shop-merchant-apply/page',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 查询商户入驻申请列表
+ */
+export async function listShopMerchantApply(params?: ShopMerchantApplyParam) {
+  const res = await request.get<ApiResult<ShopMerchantApply[]>>(
+    MODULES_API_URL + '/shop/shop-merchant-apply',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 添加商户入驻申请
+ */
+export async function addShopMerchantApply(data: ShopMerchantApply) {
+  const res = await request.post<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-merchant-apply',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 修改商户入驻申请
+ */
+export async function updateShopMerchantApply(data: ShopMerchantApply) {
+  const res = await request.put<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-merchant-apply',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 删除商户入驻申请
+ */
+export async function removeShopMerchantApply(id?: number) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-merchant-apply/' + id
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 批量删除商户入驻申请
+ */
+export async function removeBatchShopMerchantApply(data: (number | undefined)[]) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-merchant-apply/batch',
+    {
+      data
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 根据id查询商户入驻申请
+ */
+export async function getShopMerchantApply(id: number) {
+  const res = await request.get<ApiResult<ShopMerchantApply>>(
+    MODULES_API_URL + '/shop/shop-merchant-apply/' + id
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/api/shop/shopMerchantApply/model/index.ts

@@ -0,0 +1,59 @@
+import type { PageParam } from '@/api';
+
+/**
+ * 商户入驻申请
+ */
+export interface ShopMerchantApply {
+  // ID
+  applyId?: number;
+  // 商户名称
+  merchantName?: string;
+  // 商户图标
+  image?: string;
+  // 商户手机号
+  phone?: string;
+  // 商户姓名
+  realName?: string;
+  // 身份证号码
+  idCard?: string;
+  // 店铺类型
+  shopType?: string;
+  // 商户分类
+  category?: string;
+  // 手续费
+  commission?: string;
+  // 关键字
+  keywords?: string;
+  // 资质图片
+  files?: string;
+  // 所有人
+  userId?: number;
+  // 是否自营
+  ownStore?: number;
+  // 是否推荐
+  recommend?: number;
+  // 是否需要审核
+  goodsReview?: number;
+  // 工作负责人
+  name2?: string;
+  // 驳回原因
+  reason?: string;
+  // 备注
+  comments?: string;
+  // 状态
+  status?: number;
+  // 排序号
+  sortNumber?: number;
+  // 租户id
+  tenantId?: number;
+  // 创建时间
+  createTime?: string;
+}
+
+/**
+ * 商户入驻申请搜索条件
+ */
+export interface ShopMerchantApplyParam extends PageParam {
+  applyId?: number;
+  keywords?: string;
+}

src/api/shop/shopMerchantCount/index.ts

@@ -0,0 +1,106 @@
+import request from '@/utils/request';
+import type { ApiResult, PageResult } from '@/api';
+import type { ShopMerchantCount, ShopMerchantCountParam } from './model';
+import { MODULES_API_URL } from '@/config/setting';
+
+/**
+ * 分页查询门店销售统计表
+ */
+export async function pageShopMerchantCount(params: ShopMerchantCountParam) {
+  const res = await request.get<ApiResult<PageResult<ShopMerchantCount>>>(
+    MODULES_API_URL + '/shop/shop-merchant-count/page',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 查询门店销售统计表列表
+ */
+export async function listShopMerchantCount(params?: ShopMerchantCountParam) {
+  const res = await request.get<ApiResult<ShopMerchantCount[]>>(
+    MODULES_API_URL + '/shop/shop-merchant-count',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 添加门店销售统计表
+ */
+export async function addShopMerchantCount(data: ShopMerchantCount) {
+  const res = await request.post<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-merchant-count',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 修改门店销售统计表
+ */
+export async function updateShopMerchantCount(data: ShopMerchantCount) {
+  const res = await request.put<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-merchant-count',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 删除门店销售统计表
+ */
+export async function removeShopMerchantCount(id?: number) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-merchant-count/' + id
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 批量删除门店销售统计表
+ */
+export async function removeBatchShopMerchantCount(data: (number | undefined)[]) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-merchant-count/batch',
+    {
+      data
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 根据id查询门店销售统计表
+ */
+export async function getShopMerchantCount(id: number) {
+  const res = await request.get<ApiResult<ShopMerchantCount>>(
+    MODULES_API_URL + '/shop/shop-merchant-count/' + id
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/api/shop/shopMerchantCount/model/index.ts

@@ -0,0 +1,29 @@
+import type { PageParam } from '@/api';
+
+/**
+ * 门店销售统计表
+ */
+export interface ShopMerchantCount {
+  // ID
+  id?: number;
+  // 店铺名称
+  name?: string;
+  // 店铺说明
+  comments?: string;
+  // 状态
+  status?: number;
+  // 排序号
+  sortNumber?: number;
+  // 租户id
+  tenantId?: number;
+  // 创建时间
+  createTime?: string;
+}
+
+/**
+ * 门店销售统计表搜索条件
+ */
+export interface ShopMerchantCountParam extends PageParam {
+  id?: number;
+  keywords?: string;
+}

src/api/shop/shopMerchantType/index.ts

@@ -0,0 +1,106 @@
+import request from '@/utils/request';
+import type { ApiResult, PageResult } from '@/api';
+import type { ShopMerchantType, ShopMerchantTypeParam } from './model';
+import { MODULES_API_URL } from '@/config/setting';
+
+/**
+ * 分页查询商户类型
+ */
+export async function pageShopMerchantType(params: ShopMerchantTypeParam) {
+  const res = await request.get<ApiResult<PageResult<ShopMerchantType>>>(
+    MODULES_API_URL + '/shop/shop-merchant-type/page',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 查询商户类型列表
+ */
+export async function listShopMerchantType(params?: ShopMerchantTypeParam) {
+  const res = await request.get<ApiResult<ShopMerchantType[]>>(
+    MODULES_API_URL + '/shop/shop-merchant-type',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 添加商户类型
+ */
+export async function addShopMerchantType(data: ShopMerchantType) {
+  const res = await request.post<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-merchant-type',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 修改商户类型
+ */
+export async function updateShopMerchantType(data: ShopMerchantType) {
+  const res = await request.put<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-merchant-type',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 删除商户类型
+ */
+export async function removeShopMerchantType(id?: number) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-merchant-type/' + id
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 批量删除商户类型
+ */
+export async function removeBatchShopMerchantType(data: (number | undefined)[]) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/shop/shop-merchant-type/batch',
+    {
+      data
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 根据id查询商户类型
+ */
+export async function getShopMerchantType(id: number) {
+  const res = await request.get<ApiResult<ShopMerchantType>>(
+    MODULES_API_URL + '/shop/shop-merchant-type/' + id
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/api/shop/shopMerchantType/model/index.ts

@@ -0,0 +1,29 @@
+import type { PageParam } from '@/api';
+
+/**
+ * 商户类型
+ */
+export interface ShopMerchantType {
+  // ID
+  id?: number;
+  // 店铺类型
+  name?: string;
+  // 店铺入驻条件
+  comments?: string;
+  // 状态
+  status?: number;
+  // 排序号
+  sortNumber?: number;
+  // 租户id
+  tenantId?: number;
+  // 创建时间
+  createTime?: string;
+}
+
+/**
+ * 商户类型搜索条件
+ */
+export interface ShopMerchantTypeParam extends PageParam {
+  id?: number;
+  keywords?: string;
+}