feat(user): 新增收货地址管理及售后申请页面
- 新增地址类型定义，增强前端地址数据结构 - 新增地址编辑页面，支持地址智能识别和定位选点功能 - 地址编辑支持省市区选择及默认地址设置 - 新增地址列表页面，支持地址展示、删除、编辑和选择功能 - 实现售后申请页面，支持选择售后类型和退款原因 - 售后申请支持商品选择、退款金额计算和凭证上传 - 新增售后详情页面，支持售后状态展示及申请取消 - 优化页面加载和用户交互体验，增加错误提示和权限处理
This commit is contained in:
31
src_bak/api/system/user/balance-log/index.ts
Normal file
31
src_bak/api/system/user/balance-log/index.ts
Normal file
@@ -0,0 +1,31 @@
|
||||
import request from '@/utils/request'
|
||||
import type { ApiResult, PageResult } from '@/api'
|
||||
import type { UserBalanceLog, UserBalanceLogParam } from './model'
|
||||
|
||||
/**
|
||||
* 分页查询用户余额日志
|
||||
*/
|
||||
export async function pageUserBalanceLog(params?: UserBalanceLogParam): Promise<PageResult<UserBalanceLog>> {
|
||||
const res = await request.get<ApiResult<PageResult<UserBalanceLog>>>(
|
||||
'/shop/shop-user-balance-log/page',
|
||||
params
|
||||
)
|
||||
if (res.code === 0 && res.data) {
|
||||
return res.data
|
||||
}
|
||||
return Promise.reject(new Error(res.message))
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询全部用户余额日志
|
||||
*/
|
||||
export async function listUserBalanceLog(params?: UserBalanceLogParam): Promise<UserBalanceLog[]> {
|
||||
const res = await request.get<ApiResult<UserBalanceLog[]>>(
|
||||
'/shop/shop-user-balance-log',
|
||||
params
|
||||
)
|
||||
if (res.code === 0 && res.data) {
|
||||
return res.data
|
||||
}
|
||||
return Promise.reject(new Error(res.message))
|
||||
}
|
||||
23
src_bak/api/system/user/balance-log/model/index.ts
Normal file
23
src_bak/api/system/user/balance-log/model/index.ts
Normal file
@@ -0,0 +1,23 @@
|
||||
/**
|
||||
* 用户余额日志类型定义
|
||||
*/
|
||||
|
||||
export interface UserBalanceLog {
|
||||
logId: number
|
||||
userId: number
|
||||
scene: number
|
||||
money: string
|
||||
balance: string
|
||||
orderNo: string
|
||||
describe?: string
|
||||
comments?: string
|
||||
remark?: string
|
||||
createTime: string
|
||||
}
|
||||
|
||||
export interface UserBalanceLogParam {
|
||||
page?: number
|
||||
limit?: number
|
||||
userId?: number
|
||||
scene?: number
|
||||
}
|
||||
23
src_bak/api/system/user/balance.ts
Normal file
23
src_bak/api/system/user/balance.ts
Normal file
@@ -0,0 +1,23 @@
|
||||
import request from '@/utils/request'
|
||||
import type { ApiResult } from '@/api'
|
||||
import type { UserBalance } from './model'
|
||||
|
||||
/**
|
||||
* 获取当前用户余额信息（跨库读取 gxwebsoft_core.sys_user）
|
||||
* 通过 paopao-api 本地 /auth/user-balance 接口，无需跨域请求 core 系统
|
||||
*/
|
||||
export async function getUserBalance(): Promise<UserBalance> {
|
||||
const res = await request.get<ApiResult<any>>(
|
||||
'/auth/user-balance'
|
||||
)
|
||||
if (res.code === 0 && res.data) {
|
||||
const data = res.data
|
||||
return {
|
||||
balance: data.balance != null ? String(data.balance) : '0',
|
||||
frozenBalance: '0',
|
||||
totalIncome: '0',
|
||||
totalExpense: '0',
|
||||
}
|
||||
}
|
||||
return Promise.reject(new Error(res.message || '获取余额失败'))
|
||||
}
|
||||
261
src_bak/api/system/user/index.ts
Normal file
261
src_bak/api/system/user/index.ts
Normal file
@@ -0,0 +1,261 @@
|
||||
import request from '@/utils/request';
|
||||
import type {ApiResult, PageResult} from '@/api';
|
||||
import type {User, UserParam} from './model';
|
||||
import type { UserBalance } from './model';
|
||||
import {SERVER_API_URL} from "@/utils/server";
|
||||
|
||||
// 导出用户余额相关
|
||||
export * from './balance';
|
||||
export * from './balance-log';
|
||||
export * from './points';
|
||||
export * from './withdraw';
|
||||
|
||||
// 用户余额类型
|
||||
export type { UserBalance };
|
||||
|
||||
/**
|
||||
* 分页查询用户
|
||||
*/
|
||||
export async function pageUsers(params: UserParam) {
|
||||
const res = await request.get<ApiResult<PageResult<User>>>(
|
||||
SERVER_API_URL + '/system/user/page',
|
||||
params
|
||||
);
|
||||
if (res.code === 0) {
|
||||
return res.data;
|
||||
}
|
||||
return Promise.reject(new Error(res.message));
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询用户列表
|
||||
*/
|
||||
export async function listUsers(params?: UserParam) {
|
||||
const res = await request.get<ApiResult<User[]>>(
|
||||
SERVER_API_URL + '/system/user',
|
||||
params
|
||||
);
|
||||
if (res.code === 0 && res.data) {
|
||||
return res.data;
|
||||
}
|
||||
return Promise.reject(new Error(res.message));
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询用户列表
|
||||
*/
|
||||
export async function getStaffs(params?: UserParam) {
|
||||
const res = await request.get<ApiResult<User[]>>(
|
||||
SERVER_API_URL + '/system/user',
|
||||
{
|
||||
params
|
||||
}
|
||||
);
|
||||
if (res.code === 0 && res.data) {
|
||||
return res.data;
|
||||
}
|
||||
return Promise.reject(new Error(res.message));
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询用户列表
|
||||
*/
|
||||
export async function getCompanyList(params?: UserParam) {
|
||||
const res = await request.get<ApiResult<User[]>>(
|
||||
SERVER_API_URL + '/system/user',
|
||||
{
|
||||
params
|
||||
}
|
||||
);
|
||||
if (res.code === 0 && res.data) {
|
||||
return res.data;
|
||||
}
|
||||
return Promise.reject(new Error(res.message));
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据id查询用户
|
||||
*/
|
||||
export async function getUser(id: number) {
|
||||
const res = await request.get<ApiResult<User>>(
|
||||
SERVER_API_URL + '/system/user/' + id,
|
||||
{}
|
||||
);
|
||||
if (res.code === 0 && res.data) {
|
||||
return res.data;
|
||||
}
|
||||
return Promise.reject(new Error(res.message));
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加用户
|
||||
*/
|
||||
export async function addUser(data: User) {
|
||||
const res = await request.post<ApiResult<unknown>>(
|
||||
SERVER_API_URL + '/system/user',
|
||||
data
|
||||
);
|
||||
if (res.code === 0) {
|
||||
return res.message;
|
||||
}
|
||||
return Promise.reject(new Error(res.message));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改用户
|
||||
*/
|
||||
export async function updateUser(data: User) {
|
||||
const res = await request.put<ApiResult<unknown>>(
|
||||
SERVER_API_URL + '/system/user',
|
||||
data
|
||||
);
|
||||
if (res.code === 0) {
|
||||
return res.message;
|
||||
}
|
||||
return Promise.reject(new Error(res.message));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除用户
|
||||
*/
|
||||
export async function removeUser(id?: number) {
|
||||
const res = await request.del<ApiResult<unknown>>(
|
||||
SERVER_API_URL + '/system/user/' + id
|
||||
);
|
||||
if (res.code === 0) {
|
||||
return res.message;
|
||||
}
|
||||
return Promise.reject(new Error(res.message));
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除用户
|
||||
*/
|
||||
export async function removeUsers(data: (number | undefined)[]) {
|
||||
const res = await request.del<ApiResult<unknown>>(
|
||||
SERVER_API_URL + '/system/user/batch',
|
||||
{
|
||||
data
|
||||
}
|
||||
);
|
||||
if (res.code === 0) {
|
||||
return res.message;
|
||||
}
|
||||
return Promise.reject(new Error(res.message));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改用户状态
|
||||
*/
|
||||
export async function updateUserStatus(userId?: number, status?: number) {
|
||||
const res = await request.put<ApiResult<unknown>>(
|
||||
SERVER_API_URL + '/system/user/status',
|
||||
{
|
||||
userId,
|
||||
status
|
||||
}
|
||||
);
|
||||
if (res.code === 0) {
|
||||
return res.message;
|
||||
}
|
||||
return Promise.reject(new Error(res.message));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改推荐状态
|
||||
*/
|
||||
export async function updateUserRecommend(form:any) {
|
||||
const res = await request.put<ApiResult<unknown>>(
|
||||
SERVER_API_URL + '/system/user/recommend',
|
||||
form
|
||||
);
|
||||
if (res.code === 0) {
|
||||
return res.message;
|
||||
}
|
||||
return Promise.reject(new Error(res.message));
|
||||
}
|
||||
|
||||
/**
|
||||
* 重置用户密码
|
||||
*/
|
||||
export async function updateUserPassword(userId?: number, password = '123456') {
|
||||
const res = await request.put<ApiResult<unknown>>(
|
||||
SERVER_API_URL + '/system/user/password',
|
||||
{
|
||||
userId,
|
||||
password
|
||||
}
|
||||
);
|
||||
if (res.code === 0) {
|
||||
return res.message;
|
||||
}
|
||||
return Promise.reject(new Error(res.message));
|
||||
}
|
||||
|
||||
/**
|
||||
* 导入用户
|
||||
*/
|
||||
export async function importUsers(file: File) {
|
||||
const formData = new FormData();
|
||||
formData.append('file', file);
|
||||
const res = await request.post<ApiResult<unknown>>(
|
||||
SERVER_API_URL + '/system/user/import',
|
||||
formData
|
||||
);
|
||||
if (res.code === 0) {
|
||||
return res.message;
|
||||
}
|
||||
return Promise.reject(new Error(res.message));
|
||||
}
|
||||
|
||||
/**
|
||||
* 检查用户是否存在
|
||||
*/
|
||||
export async function checkExistence(
|
||||
field: string,
|
||||
value: string,
|
||||
id?: number
|
||||
) {
|
||||
const res = await request.get<ApiResult<unknown>>(
|
||||
SERVER_API_URL + '/system/user/existence',
|
||||
{
|
||||
params: {field, value, id}
|
||||
}
|
||||
);
|
||||
if (res.code === 0) {
|
||||
return res.message;
|
||||
}
|
||||
return Promise.reject(new Error(res.message));
|
||||
}
|
||||
|
||||
/**
|
||||
* 统计用户余额（使用 paopao-api）
|
||||
*/
|
||||
export async function countUserBalance(params?: UserParam) {
|
||||
const res = await request.get<ApiResult<unknown>>(
|
||||
SERVER_API_URL + '/system/user/countUserBalance',
|
||||
{
|
||||
params
|
||||
}
|
||||
);
|
||||
if (res.code === 0 && res.data) {
|
||||
return res.data;
|
||||
}
|
||||
return Promise.reject(new Error(res.message));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 选择管理员账号登录
|
||||
* @param params
|
||||
*/
|
||||
export async function listAdminsByPhoneAll(params?: UserParam) {
|
||||
const res = await request.get<ApiResult<User[]>>(
|
||||
SERVER_API_URL + '/system/user/listAdminsByPhoneAll',
|
||||
params
|
||||
);
|
||||
if (res.code === 0 && res.data) {
|
||||
return res.data;
|
||||
}
|
||||
return Promise.reject(new Error(res.message));
|
||||
}
|
||||
15
src_bak/api/system/user/model/count.ts
Normal file
15
src_bak/api/system/user/model/count.ts
Normal file
@@ -0,0 +1,15 @@
|
||||
import type { PageParam } from '@/api/index';
|
||||
|
||||
/**
|
||||
* 用户
|
||||
*/
|
||||
export interface Count {
|
||||
balance?: string;
|
||||
}
|
||||
|
||||
/**
|
||||
* 用户搜索条件
|
||||
*/
|
||||
export interface UserParam extends PageParam {
|
||||
organizationId?: number;
|
||||
}
|
||||
35
src_bak/api/system/user/model/index.ts
Normal file
35
src_bak/api/system/user/model/index.ts
Normal file
@@ -0,0 +1,35 @@
|
||||
/**
|
||||
* 用户余额类型定义
|
||||
*/
|
||||
|
||||
export interface UserBalance {
|
||||
balance: string
|
||||
frozenBalance: string
|
||||
totalIncome: string
|
||||
totalExpense: string
|
||||
}
|
||||
|
||||
/**
|
||||
* 用户信息（来自 core 系统 sys_user 表）
|
||||
*/
|
||||
export interface User {
|
||||
userId?: number
|
||||
id?: number
|
||||
username?: string
|
||||
realName?: string
|
||||
nickname?: string
|
||||
avatar?: string
|
||||
phone?: string
|
||||
mobile?: string
|
||||
email?: string
|
||||
gender?: number
|
||||
balance?: string | number
|
||||
points?: number
|
||||
memberLevelId?: number
|
||||
memberLevelName?: string
|
||||
status?: number
|
||||
createTime?: string
|
||||
updateTime?: string
|
||||
/** 扩展字段，兼容后端返回的额外属性 */
|
||||
[key: string]: unknown
|
||||
}
|
||||
44
src_bak/api/system/user/points/index.ts
Normal file
44
src_bak/api/system/user/points/index.ts
Normal file
@@ -0,0 +1,44 @@
|
||||
import request from '@/utils/request'
|
||||
import type { ApiResult, PageResult } from '@/api'
|
||||
import type { UserPointsLog } from './model'
|
||||
|
||||
/**
|
||||
* 用户积分统计数据
|
||||
*/
|
||||
export interface UserPointsInfo {
|
||||
points: number // 当前积分
|
||||
totalEarned: number // 累计获得
|
||||
totalUsed: number // 累计使用
|
||||
expiringSoon: number // 即将过期
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取用户积分信息（包含汇总统计）
|
||||
*/
|
||||
export async function getUserPointsInfo(): Promise<UserPointsInfo> {
|
||||
const res = await request.get<ApiResult<UserPointsInfo>>(
|
||||
'/user/points'
|
||||
)
|
||||
if (res.code === 0 && res.data) {
|
||||
return res.data
|
||||
}
|
||||
return Promise.reject(new Error(res.message))
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页查询用户积分日志
|
||||
*/
|
||||
export async function pageUserPointsLog(params?: {
|
||||
page?: number
|
||||
limit?: number
|
||||
type?: number
|
||||
}): Promise<PageResult<UserPointsLog>> {
|
||||
const res = await request.get<ApiResult<PageResult<UserPointsLog>>>(
|
||||
'/shop/shop-user-points-log/page',
|
||||
params
|
||||
)
|
||||
if (res.code === 0 && res.data) {
|
||||
return res.data
|
||||
}
|
||||
return Promise.reject(new Error(res.message))
|
||||
}
|
||||
13
src_bak/api/system/user/points/model/index.ts
Normal file
13
src_bak/api/system/user/points/model/index.ts
Normal file
@@ -0,0 +1,13 @@
|
||||
/**
|
||||
* 用户积分类型定义
|
||||
*/
|
||||
|
||||
export interface UserPointsLog {
|
||||
logId: number
|
||||
userId: number
|
||||
points: number
|
||||
type: number // 1-获得, 2-消费, 3-过期, 4-调整
|
||||
reason?: string
|
||||
orderId?: number
|
||||
createTime: string
|
||||
}
|
||||
18
src_bak/api/system/user/withdraw/index.ts
Normal file
18
src_bak/api/system/user/withdraw/index.ts
Normal file
@@ -0,0 +1,18 @@
|
||||
import request from '@/utils/request'
|
||||
import type { ApiResult } from '@/api'
|
||||
import type { UserWithdraw, WithdrawRequest } from './model'
|
||||
|
||||
/**
|
||||
* 创建用户提现申请
|
||||
* 注意：后端可能需要实现此接口
|
||||
*/
|
||||
export async function createUserWithdraw(data: WithdrawRequest): Promise<UserWithdraw> {
|
||||
const res = await request.post<ApiResult<UserWithdraw>>(
|
||||
'/shop/shop-user-withdraw/create',
|
||||
data
|
||||
)
|
||||
if (res.code === 0 && res.data) {
|
||||
return res.data
|
||||
}
|
||||
return Promise.reject(new Error(res.message))
|
||||
}
|
||||
19
src_bak/api/system/user/withdraw/model/index.ts
Normal file
19
src_bak/api/system/user/withdraw/model/index.ts
Normal file
@@ -0,0 +1,19 @@
|
||||
/**
|
||||
* 用户提现类型定义
|
||||
*/
|
||||
|
||||
export interface UserWithdraw {
|
||||
id?: number
|
||||
userId?: number
|
||||
amount?: string
|
||||
withdrawType?: number // 0-微信零钱, 1-银行卡, 2-支付宝
|
||||
accountInfo?: string
|
||||
status?: number
|
||||
createTime?: string
|
||||
}
|
||||
|
||||
export interface WithdrawRequest {
|
||||
amount: string
|
||||
withdrawType: number
|
||||
accountInfo?: string
|
||||
}
|
||||
Reference in New Issue
Block a user