b2894lxlx/guofu-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、右上角的登录信息改为优先显示真实姓名

Browse Source 
2、修复已知bug
This commit is contained in:
赵忠林
2024-07-27 13:53:11 +08:00
parent 904bd82e39
commit b9df13a916
23 changed files with 1499 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
src/api/shop/rechargeOrder/index.ts Normal file
View File

@@ -0,0 +1,106 @@
import request from '@/utils/request';
import type { ApiResult, PageResult } from '@/api';
import type { RechargeOrder, RechargeOrderParam } from './model';
import { MODULES_API_URL } from '@/config/setting';
/**
* 分页查询会员充值订单表
*/
export async function pageRechargeOrder(params: RechargeOrderParam) {
const res = await request.get<ApiResult<PageResult<RechargeOrder>>>(
MODULES_API_URL + '/shop/recharge-order/page',
{
params
}
);
if (res.data.code === 0) {
return res.data.data;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 查询会员充值订单表列表
*/
export async function listRechargeOrder(params?: RechargeOrderParam) {
const res = await request.get<ApiResult<RechargeOrder[]>>(
MODULES_API_URL + '/shop/recharge-order',
{
params
}
);
if (res.data.code === 0 && res.data.data) {
return res.data.data;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 添加会员充值订单表
*/
export async function addRechargeOrder(data: RechargeOrder) {
const res = await request.post<ApiResult<unknown>>(
MODULES_API_URL + '/shop/recharge-order',
data
);
if (res.data.code === 0) {
return res.data.message;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 修改会员充值订单表
*/
export async function updateRechargeOrder(data: RechargeOrder) {
const res = await request.put<ApiResult<unknown>>(
MODULES_API_URL + '/shop/recharge-order',
data
);
if (res.data.code === 0) {
return res.data.message;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 删除会员充值订单表
*/
export async function removeRechargeOrder(id?: number) {
const res = await request.delete<ApiResult<unknown>>(
MODULES_API_URL + '/shop/recharge-order/' + id
);
if (res.data.code === 0) {
return res.data.message;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 批量删除会员充值订单表
*/
export async function removeBatchRechargeOrder(data: (number | undefined)[]) {
const res = await request.delete<ApiResult<unknown>>(
MODULES_API_URL + '/shop/recharge-order/batch',
{
data
}
);
if (res.data.code === 0) {
return res.data.message;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 根据id查询会员充值订单表
*/
export async function getRechargeOrder(id: number) {
const res = await request.get<ApiResult<RechargeOrder>>(
MODULES_API_URL + '/shop/recharge-order/' + id
);
if (res.data.code === 0 && res.data.data) {
return res.data.data;
}
return Promise.reject(new Error(res.data.message));
}

63
src/api/shop/rechargeOrder/model/index.ts Normal file
View File

@@ -0,0 +1,63 @@
import type { PageParam } from '@/api';
/**
* 会员充值订单表
*/
export interface RechargeOrder {
// 订单ID
orderId?: number;
// 订单号
orderNo?: string;
// 用户ID
userId?: number;
// 充值方式(10自定义金额 20套餐充值)
rechargeType?: number;
// 机构id
organizationId?: number;
// 充值套餐ID
planId?: number;
// 用户支付金额
payPrice?: string;
// 赠送金额
giftMoney?: string;
// 实际到账金额
actualMoney?: string;
// 用户可用余额
balance?: string;
// 支付方式（微信/支付宝）
payMethod?: string;
// 支付状态(10待支付 20已支付)
payStatus?: number;
// 付款时间
payTime?: number;
// 第三方交易记录ID
tradeId?: number;
// 来源客户端 (APP、H5、小程序等)
platform?: string;
// 所属门店ID
shopId?: number;
// 排序(数字越小越靠前)
sortNumber?: number;
// 备注
comments?: string;
// 状态, 0正常, 1冻结
status?: number;
// 是否删除, 0否, 1是
deleted?: number;
// 商户编码
merchantCode?: string;
// 租户id
tenantId?: number;
// 注册时间
createTime?: string;
// 修改时间
updateTime?: string;
}
/**
* 会员充值订单表搜索条件
*/
export interface RechargeOrderParam extends PageParam {
orderId?: number;
keywords?: string;
}

1
src/api/system/user/model/index.ts
View File

@@ -2,7 +2,6 @@ import type { PageParam } from '@/api';
import type { Role } from '../../role/model';
import type { Menu } from '../../menu/model';
import { Company } from '@/api/system/company/model';
import { Merchant } from "@/api/shop/merchant/model";
/**
* 用户

16
src/api/user/balance-log/index.ts
View File

@@ -1,14 +1,14 @@
import request from '@/utils/request';
import type { ApiResult, PageResult } from '@/api';
import type { UserBalanceLog, UserBalanceLogParam } from './model';
import { MODULES_API_URL } from '@/config/setting';
import { SERVER_API_URL } from '@/config/setting';
/**
* 分页查询余额明细
*/
export async function pageUserBalanceLog(params: UserBalanceLogParam) {
const res = await request.get<ApiResult<PageResult<UserBalanceLog>>>(
MODULES_API_URL + '/shop/user-balance-log/page',
SERVER_API_URL + '/sys/user-balance-log/page',
{ params }
);
if (res.data.code === 0) {
@@ -22,7 +22,7 @@ export async function pageUserBalanceLog(params: UserBalanceLogParam) {
*/
export async function listUserBalanceLog(params?: UserBalanceLogParam) {
const res = await request.get<ApiResult<UserBalanceLog[]>>(
MODULES_API_URL + '/shop/user-balance-log',
SERVER_API_URL + '/sys/user-balance-log',
{
params
}
@@ -38,7 +38,7 @@ export async function listUserBalanceLog(params?: UserBalanceLogParam) {
*/
export async function getUserBalanceLog(id: number) {
const res = await request.get<ApiResult<UserBalanceLog>>(
MODULES_API_URL + '/shop/user-balance-log/' + id
SERVER_API_URL + '/sys/user-balance-log/' + id
);
if (res.data.code === 0 && res.data.data) {
return res.data.data;
@@ -51,7 +51,7 @@ export async function getUserBalanceLog(id: number) {
*/
export async function addUserBalanceLog(data: UserBalanceLog) {
const res = await request.post<ApiResult<unknown>>(
MODULES_API_URL + '/shop/user-balance-log',
SERVER_API_URL + '/sys/user-balance-log',
data
);
if (res.data.code === 0) {
@@ -65,7 +65,7 @@ export async function addUserBalanceLog(data: UserBalanceLog) {
*/
export async function updateUserBalanceLog(data: UserBalanceLog) {
const res = await request.put<ApiResult<unknown>>(
MODULES_API_URL + '/shop/user-balance-log',
SERVER_API_URL + '/sys/user-balance-log',
data
);
if (res.data.code === 0) {
@@ -79,7 +79,7 @@ export async function updateUserBalanceLog(data: UserBalanceLog) {
*/
export async function removeUserBalanceLog(id?: number) {
const res = await request.delete<ApiResult<unknown>>(
MODULES_API_URL + '/shop/user-balance-log/' + id
SERVER_API_URL + '/sys/user-balance-log/' + id
);
if (res.data.code === 0) {
return res.data.message;
@@ -92,7 +92,7 @@ export async function removeUserBalanceLog(id?: number) {
*/
export async function removeUserBalanceLogs(data: (number | undefined)[]) {
const res = await request.delete<ApiResult<unknown>>(
MODULES_API_URL + '/shop/user-balance-log/batch',
SERVER_API_URL + '/sys/user-balance-log/batch',
{
data
}

15
src/api/user/recharge/export/index.ts
View File

@@ -4,12 +4,13 @@ import type {
RechargeOrder,
RechargeOrderParam
} from '@/api/user/recharge/export/model';
import { SERVER_API_URL } from '@/config/setting';
/**
* 分页查询充值计划
*/
export async function pageRechargeOrder(params: RechargeOrderParam) {
const res = await request.get<ApiResult<PageResult<RechargeOrder>>>(
'/shop/recharge-order/page',
SERVER_API_URL + '/sys/recharge-order/page',
{
params
}
@@ -25,7 +26,7 @@ export async function pageRechargeOrder(params: RechargeOrderParam) {
*/
export async function listRechargeOrder(params?: RechargeOrderParam) {
const res = await request.get<ApiResult<RechargeOrder[]>>(
'/shop/recharge-order',
SERVER_API_URL + '/sys/recharge-order',
{
params
}
@@ -41,7 +42,7 @@ export async function listRechargeOrder(params?: RechargeOrderParam) {
*/
export async function addRechargeOrder(data: RechargeOrder) {
const res = await request.post<ApiResult<unknown>>(
'/shop/recharge-order',
SERVER_API_URL + '/sys/recharge-order',
data
);
if (res.data.code === 0) {
@@ -55,7 +56,7 @@ export async function addRechargeOrder(data: RechargeOrder) {
*/
export async function updateRechargeOrder(data: RechargeOrder) {
const res = await request.put<ApiResult<unknown>>(
'/shop/recharge-order',
SERVER_API_URL + '/sys/recharge-order',
data
);
if (res.data.code === 0) {
@@ -69,7 +70,7 @@ export async function updateRechargeOrder(data: RechargeOrder) {
*/
export async function bindRechargeOrder(data: RechargeOrder) {
const res = await request.put<ApiResult<unknown>>(
'/shop/recharge-order/bind',
SERVER_API_URL + '/sys/recharge-order/bind',
data
);
if (res.data.code === 0) {
@@ -83,7 +84,7 @@ export async function bindRechargeOrder(data: RechargeOrder) {
*/
export async function removeRechargeOrder(id?: number) {
const res = await request.delete<ApiResult<unknown>>(
'/shop/recharge-order/' + id
SERVER_API_URL + '/sys/recharge-order/' + id
);
if (res.data.code === 0) {
return res.data.message;
@@ -96,7 +97,7 @@ export async function removeRechargeOrder(id?: number) {
*/
export async function removeBatchRechargeOrder(data: (number | undefined)[]) {
const res = await request.delete<ApiResult<unknown>>(
'/shop/recharge-order/batch',
SERVER_API_URL + '/sys/recharge-order/batch',
{
data
}

6
src/api/user/recharge/export/model/index.ts
View File

@@ -4,8 +4,14 @@ export interface RechargeOrder {
orderId?: number;
organizationId?: number;
organizationName?: string;
rechargeType?: number;
nickname?: string;
realName?: string;
phone?: string;
payPrice?: number;
giftMoney?: number;
actualMoney?: number;
operator?: string;
comments?: string;
createTime?: string;
tenantId?: number;

19
src/api/user/recharge/order/index.ts
View File

@@ -1,13 +1,14 @@
import request from '@/utils/request';
import type { ApiResult, PageResult } from '@/api';
import type { RechargeOrder, RechargeOrderParam } from './model/index';
import { SERVER_API_URL } from '@/config/setting';
/**
* 充值
*/
export async function recharge(data: RechargeOrder) {
const res = await request.post<ApiResult<unknown>>(
'/shop/recharge-order/recharge',
SERVER_API_URL + '/sys/recharge-order/recharge',
data
);
if (res.data.code === 0) {
@@ -21,7 +22,7 @@ export async function recharge(data: RechargeOrder) {
*/
export async function pageRechargeOrder(params: RechargeOrderParam) {
const res = await request.get<ApiResult<PageResult<RechargeOrder>>>(
'/shop/recharge-order/page',
SERVER_API_URL + '/sys/recharge-order/page',
{
params
}
@@ -37,7 +38,7 @@ export async function pageRechargeOrder(params: RechargeOrderParam) {
*/
export async function listRechargeOrder(params?: RechargeOrderParam) {
const res = await request.get<ApiResult<RechargeOrder[]>>(
'/shop/recharge-order',
SERVER_API_URL + '/sys/recharge-order',
{
params
}
@@ -53,7 +54,7 @@ export async function listRechargeOrder(params?: RechargeOrderParam) {
*/
export async function getRechargeOrder(id: number) {
const res = await request.get<ApiResult<RechargeOrder>>(
'/shop/recharge-order/' + id
SERVER_API_URL + '/sys/recharge-order/' + id
);
if (res.data.code === 0 && res.data.data) {
return res.data.data;
@@ -66,7 +67,7 @@ export async function getRechargeOrder(id: number) {
*/
export async function addRechargeOrder(data: RechargeOrder) {
const res = await request.post<ApiResult<unknown>>(
'/shop/recharge-order',
SERVER_API_URL + '/sys/recharge-order',
data
);
if (res.data.code === 0) {
@@ -80,7 +81,7 @@ export async function addRechargeOrder(data: RechargeOrder) {
*/
export async function updateRechargeOrder(data: RechargeOrder) {
const res = await request.put<ApiResult<unknown>>(
'/shop/recharge-order',
SERVER_API_URL + '/sys/recharge-order',
data
);
if (res.data.code === 0) {
@@ -94,7 +95,7 @@ export async function updateRechargeOrder(data: RechargeOrder) {
*/
export async function removeRechargeOrder(id?: number) {
const res = await request.delete<ApiResult<unknown>>(
'/shop/recharge-order/' + id
SERVER_API_URL + '/sys/recharge-order/' + id
);
if (res.data.code === 0) {
return res.data.message;
@@ -107,7 +108,7 @@ export async function removeRechargeOrder(id?: number) {
*/
export async function removeBatchRechargeOrder(data: (number | undefined)[]) {
const res = await request.delete<ApiResult<unknown>>(
'/shop/recharge-order/batch',
SERVER_API_URL + '/sys/recharge-order/batch',
{
data
}
@@ -123,7 +124,7 @@ export async function removeBatchRechargeOrder(data: (number | undefined)[]) {
*/
export async function batchRecharge(data: RechargeOrder[]) {
const res = await request.post<ApiResult<unknown>>(
'/shop/recharge-order/batchRecharge',
SERVER_API_URL + '/sys/recharge-order/batchRecharge',
data
);
if (res.data.code === 0) {

1
src/api/user/recharge/order/model/index.ts
View File

@@ -10,6 +10,7 @@ export interface RechargeOrder {
orderNo?: string;
money?: string;
payPrice?: number;
actualMoney?: number;
organizationId?: number;
rechargeType?: number;
describe?: string;