feat: 高级列表

src/services/login/index.ts

@@ -19,7 +19,7 @@ export async function login(
   body: API.UserLoginVO,
   options?: { [key: string]: any }
 ) {
-  return request<IResponse<API.TokenType>>("/system/auth/login", {
+  return request<API.TokenType>("/system/auth/login", {
     method: "POST",
     headers: {
       "Content-Type": "application/json",
@@ -84,16 +84,13 @@ export async function loginOut() {
 //   return request.get({ url: "/system/auth/get-permission-info" });
 // };
 export async function getInfo(options?: { [key: string]: any }) {
-  return request<IResponse<API.UserInfoVO>>(
-    "/system/auth/get-permission-info",
-    {
-      method: "GET",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      ...(options || {}),
-    }
-  );
+  return request<API.UserInfoVO>("/system/auth/get-permission-info", {
+    method: "GET",
+    headers: {
+      "Content-Type": "application/json",
+    },
+    ...(options || {}),
+  });
 }
 //获取登录验证码
 // export const sendSmsCode = (data: SmsCodeVO) => {

src/services/prodApi/category.ts

@@ -1,5 +1,5 @@
 // @ts-ignore
-/* eslint-disable */
+/// <reference path="./typings.d.ts" />
 import { request } from "@umijs/max";
 
 /** 获取菜单页面的表 GET /product/category/categoryList */

src/services/prodApi/product.ts

@@ -1,5 +1,5 @@
 // @ts-ignore
-/* eslint-disable */
+/// <reference path="./typings.d.ts" />
 import { request } from "@umijs/max";
 
 /** 创建商品 创建商品 POST /prod/create */
@@ -88,12 +88,9 @@ export async function getProductProdGetProdRecycleBinPageList(
     {
       method: "GET",
       params: {
-        // pageNo has a default value: 1
-        pageNo: "1",
-        // pageSize has a default value: 10
-        pageSize: "10",
-
         ...params,
+        pageNo: params.pageNo ?? "1",
+        pageSize: params.pageSize ?? "10",
       },
       ...(options || {}),
     }
@@ -127,12 +124,9 @@ export async function getProductProdPage(
   return request<API.CommonResultPageResultProdListVO>("/product/prod/page", {
     method: "GET",
     params: {
-      // pageNo has a default value: 1
-      pageNo: "1",
-      // pageSize has a default value: 10
-      pageSize: "10",
-
       ...params,
+      pageNo: params.pageNo ?? "1",
+      pageSize: params.pageSize ?? "10",
     },
     ...(options || {}),
   });
@@ -299,12 +293,9 @@ export async function getProductSkuGetPropRecycleBinList(
     {
       method: "GET",
       params: {
-        // pageNo has a default value: 1
-        pageNo: "1",
-        // pageSize has a default value: 10
-        pageSize: "10",
-
         ...params,
+        pageNo: params.pageNo ?? "1",
+        pageSize: params.pageSize ?? "10",
       },
       ...(options || {}),
     }
@@ -337,12 +328,9 @@ export async function getProductSkuGetSkuPageList(
     {
       method: "GET",
       params: {
-        // pageNo has a default value: 1
-        pageNo: "1",
-        // pageSize has a default value: 10
-        pageSize: "10",
-
         ...params,
+        pageNo: params.pageNo ?? "1",
+        pageSize: params.pageSize ?? "10",
       },
       ...(options || {}),
     }
@@ -375,12 +363,9 @@ export async function getProductSkuGetSkuRecycleBinPageList(
     {
       method: "GET",
       params: {
-        // pageNo has a default value: 1
-        pageNo: "1",
-        // pageSize has a default value: 10
-        pageSize: "10",
-
         ...params,
+        pageNo: params.pageNo ?? "1",
+        pageSize: params.pageSize ?? "10",
       },
       ...(options || {}),
     }

src/services/prodApi/typings.d.ts

@@ -202,6 +202,15 @@ declare namespace API {
     msg?: string;
   };
 
+  type CommonResultPageResultTradeOrderPageItemRespVO = {
+    /** 错误码 */
+    code?: number;
+    /** 返回数据 */
+    data?: PageResultTradeOrderPageItemRespVO;
+    /** 错误提示，用户可阅读 */
+    msg?: string;
+  };
+
   type CommonResultProdServiceVO = {
     /** 错误码 */
     code?: number;
@@ -371,6 +380,43 @@ declare namespace API {
     skuId?: number;
   };
 
+  type getTradeOrderGetDetailParams = {
+    id: number;
+  };
+
+  type getTradeOrderPageParams = {
+    /** 页码，从 1 开始", example = "1 */
+    pageNo: number;
+    /** 每页条数，最大值为 100" */
+    pageSize: number;
+    /** 订单号，示例：88888888 */
+    orderNum?: string;
+    /** 用户编号，示例：1024 */
+    userId?: number;
+    /** 用户昵称，示例：小王 */
+    userNickname?: string;
+    /** 用户手机号，示例：小王 */
+    userMobile?: string;
+    /** 配送方式，示例：1 */
+    deliveryType?: number;
+    /** 发货物流公司编号，示例：1 */
+    logisticsId?: number;
+    /** 自提门店编号，示例：[1,2] */
+    pickUpStoreIds?: string;
+    /** 自提核销码，示例：12345678 */
+    pickUpVerifyCode?: string;
+    /** 订单类型，示例：1 */
+    type?: number;
+    /** 订单状态，示例：1 */
+    status?: number;
+    /** 支付渠道，示例：wx_lite */
+    payChannelCode?: string;
+    /** 创建时间 */
+    createTime?: string[];
+    /** 订单来源，示例：10 */
+    terminal?: number;
+  };
+
   type Item = {
     /** 编号 - 必填，示例：1 */
     id?: number;
@@ -497,6 +543,13 @@ declare namespace API {
     total?: number;
   };
 
+  type PageResultTradeOrderPageItemRespVO = {
+    /** 数据 */
+    list?: TradeOrderPageItemRespVO[];
+    /** 总量 */
+    total?: number;
+  };
+
   type postProductProdRestoreProdListParams = {
     /** 商品id集合 */
     ids: number[];

src/services/system/permission/index.ts

@@ -13,7 +13,7 @@ export interface PermissionAssignRoleMenuReqVO {
 export interface PermissionAssignRoleDataScopeReqVO {
   roleId: number;
   dataScope: number;
-  dataScopeDeptIds: number[];
+  dataScopeDeptIds: React.Key[];
 }
 
 // export async function postProductProdRestoreProdList(

src/services/system/tenant/list.ts

@@ -0,0 +1,91 @@
+import { request } from "@umijs/max";
+
+export interface TenantVO {
+  id: number;
+  name: string;
+  contactName: string;
+  contactMobile: string;
+  status: number;
+  domain: string;
+  packageId: number;
+  username: string;
+  password: string;
+  expireTime: Date;
+  accountCount: number;
+  createTime: Date;
+}
+
+export interface TenantPageReqVO extends PageParam {
+  name?: string;
+  contactName?: string;
+  contactMobile?: string;
+  status?: number;
+  createTime?: Date[];
+}
+
+export interface TenantExportReqVO {
+  name?: string;
+  contactName?: string;
+  contactMobile?: string;
+  status?: number;
+  createTime?: Date[];
+}
+
+// 查询租户列表
+// export const getTenantPage = (params: TenantPageReqVO) => {
+//   return request.get({ url: '/system/tenant/page', params })
+// }
+export async function getTenantPage(params: TenantPageReqVO) {
+  return request("/system/tenant/page", {
+    method: "GET",
+    params,
+  });
+}
+// 查询租户详情
+// export const getTenant = (id: number) => {
+//   return request.get({ url: "/system/tenant/get?id=" + id });
+// };
+export async function getTenant(id: number) {
+  return request("/system/tenant/get", {
+    method: "GET",
+    params: { id },
+  });
+}
+// 新增租户
+// export const createTenant = (data: TenantVO) => {
+//   return request.post({ url: "/system/tenant/create", data });
+// };
+export async function createTenant(data: TenantVO) {
+  return request("/system/tenant/create", {
+    method: "POST",
+    data,
+  });
+}
+// 修改租户
+// export const updateTenant = (data: TenantVO) => {
+//   return request.put({ url: "/system/tenant/update", data });
+// };
+export async function updateTenant(data: TenantVO) {
+  return request("/system/tenant/update", {
+    method: "PUT",
+    headers: {
+      "Content-Type": "application/json",
+    },
+    data,
+  });
+}
+// 删除租户
+// export const deleteTenant = (id: number) => {
+//   return request.delete({ url: "/system/tenant/delete?id=" + id });
+// };
+export async function deleteTenant(
+  // 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
+  id: number
+) {
+  return request("/system/tenant/delete", {
+    method: "DELETE",
+    params: {
+      id,
+    },
+  });
+}