恢复用户列表功能

2024-05-17 06:04:56 +08:00
parent ec629c4540
commit fc7752cb18
73 changed files with 10390 additions and 657 deletions
--- a/src/api/booking/order/index.ts
+++ b/src/api/booking/order/index.ts
@@ -8,7 +8,7 @@ import { MODULES_API_URL } from '@/config/setting';
 */
 export async function pageOrder(params: OrderParam) {
  const res = await request.get<ApiResult<PageResult<Order>>>(
-    MODULES_API_URL + '/booking/order/page',
+    MODULES_API_URL + '/shop/order/page',
    {
      params
    }
@@ -24,7 +24,7 @@ export async function pageOrder(params: OrderParam) {
 */
 export async function listOrder(params?: OrderParam) {
  const res = await request.get<ApiResult<Order[]>>(
-    MODULES_API_URL + '/booking/order',
+    MODULES_API_URL + '/shop/order',
    {
      params
    }
@@ -40,7 +40,7 @@ export async function listOrder(params?: OrderParam) {
 */
 export async function addOrder(data: Order) {
  const res = await request.post<ApiResult<unknown>>(
-    MODULES_API_URL + '/booking/order',
+    MODULES_API_URL + '/shop/order',
    data
  );
  if (res.data.code === 0) {
@@ -54,7 +54,7 @@ export async function addOrder(data: Order) {
 */
 export async function updateOrder(data: Order) {
  const res = await request.put<ApiResult<unknown>>(
-    MODULES_API_URL + '/booking/order',
+    MODULES_API_URL + '/shop/order',
    data
  );
  if (res.data.code === 0) {
@@ -68,7 +68,7 @@ export async function updateOrder(data: Order) {
 */
 export async function removeOrder(id?: number) {
  const res = await request.delete<ApiResult<unknown>>(
-    MODULES_API_URL + '/booking/order/' + id
+    MODULES_API_URL + '/shop/order/' + id
  );
  if (res.data.code === 0) {
    return res.data.message;
@@ -81,7 +81,7 @@ export async function removeOrder(id?: number) {
 */
 export async function removeBatchOrder(data: (number | undefined)[]) {
  const res = await request.delete<ApiResult<unknown>>(
-    MODULES_API_URL + '/booking/order/batch',
+    MODULES_API_URL + '/shop/order/batch',
    {
      data
    }
@@ -97,7 +97,7 @@ export async function removeBatchOrder(data: (number | undefined)[]) {
 */
 export async function getOrder(id: number) {
  const res = await request.get<ApiResult<Order>>(
-    MODULES_API_URL + '/booking/order/' + id
+    MODULES_API_URL + '/shop/order/' + id
  );
  if (res.data.code === 0 && res.data.data) {
    return res.data.data;
--- a/src/api/booking/order/model/index.ts
+++ b/src/api/booking/order/model/index.ts
@@ -53,7 +53,7 @@ export interface Order {
  // 1已完成，2未使用，3已取消，4退款申请中，5退款被拒绝，6退款成功，7客户端申请退款
  orderStatus?: string;
  // 优惠类型：0无、1抵扣优惠券、2折扣优惠券、3、VIP月卡、4VIP年卡，5VIP次卡、6VIP会员卡、7IC月卡、8IC年卡、9IC次卡、10IC会员卡、11免费订单、12VIP充值卡、13IC充值卡、14VIP季卡、15IC季卡
-  type?: string;
+  couponType?: string;
  // 二维码地址，保存订单号，支付成功后才生成
  qrcode?: string;
  // 优惠说明
@@ -68,7 +68,7 @@ export interface Order {
  isInvoice?: string;
  // 下单时间
  createTime?: number;
-  // 
+  //
  updateTime?: number;
  // 付款时间
  payTime?: number;
--- a/src/api/cms/website/model/index.ts
+++ b/src/api/cms/website/model/index.ts
@@ -36,7 +36,7 @@ export interface Website {
  region?: string;
  appId?: number;
  fields?: WebsiteField[];
-  status?: number;
+  status?: boolean;
  tenantId?: number;
  tenantName?: string;
  navigations?: Navigation[];
--- a/src/api/oa/company/index.ts
+++ b/src/api/oa/company/index.ts
@@ -2,14 +2,14 @@ import request from '@/utils/request';
 import type { ApiResult } from '@/api';
 import type { Company, CompanyParam } from './model';
 import { PageResult } from '@/api';
-import { MODULES_API_URL } from '@/config/setting';
+import { SERVER_API_URL } from '@/config/setting';

 /**
 * 查询企业资料
 */
 export async function getCompany(params?: CompanyParam) {
  const res = await request.get<ApiResult<Company>>(
-    MODULES_API_URL + '/oa/company/profile',
+    SERVER_API_URL + '/system/company/profile',
    {
      params
    }
@@ -25,7 +25,7 @@ export async function getCompany(params?: CompanyParam) {
 */
 export async function getCompanyAll(companyId: number) {
  const res = await request.get<ApiResult<Company>>(
-    MODULES_API_URL + '/oa/company/profileAll/' + companyId
+    SERVER_API_URL + '/system/company/profileAll/' + companyId
  );
  if (res.data.code === 0 && res.data) {
    console.log(res.data);
@@ -39,7 +39,7 @@ export async function getCompanyAll(companyId: number) {
 */
 export async function pageCompany(params: CompanyParam) {
  const res = await request.get<ApiResult<PageResult<Company>>>(
-    MODULES_API_URL + '/oa/company/page',
+    SERVER_API_URL + '/system/company/page',
    { params }
  );
  if (res.data.code === 0) {
@@ -53,7 +53,7 @@ export async function pageCompany(params: CompanyParam) {
 */
 export async function pageCompanyAll(params: CompanyParam) {
  const res = await request.get<ApiResult<PageResult<Company>>>(
-    MODULES_API_URL + '/oa/company/pageAll',
+    SERVER_API_URL + '/system/company/pageAll',
    { params }
  );
  if (res.data.code === 0) {
@@ -67,7 +67,7 @@ export async function pageCompanyAll(params: CompanyParam) {
 */
 export async function addCompany(data: Company) {
  const res = await request.post<ApiResult<unknown>>(
-    MODULES_API_URL + '/oa/company',
+    SERVER_API_URL + '/system/company',
    data
  );
  if (res.data.code === 0) {
@@ -81,7 +81,7 @@ export async function addCompany(data: Company) {
 */
 export async function updateCompany(data: Company) {
  const res = await request.put<ApiResult<unknown>>(
-    MODULES_API_URL + '/oa/company',
+    SERVER_API_URL + '/system/company',
    data
  );
  if (res.data.code === 0) {
@@ -95,7 +95,7 @@ export async function updateCompany(data: Company) {
 */
 export async function removeCompany(id?: number) {
  const res = await request.delete<ApiResult<unknown>>(
-    MODULES_API_URL + '/oa/company/' + id
+    SERVER_API_URL + '/system/company/removeAll/' + id
  );
  if (res.data.code === 0) {
    return res.data.message;
@@ -106,7 +106,7 @@ export async function removeCompany(id?: number) {
 // 销毁租户
 export async function destructionTenant(id?: number) {
  const res = await request.delete<ApiResult<unknown>>(
-    MODULES_API_URL + '/oa/company/destruction/' + id
+    SERVER_API_URL + '/system/company/destruction/' + id
  );
  if (res.data.code === 0) {
    return res.data.message;
@@ -119,7 +119,7 @@ export async function destructionTenant(id?: number) {
 */
 export async function removeBatchCompany(data: (number | undefined)[]) {
  const res = await request.delete<ApiResult<unknown>>(
-    MODULES_API_URL + '/oa/company/batch',
+    SERVER_API_URL + '/system/company/batch',
    {
      data
    }
@@ -136,7 +136,7 @@ export async function checkExistence(
  id?: number
 ) {
  const res = await request.get<ApiResult<unknown>>(
-    MODULES_API_URL + '/oa/company/existence',
+    SERVER_API_URL + '/system/company/existence',
    {
      params: { field, value, id }
    }
@@ -146,3 +146,29 @@ export async function checkExistence(
  }
  return Promise.reject(new Error(res.data.message));
 }
+
+/**
+ * 恢复Company
+ */
+export async function undeleteCompany(id?: number) {
+  const res = await request.delete<ApiResult<unknown>>(
+    SERVER_API_URL + '/system/company/undeleteAll/' + id
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 销毁Company
+ */
+export async function destructionCompany(id?: number) {
+  const res = await request.delete<ApiResult<unknown>>(
+    SERVER_API_URL + '/system/company/destructionAll/' + id
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
--- a/src/api/oa/company/model/index.ts
+++ b/src/api/oa/company/model/index.ts
@@ -48,6 +48,7 @@ export interface Company {
  planId?: number;
  sortNumber?: number;
  authoritative?: boolean;
+  merchantId?: number;
  tenantId?: number;
  tenantName?: string;
  tenantCode?: string;
@@ -56,6 +57,10 @@ export interface Company {
  socketUrl?: string;
  serverUrl?: string;
  modulesUrl?: string;
+  mpWeixinCode?: string;
+  h5Code?: string;
+  androidUrl?: string;
+  iosUrl?: string;
  avatar?: string;
  nickname?: string;
  code?: number;
--- a/src/api/shop/merchant/index.ts
+++ b/src/api/shop/merchant/index.ts
@@ -1,14 +1,14 @@
 import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api';
 import type { Merchant, MerchantParam } from './model';
-import { SERVER_API_URL } from '@/config/setting';
+import { MODULES_API_URL } from '@/config/setting';

 /**
 * 分页查询商户
 */
 export async function pageMerchant(params: MerchantParam) {
  const res = await request.get<ApiResult<PageResult<Merchant>>>(
-    SERVER_API_URL + '/system/merchant/page',
+    MODULES_API_URL + '/shop/merchant/page',
    {
      params
    }
@@ -24,7 +24,7 @@ export async function pageMerchant(params: MerchantParam) {
 */
 export async function listMerchant(params?: MerchantParam) {
  const res = await request.get<ApiResult<Merchant[]>>(
-    SERVER_API_URL + '/system/merchant',
+    MODULES_API_URL + '/shop/merchant',
    {
      params
    }
@@ -40,7 +40,7 @@ export async function listMerchant(params?: MerchantParam) {
 */
 export async function addMerchant(data: Merchant) {
  const res = await request.post<ApiResult<unknown>>(
-    SERVER_API_URL + '/system/merchant',
+    MODULES_API_URL + '/shop/merchant',
    data
  );
  if (res.data.code === 0) {
@@ -54,7 +54,7 @@ export async function addMerchant(data: Merchant) {
 */
 export async function updateMerchant(data: Merchant) {
  const res = await request.put<ApiResult<unknown>>(
-    SERVER_API_URL + '/system/merchant',
+    MODULES_API_URL + '/shop/merchant',
    data
  );
  if (res.data.code === 0) {
@@ -68,7 +68,7 @@ export async function updateMerchant(data: Merchant) {
 */
 export async function removeMerchant(id?: number) {
  const res = await request.delete<ApiResult<unknown>>(
-    SERVER_API_URL + '/system/merchant/' + id
+    MODULES_API_URL + '/shop/merchant/' + id
  );
  if (res.data.code === 0) {
    return res.data.message;
@@ -81,7 +81,7 @@ export async function removeMerchant(id?: number) {
 */
 export async function removeBatchMerchant(data: (number | undefined)[]) {
  const res = await request.delete<ApiResult<unknown>>(
-    SERVER_API_URL + '/system/merchant/batch',
+    MODULES_API_URL + '/shop/merchant/batch',
    {
      data
    }
@@ -97,7 +97,7 @@ export async function removeBatchMerchant(data: (number | undefined)[]) {
 */
 export async function getMerchant(id: number) {
  const res = await request.get<ApiResult<Merchant>>(
-    SERVER_API_URL + '/system/merchant/' + id
+    MODULES_API_URL + '/shop/merchant/' + id
  );
  if (res.data.code === 0 && res.data.data) {
    return res.data.data;
--- a/src/api/shop/merchant/model/index.ts
+++ b/src/api/shop/merchant/model/index.ts
@@ -8,6 +8,7 @@ export interface Merchant {
  merchantId?: number;
  // 商户名称
  merchantName?: string;
+  merchantCode?: string;
  // 商户图标
  image?: string;
  // 商户手机号
@@ -63,6 +64,8 @@ export interface Merchant {
  // 默认商户管理角色ID
  roleId?: number;
  roleName?: string;
+  label?: string;
+  value?: string;
 }

 /**
--- a/src/api/shop/order/index.ts
+++ b/src/api/shop/order/index.ts
@@ -1,14 +1,14 @@
 import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api';
 import type { Order, OrderParam } from './model';
-import { MODULES_API_URL } from '@/config/setting';
+import { SERVER_API_URL } from '@/config/setting';

 /**
 * 分页查询预约订单
 */
 export async function pageOrder(params: OrderParam) {
  const res = await request.get<ApiResult<PageResult<Order>>>(
-    MODULES_API_URL + '/shop/order/page',
+    SERVER_API_URL + '/system/order/page',
    {
      params
    }
@@ -24,7 +24,7 @@ export async function pageOrder(params: OrderParam) {
 */
 export async function listOrder(params?: OrderParam) {
  const res = await request.get<ApiResult<Order[]>>(
-    MODULES_API_URL + '/shop/order',
+    SERVER_API_URL + '/system/order',
    {
      params
    }
@@ -40,7 +40,7 @@ export async function listOrder(params?: OrderParam) {
 */
 export async function addOrder(data: Order) {
  const res = await request.post<ApiResult<unknown>>(
-    MODULES_API_URL + '/shop/order',
+    SERVER_API_URL + '/system/order',
    data
  );
  if (res.data.code === 0) {
@@ -54,7 +54,7 @@ export async function addOrder(data: Order) {
 */
 export async function updateOrder(data: Order) {
  const res = await request.put<ApiResult<unknown>>(
-    MODULES_API_URL + '/shop/order',
+    SERVER_API_URL + '/system/order',
    data
  );
  if (res.data.code === 0) {
@@ -68,7 +68,7 @@ export async function updateOrder(data: Order) {
 */
 export async function removeOrder(id?: number) {
  const res = await request.delete<ApiResult<unknown>>(
-    MODULES_API_URL + '/shop/order/' + id
+    SERVER_API_URL + '/system/order/' + id
  );
  if (res.data.code === 0) {
    return res.data.message;
@@ -81,7 +81,7 @@ export async function removeOrder(id?: number) {
 */
 export async function removeBatchOrder(data: (number | undefined)[]) {
  const res = await request.delete<ApiResult<unknown>>(
-    MODULES_API_URL + '/shop/order/batch',
+    SERVER_API_URL + '/system/order/batch',
    {
      data
    }
@@ -97,7 +97,7 @@ export async function removeBatchOrder(data: (number | undefined)[]) {
 */
 export async function getOrder(id: number) {
  const res = await request.get<ApiResult<Order>>(
-    MODULES_API_URL + '/shop/order/' + id
+    SERVER_API_URL + '/system/order/' + id
  );
  if (res.data.code === 0 && res.data.data) {
    return res.data.data;
--- a/src/api/shop/order/model/index.ts
+++ b/src/api/shop/order/model/index.ts
@@ -1,5 +1,5 @@
 import type { PageParam } from '@/api';
-import { OrderInfo } from "@/api/shop/orderInfo/model";
+import { OrderInfo } from '@/api/shop/orderInfo/model';

 /**
 * 预约订单
@@ -10,25 +10,23 @@ export interface Order {
  // 订单编号
  orderNo?: string;
  // 微信支付订单号
-  wechatOrder?: string;
+  transactionId?: string;
  // 微信退款订单号
  refundOrder?: string;
-  // 场馆id用于权限判断
+  // 商户ID
  merchantId?: number;
-  // 用户id
-  userId?: number;
  // 使用的优惠券id
  couponId?: number;
  // 使用的会员卡id
-  cardId?: number;
+  cardId?: string;
  // 关联管理员id
-  aid?: number;
-  // 核销管理员id
  adminId?: number;
+  // 核销管理员id
+  confirmId?: number;
  // IC卡号
-  code?: string;
+  icCard?: string;
  // 真实姓名
-  name?: string;
+  realName?: string;
  // 手机号码
  phone?: string;
  // 订单总额
@@ -47,44 +45,54 @@ export interface Order {
  coachPrice?: string;
  // 教练id
  coachId?: number;
-  // 1微信支付，2积分，3支付宝，4现金，5POS机，6VIP月卡，7VIP年卡，8VIP次卡，9IC月卡，10IC年卡，11IC次卡，12免费，13VIP充值卡，14IC充值卡，15积分支付，16VIP季卡，17IC季卡
-  payType?: string;
-  // 1已付款，2未付款
+  // 0余额支付, 1微信支付，2积分，3支付宝，4现金，5POS机，6VIP月卡，7VIP年卡，8VIP次卡，9IC月卡，10IC年卡，11IC次卡，12免费，13VIP充值卡，14IC充值卡，15积分支付，16VIP季卡，17IC季卡
+  payType?: number;
+  // 0未付款，1已付款
  payStatus?: string;
-  // 1已完成，2未使用，3已取消，4退款申请中，5退款被拒绝，6退款成功，7客户端申请退款
-  orderStatus?: string;
+  // 0未使用，1已完成，2已取消，3取消中，4退款申请中，5退款被拒绝，6退款成功，7客户端申请退款
+  orderStatus?: number;
  // 优惠类型：0无、1抵扣优惠券、2折扣优惠券、3、VIP月卡、4VIP年卡，5VIP次卡、6VIP会员卡、7IC月卡、8IC年卡、9IC次卡、10IC会员卡、11免费订单、12VIP充值卡、13IC充值卡、14VIP季卡、15IC季卡
-  type?: string;
+  couponType?: number;
+  // 优惠说明
+  couponDesc?: string;
  // 二维码地址，保存订单号，支付成功后才生成
  qrcode?: string;
-  // 优惠说明
-  desc?: string;
  // vip月卡年卡、ic月卡年卡回退次数
  returnNum?: number;
  // vip充值回退金额
  returnMoney?: string;
  // 预约详情开始时间数组
  startTime?: string;
-  // 是否已开具发票：1已开发票，2未开发票，3不能开具发票
+  // 是否已开具发票：0未开发票，1已开发票，2不能开具发票
  isInvoice?: string;
-  // 下单时间
-  createTime?: number;
-  //
-  updateTime?: number;
-  // 付款时间
-  payTime?: number;
+  // 支付时间
+  payTime?: string;
  // 退款时间
-  refundTime?: number;
+  refundTime?: string;
  // 申请退款时间
-  refundApplyTime?: number;
-  // 对账情况：1=已对账；2=未对账；3=已对账，金额对不上；4=未查询到该订单
+  refundApplyTime?: string;
+  // 对账情况：0=未对账；1=已对账；3=已对账，金额对不上；4=未查询到该订单
  checkBill?: number;
+  // 订单是否已结算(0未结算 1已结算)
+  isSettled?: number;
+  // 系统版本号 0当前版本 value=其他版本
+  version?: number;
+  // 用户id
+  userId?: number;
+  // 状态
+  status?: number;
  // 备注
  comments?: string;
+  // 排序号
+  sortNumber?: number;
  // 是否删除, 0否, 1是
  deleted?: number;
  // 租户id
  tenantId?: number;
+  // 修改时间
+  updateTime?: string;
+  // 创建时间
+  createTime?: string;
  // 商户名称
  merchantName?: string;
  // 商户图标
@@ -100,4 +108,7 @@ export interface OrderParam extends PageParam {
  orderId?: number;
  keywords?: string;
  userId?: number;
+  merchantId?: number;
+  merchantCode?: string;
+  merchantName?: string;
 }
--- a/src/api/system/company/index.ts
+++ b/src/api/system/company/index.ts
@@ -2,7 +2,7 @@ import request from '@/utils/request';
 import type { ApiResult } from '@/api';
 import type { Company, CompanyParam } from './model';
 import { PageResult } from '@/api';
-import { MODULES_API_URL, SERVER_API_URL } from '@/config/setting';
+import { SERVER_API_URL } from '@/config/setting';

 /**
 * 查询企业资料
@@ -25,7 +25,7 @@ export async function getCompany(params?: CompanyParam) {
 */
 export async function getCompanyAll(companyId: number) {
  const res = await request.get<ApiResult<Company>>(
-    MODULES_API_URL + '/system/company/profileAll/' + companyId
+    SERVER_API_URL + '/system/company/profileAll/' + companyId
  );
  if (res.data.code === 0 && res.data) {
    console.log(res.data);
@@ -39,7 +39,7 @@ export async function getCompanyAll(companyId: number) {
 */
 export async function pageCompany(params: CompanyParam) {
  const res = await request.get<ApiResult<PageResult<Company>>>(
-    MODULES_API_URL + '/system/company/page',
+    SERVER_API_URL + '/system/company/page',
    { params }
  );
  if (res.data.code === 0) {
@@ -67,7 +67,7 @@ export async function pageCompanyAll(params: CompanyParam) {
 */
 export async function addCompany(data: Company) {
  const res = await request.post<ApiResult<unknown>>(
-    MODULES_API_URL + '/system/company',
+    SERVER_API_URL + '/system/company',
    data
  );
  if (res.data.code === 0) {
@@ -90,12 +90,26 @@ export async function updateCompany(data: Company) {
  return Promise.reject(new Error(res.data.message));
 }

+/**
+ * 修改CompanyAll
+ */
+export async function updateCompanyAll(data: Company) {
+  const res = await request.put<ApiResult<unknown>>(
+    SERVER_API_URL + '/system/company/updateCompanyAll',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
 /**
 * 删除Company
 */
 export async function removeCompany(id?: number) {
  const res = await request.delete<ApiResult<unknown>>(
-    MODULES_API_URL + '/system/company/' + id
+    SERVER_API_URL + '/system/company/' + id
  );
  if (res.data.code === 0) {
    return res.data.message;
@@ -106,7 +120,7 @@ export async function removeCompany(id?: number) {
 // 销毁租户
 export async function destructionTenant(id?: number) {
  const res = await request.delete<ApiResult<unknown>>(
-    MODULES_API_URL + '/system/company/destruction/' + id
+    SERVER_API_URL + '/system/company/destruction/' + id
  );
  if (res.data.code === 0) {
    return res.data.message;
@@ -119,7 +133,7 @@ export async function destructionTenant(id?: number) {
 */
 export async function removeBatchCompany(data: (number | undefined)[]) {
  const res = await request.delete<ApiResult<unknown>>(
-    MODULES_API_URL + '/system/company/batch',
+    SERVER_API_URL + '/system/company/batch',
    {
      data
    }
@@ -136,7 +150,7 @@ export async function checkExistence(
  id?: number
 ) {
  const res = await request.get<ApiResult<unknown>>(
-    MODULES_API_URL + '/system/company/existence',
+    SERVER_API_URL + '/system/company/existence',
    {
      params: { field, value, id }
    }
--- a/src/api/system/company/model/index.ts
+++ b/src/api/system/company/model/index.ts
@@ -14,6 +14,7 @@ export interface Company {
  companyCode?: string;
  domain?: string;
  phone?: string;
+  tel?: string;
  email?: string;
  InvoiceHeader?: string;
  startTime?: string;
@@ -47,6 +48,7 @@ export interface Company {
  planId?: number;
  sortNumber?: number;
  authoritative?: boolean;
+  merchantId?: number;
  tenantId?: number;
  tenantName?: string;
  tenantCode?: string;
@@ -55,6 +57,13 @@ export interface Company {
  socketUrl?: string;
  serverUrl?: string;
  modulesUrl?: string;
+  merchantUrl?: string;
+  websiteUrl?: string;
+  mpWeixinCode?: string;
+  mpAlipayCode?: string;
+  h5Code?: string;
+  androidUrl?: string;
+  iosUrl?: string;
  avatar?: string;
  nickname?: string;
  code?: number;
@@ -62,6 +71,7 @@ export interface Company {
  updateTime?: string;
  password?: string;
  password2?: string;
+  collection?: boolean;
 }

 /**
@@ -82,8 +92,11 @@ export interface CompanyParam extends PageParam {
  city?: string;
  region?: string;
  version?: number;
+  status?: number;
  sceneType?: string;
  createTimeStart?: string;
  createTimeEnd?: string;
  tenantId?: number;
+  collection?: boolean;
+  deleted?: number;
 }
--- a/src/api/system/payment/model/index.ts
+++ b/src/api/system/payment/model/index.ts
@@ -26,6 +26,8 @@ export interface Payment {
  apiclientKey?: string;
  // 商户证书序列号
  merchantSerialNumber?: string;
+  // 支付结果通过
+  notifyUrl?: string;
  // 备注
  comments?: string;
  // 文章排序(数字越小越靠前)
--- a/src/api/system/user-collection/index.ts
+++ b/src/api/system/user-collection/index.ts
@@ -0,0 +1,106 @@
+import request from '@/utils/request';
+import type { ApiResult, PageResult } from '@/api';
+import type { UserCollection, UserCollectionParam } from './model';
+import { SERVER_API_URL } from '@/config/setting';
+
+/**
+ * 分页查询我的收藏
+ */
+export async function pageUserCollection(params: UserCollectionParam) {
+  const res = await request.get<ApiResult<PageResult<UserCollection>>>(
+    SERVER_API_URL + '/system/user-collection/page',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 查询我的收藏列表
+ */
+export async function listUserCollection(params?: UserCollectionParam) {
+  const res = await request.get<ApiResult<UserCollection[]>>(
+    SERVER_API_URL + '/system/user-collection',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 添加我的收藏
+ */
+export async function addUserCollection(data: UserCollection) {
+  const res = await request.post<ApiResult<unknown>>(
+    SERVER_API_URL + '/system/user-collection',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 修改我的收藏
+ */
+export async function updateUserCollection(data: UserCollection) {
+  const res = await request.put<ApiResult<unknown>>(
+    SERVER_API_URL + '/system/user-collection',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 删除我的收藏
+ */
+export async function removeUserCollection(id?: number) {
+  const res = await request.delete<ApiResult<unknown>>(
+    SERVER_API_URL + '/system/user-collection/' + id
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 批量删除我的收藏
+ */
+export async function removeBatchUserCollection(data: (number | undefined)[]) {
+  const res = await request.delete<ApiResult<unknown>>(
+    SERVER_API_URL + '/system/user-collection/batch',
+    {
+      data
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 根据id查询我的收藏
+ */
+export async function getUserCollection(id: number) {
+  const res = await request.get<ApiResult<UserCollection>>(
+    SERVER_API_URL + '/system/user-collection/' + id
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
--- a/src/api/system/user-collection/model/index.ts
+++ b/src/api/system/user-collection/model/index.ts
@@ -0,0 +1,25 @@
+import type { PageParam } from '@/api';
+
+/**
+ * 我的收藏
+ */
+export interface UserCollection {
+  // 主键ID
+  id?: number;
+  // 租户ID
+  tid?: number;
+  // 用户ID
+  userId?: number;
+  // 租户id
+  tenantId?: number;
+  // 注册时间
+  createTime?: string;
+}
+
+/**
+ * 我的收藏搜索条件
+ */
+export interface UserCollectionParam extends PageParam {
+  id?: number;
+  keywords?: string;
+}