Commit f1f8a6eb authored by guxukai's avatar guxukai

Merge remote-tracking branch 'origin/main'

parents b31fd5c7 1126bdc6
......@@ -9,6 +9,6 @@
- [x] logger-service - gxk
- [x] monitor-service - gxk
- [x] order-service - jqy
- [ ] pay-service - jqy
- [x] pay-service - jqy
- [x] user-service - zk
- [ ] website-service - jqy
- [x] website-service - jqy
......@@ -6,12 +6,8 @@ import { Model } from '@/shared/models/Model'
export class ContractChainApproveStat extends Model<ContractChainApproveStat> {
/**
* 统计用户发布应用和部署应用(联盟控制台)
* @param payload
*/
static async get(payload: ContractChainApproveStatGetReq) {
static async get() {
return await api.get('/services/app-service/contract/chain/approve/stat')
}
}
@Serializable()
export class ContractChainApproveStatGetReq extends Model<ContractChainApproveStatGetReq> {}
......@@ -4,7 +4,6 @@ import { Pagination } from '@shared/models/Pagination'
import { PaginationParams } from '@shared/models/PaginationParams'
import { HttpResponse } from '@shared/http/HttpResponse'
import { Order } from '@shared/models/order-service/Order'
import { OrderPagePostReq } from '@shared/models/order-service/OrderPage'
@Serializable()
export class OrderExpirePage extends Pagination<Order> {
......@@ -20,4 +19,4 @@ export class OrderExpirePage extends Pagination<Order> {
}
@Serializable()
export class OrderExpirePagePostReq extends PaginationParams<OrderPagePostReq> {}
export class OrderExpirePagePostReq extends PaginationParams<OrderExpirePagePostReq> {}
import { JsonProperty, Serializable } from 'typescript-json-serializer'
import { api } from '@shared/http/axios'
import { Pagination } from '@shared/models/Pagination'
import { PaginationParams } from '@shared/models/PaginationParams'
import { HttpResponse } from '@shared/http/HttpResponse'
import { OrderRefund } from '@shared/models/order-service/OrderRefund'
@Serializable()
export class OrderRefundPage extends Pagination<OrderRefund> {
@JsonProperty({ type: OrderRefund }) data: OrderRefund[]
/**
* 分页查询订单退款表信息
* @param payload
*/
static async post(payload: OrderRefundPagePostReq) {
return await api.post<HttpResponse<OrderRefundPage>>('/services/order-service/order/refund/page', { data: payload })
}
}
@Serializable()
export class OrderRefundPagePostReq extends PaginationParams<OrderRefundPagePostReq> {}
......@@ -6,12 +6,8 @@ import { Model } from '@shared/models/Model'
export class OrderStatistics extends Model<OrderStatistics> {
/**
* 统计未支付和续期的订单数量
* @param payload
*/
static async get(payload: OrderStatisticsGetReq) {
static async get() {
return await api.get('/services/order-service/order/statistics')
}
}
@Serializable()
export class OrderStatisticsGetReq extends Model<OrderStatisticsGetReq> {}
import { Serializable } from 'typescript-json-serializer'
import { Model } from '@shared/models/Model'
import { api } from '@shared/http/axios'
@Serializable()
export class Account extends Model<Account> {
/**
* 获取当前资金账户
*/
static async get() {
return await api.get('/services/pay-service/account')
}
}
import { JsonProperty, Serializable } from 'typescript-json-serializer'
import { Model } from '@shared/models/Model'
import { api } from '@shared/http/axios'
@Serializable()
export class BalanceAlarm extends Model<BalanceAlarm> {
/**
* 设置余额预警
* @param payload
*/
static async put(payload: BalanceAlarmPutReq) {
return await api.put('/services/pay-service/balance-alarm')
}
}
@Serializable()
export class BalanceAlarmPutReq extends Model<BalanceAlarmPutReq> {
//金额
@JsonProperty() amount: object
//业务单号
@JsonProperty() outBizNo: object
}
import { Serializable } from 'typescript-json-serializer'
import { Model } from '@shared/models/Model'
import { api } from '@shared/http/axios'
@Serializable()
export class CostBizTypes extends Model<CostBizTypes> {
/**
* 交易类型
*/
static async get() {
return await api.get('/services/pay-service/cost/biz-types')
}
}
import { JsonProperty, Serializable } from 'typescript-json-serializer'
import { Model } from '@shared/models/Model'
import { api } from '@shared/http/axios'
@Serializable()
export class CostTrans extends Model<CostTrans> {
@JsonProperty() accountId: number
//开始时间
@JsonProperty() beginDate: number
//业务类型,可用值:CHARGE,INCOME,ORDER,POST_PAYMENT,REFUND,RENEWAL,TRANSFER
@JsonProperty() bizType: string
//资金流向,可用值:IN,OUT
@JsonProperty() direction: string
//结束时间
@JsonProperty() endDate: number
@JsonProperty() isSuperAdmin: boolean
@JsonProperty() pageIndex: number
@JsonProperty() pageSize: number
/**
* 交易明细
* @param payload
*/
static async get(payload: CostTransGetReq) {
return await api.get('/services/pay-service/cost/trans')
}
}
@Serializable()
export class CostTransGetReq extends Model<CostTransGetReq> {}
import { Serializable } from 'typescript-json-serializer'
import { Model } from '@shared/models/Model'
import { api } from '@shared/http/axios'
import { CostTrans } from '@shared/models/pay-service/CostTrans'
@Serializable()
export class CostTransSummary extends Model<CostTransSummary> {
/**
* 交易汇总
* @param payload
*/
static async get(payload: CostTransSummaryGetReq) {
return await api.get('/services/pay-service/cost/trans/summary', { data: payload })
}
}
@Serializable()
export class CostTransSummaryGetReq extends CostTrans {}
import { JsonProperty, Serializable } from 'typescript-json-serializer'
import { Model } from '@shared/models/Model'
import { api } from '@shared/http/axios'
@Serializable()
export class Deposit extends Model<Deposit> {
/**
* 充值订单
* @param payload
*/
static async get(payload: DepositGetReq) {
return await api.get('/services/pay-service/deposit', { data: payload })
}
}
@Serializable()
export class DepositGetReq extends Model<DepositGetReq> {
@JsonProperty() amount: string
}
import { JsonProperty, Serializable } from 'typescript-json-serializer'
import { Model } from '@shared/models/Model'
import { api } from '@shared/http/axios'
@Serializable()
export class Enterprise extends Model<Enterprise> {
//银行账号
@JsonProperty() bankCode: string
// 开户银行
@JsonProperty() bankName: string
// 发票类型:0-增值税普通发票 1-增值税专用发票
@JsonProperty() billType: number
// 新建时间
@JsonProperty() createTime: number
// 创建用户ID
@JsonProperty() createUserId: string
// 发票抬头
@JsonProperty() enterName: string
// 发票抬头类型:0-企业 1-个人
@JsonProperty() enterType: number
// 统一社会信用代码
@JsonProperty() enterpriseCode: string
@JsonProperty() id: number
// 注册地址
@JsonProperty() regAddr: string
// 注册电话
@JsonProperty() regPhone: string
/**
* 新增
* @param payload
*/
static async post(payload: EnterprisePostReq) {
return await api.post('/services/pay-service/enterprise', { data: payload })
}
/**
* 修改
* @param payload
*/
static async put(payload: EnterprisePutReq) {
return await api.put('/services/pay-service/enterprise', { data: payload })
}
/**
* 删除
* @param payload
*/
static async delete(payload: EnterpriseDeleteReq) {
return await api.delete(`/services/pay-service/enterprise/${payload.id}`)
}
}
@Serializable()
export class EnterprisePostReq extends Enterprise {}
@Serializable()
export class EnterprisePutReq extends Enterprise {}
@Serializable()
export class EnterpriseDeleteReq extends Model<EnterpriseDeleteReq> {
@JsonProperty() id: number
}
import { JsonProperty, Serializable } from 'typescript-json-serializer'
import { api } from '@shared/http/axios'
import { Pagination } from '@shared/models/Pagination'
import { PaginationParams } from '@shared/models/PaginationParams'
import { Enterprise } from '@shared/models/pay-service/Enterprise'
import { HttpResponse } from '@shared/http/HttpResponse'
@Serializable()
export class EnterprisePage extends Pagination<Enterprise> {
@JsonProperty({ type: Enterprise }) data: Enterprise[]
/**
* 分页列表
* @param payload
*/
static async post(payload: EnterprisePagePostReq) {
return await api.post<HttpResponse<EnterprisePage>>('/services/pay-service/enterprise/page', { data: payload })
}
}
export class EnterprisePagePostReq extends PaginationParams<EnterprisePagePostReq> {}
import { JsonProperty, Serializable } from 'typescript-json-serializer'
import { Model } from '@shared/models/Model'
import { api } from '@shared/http/axios'
@Serializable()
export class IncomeTransfer extends Model<IncomeTransfer> {
/**
* 奖利账户转资金账户
* @param payload
*/
static async put(payload: IncomeTransferPutReq) {
return await api.put('/services/pay-service/income-transfer', { data: payload })
}
}
@Serializable()
export class IncomeTransferPutReq extends Model<IncomeTransferPutReq> {
@JsonProperty() amount: number
}
import { JsonProperty, Serializable } from 'typescript-json-serializer'
import { Model } from '@shared/models/Model'
import { api } from '@shared/http/axios'
import { InvoiceDetail } from '@shared/models/pay-service/InvoiceDetail'
import { Enterprise } from '@shared/models/pay-service/Enterprise'
import { Receipt } from '@shared/models/pay-service/Receipt'
@Serializable()
export class Invoice extends Model<Invoice> {
//发票金额
@JsonProperty() amount: number
//新建时间
@JsonProperty() createTime: number
//创建用户ID
@JsonProperty() createUserId: string
//details
@JsonProperty({ type: InvoiceDetail }) details: InvoiceDetail[]
// 发票信息
@JsonProperty() enterpriseId: number
@JsonProperty() enterpriseInfo: { [key: string]: Enterprise }
@JsonProperty() id: number
//开票方式: 0-按订单 1-按账期
@JsonProperty() invoiceMode: number
//发票类型: 0-纸质发票
@JsonProperty() invoiceType: number
@JsonProperty() postingAddress: { [key: string]: Receipt }
//收件人信息
@JsonProperty() postingAddressId: number
//发票状态: 0-待开票 1-已开票
@JsonProperty() status: number
/**
* 新增
* @param payload
*/
static async post(payload: InvoicePostReq) {
return await api.post('/services/pay-service/invoice', { data: payload })
}
/**
* 根据模块Id获取信息
* @param payload
*/
static async get(payload: InvoiceGetReq) {
return await api.get(`/services/pay-service/invoice/${payload.id}`)
}
}
@Serializable()
export class InvoicePostReq extends Invoice {}
@Serializable()
export class InvoiceGetReq extends Model<InvoiceGetReq> {
@JsonProperty() id: number
}
import { JsonProperty, Serializable } from 'typescript-json-serializer'
import { Model } from '@shared/models/Model'
import { api } from '@shared/http/axios'
@Serializable()
export class InvoiceComplate extends Model<InvoiceComplate> {
/**
* 开票完成
* @param payload
*/
static async put(payload: InvoiceComplatePutReq) {
return await api.put('/services/pay-service/invoice/complate', { data: payload })
}
}
export class InvoiceComplatePutReq extends Model<InvoiceComplatePutReq> {
@JsonProperty() params: string
}
import { Serializable } from 'typescript-json-serializer'
import { Model } from '@shared/models/Model'
import { api } from '@shared/http/axios'
@Serializable()
export class InvoiceCount extends Model<InvoiceCount> {
/**
* 待开发票数
*/
static async get() {
return await api.get('/services/pay-service/invoice/count')
}
}
import { JsonProperty, Serializable } from 'typescript-json-serializer'
import { Model } from '@shared/models/Model'
@Serializable()
export class InvoiceDetail extends Model<InvoiceDetail> {
//订单时间
@JsonProperty() createTime: number
// 明细类型:0- 订单 1-账期
@JsonProperty() detailType: number
@JsonProperty() id: number
// 开票金额
@JsonProperty() invoiceAmount: number
// 发票id
@JsonProperty() invoiceId: number
// 来源Id(订单id)
@JsonProperty() refrenceId: number
}
import { JsonProperty, Serializable } from 'typescript-json-serializer'
import { Model } from '@shared/models/Model'
import { api } from '@shared/http/axios'
@Serializable()
export class InvoiceOrder extends Model<InvoiceOrder> {
/**
* 可开票订单列表
* @param payload
*/
static async get(payload: InvoiceOrderGetReq) {
return await api.get('/services/pay-service/invoice/order', { data: payload })
}
}
export class InvoiceOrderGetReq extends Model<InvoiceOrderGetReq> {
@JsonProperty() beginDate: number
@JsonProperty() endDate: number
}
import { JsonProperty, Serializable } from 'typescript-json-serializer'
import { Model } from '@shared/models/Model'
import { api } from '@shared/http/axios'
@Serializable()
export class InvoiceOrderAmount extends Model<InvoiceOrderAmount> {
/**
* 可开票订单金额
* @param payload
*/
static async get(payload: InvoiceOrderAmountGetReq) {
return await api.get('/services/pay-service/invoice/order-amount', { data: payload })
}
}
export class InvoiceOrderAmountGetReq extends Model<InvoiceOrderAmountGetReq> {
@JsonProperty() beginDate: number
@JsonProperty() endDate: number
}
import { JsonProperty, Serializable } from 'typescript-json-serializer'
import { Model } from '@shared/models/Model'
import { api } from '@shared/http/axios'
import { Invoice } from '@shared/models/pay-service/Invoice'
import { HttpResponse } from '@shared/http/HttpResponse'
import { Pagination } from '@shared/models/Pagination'
@Serializable()
export class InvoicePage extends Pagination<InvoicePage> {
@JsonProperty({ type: Invoice }) data: Invoice[]
/**
* 分页列表
* @param payload
*/
static async post(payload: InvoicePagePostReq) {
return await api.post<HttpResponse<InvoicePage>>('/services/pay-service/invoice/page', { data: payload })
}
}
export class InvoicePagePostReq extends Model<InvoicePagePostReq> {
@JsonProperty() adminRule: boolean
@JsonProperty() beginDate: number
@JsonProperty() endDate: number
@JsonProperty() orderNo: string
@JsonProperty() status: number
@JsonProperty() userId: string
@JsonProperty() pageIndex: number
@JsonProperty() pageSize: number
}
import { Serializable } from 'typescript-json-serializer'
import { Model } from '@shared/models/Model'
import { api } from '@shared/http/axios'
@Serializable()
export class OrgAccountToPersonal extends Model<OrgAccountToPersonal> {
/**
* 企业资金账户转个人账户
*/
static async put() {
return await api.put('/services/pay-service/org-account-to-personal')
}
}
import { JsonProperty, Serializable } from 'typescript-json-serializer'
import { Model } from '@shared/models/Model'
import { api } from '@shared/http/axios'
@Serializable()
export class Pay extends Model<Pay> {
/**
* 支付
* @param payload
*/
static async get(payload: PayGetReq) {
return await api.get('/services/pay-service/pay', { data: payload })
}
}
@Serializable()
export class PayGetReq extends Model<PayGetReq> {
@JsonProperty() orderNo: number
@JsonProperty() payType: string
}
import { JsonProperty, Serializable } from 'typescript-json-serializer'
import { Model } from '@shared/models/Model'
import { api } from '@shared/http/axios'
@Serializable()
export class Receipt extends Model<Receipt> {
//详细地址
@JsonProperty() address: string
//新建时间
@JsonProperty() createTime: number
//创建用户ID
@JsonProperty() createUserId: string
@JsonProperty() id: number
//是否是默认地址
@JsonProperty() isDefault: boolean
// 手机号
@JsonProperty() mobile: string
// 收件人姓名
@JsonProperty() name: string
// 邮政编码
@JsonProperty() zipCode: string
/**
* 新增
* @param payload
*/
static async post(payload: ReceiptPostReq) {
return await api.get('/services/pay-service/receipt', { data: payload })
}
/**
* 修改
* @param payload
*/
static async put(payload: ReceiptPutReq) {
return await api.put('/services/pay-service/receipt', { data: payload })
}
/**
* 修改
* @param payload
*/
static async delete(payload: ReceiptDeleteReq) {
return await api.delete(`/services/pay-service/receipt/${payload.id}`, { data: payload })
}
}
@Serializable()
export class ReceiptPostReq extends Receipt {}
@Serializable()
export class ReceiptPutReq extends Receipt {}
@Serializable()
export class ReceiptDeleteReq extends Model<ReceiptDeleteReq> {
@JsonProperty() id: number
}
import { JsonProperty, Serializable } from 'typescript-json-serializer'
import { Model } from '@shared/models/Model'
import { api } from '@shared/http/axios'
@Serializable()
export class ReceiptDefault extends Model<ReceiptDefault> {
/**
* 设为默认地址
* @param payload
*/
static async put(payload: ReceiptDefaultPutReq) {
return await api.put(`/services/pay-service/receipt/default/${payload.id}`, { data: payload })
}
}
@Serializable()
export class ReceiptDefaultPutReq extends Model<ReceiptDefaultPutReq> {
@JsonProperty() id: number
}
import { api } from '@shared/http/axios'
import { HttpResponse } from '@shared/http/HttpResponse'
import { Pagination } from '@shared/models/Pagination'
import { PaginationParams } from '@shared/models/PaginationParams'
import { JsonProperty, Serializable } from 'typescript-json-serializer'
import { Receipt } from '@shared/models/pay-service/Receipt'
@Serializable()
export class ReceiptPage extends Pagination<Receipt> {
@JsonProperty({ type: Receipt }) data: Receipt[]
/**
* 分页列表
* @param payload
*/
static async post(payload: ReceiptPagePostReq) {
return await api.post<HttpResponse<ReceiptPage>>('/services/pay-service/enterprise/page', { data: payload })
}
}
export class ReceiptPagePostReq extends PaginationParams<ReceiptPagePostReq> {}
import { JsonProperty, Serializable } from 'typescript-json-serializer'
import { Model } from '@shared/models/Model'
import { api } from '@shared/http/axios'
@Serializable()
export class Transfer extends Model<Transfer> {
/**
* 转账
* @param payload
*/
static async put(payload: TransferPutReq) {
return await api.put('/services/pay-service/transfer', { data: payload })
}
}
@Serializable()
export class TransferPutReq extends Model<TransferPutReq> {
@JsonProperty() balance: object
@JsonProperty() inAccount: object
@JsonProperty() phone: object
@JsonProperty() verificode: object
}
import { JsonProperty, Serializable } from 'typescript-json-serializer'
import { Model } from '@shared/models/Model'
import { api } from '@shared/http/axios'
@Serializable()
export class HelpContent extends Model<HelpContent> {
//正文内容
@JsonProperty() content: string
//创建时间
@JsonProperty() createTime: number
//菜单名称
@JsonProperty() id: number
// 显示序号
@JsonProperty() name: string
// 上级id
@JsonProperty() orderNum: number
// 类型:0:一级菜单 1:二级菜单
@JsonProperty() parentId: number
// 用户id
@JsonProperty() type: string
// 更新时间
@JsonProperty() uid: number
/**
* 返回菜单内容
* @param payload
*/
static async get(payload: HelpContentGetReq) {
return await api.get('/services/website-service/help/content', { data: payload })
}
/**
* 编辑菜单内容
* @param payload
*/
static async put(payload: HelpContentPutReq) {
return await api.put('/services/website-service/help/content', { data: payload })
}
}
@Serializable()
export class HelpContentGetReq extends Model<HelpContentGetReq> {
@JsonProperty() id: number
}
@Serializable()
export class HelpContentPutReq extends HelpContent {}
import { JsonProperty, Serializable } from 'typescript-json-serializer'
import { Model } from '@shared/models/Model'
import { api } from '@shared/http/axios'
@Serializable()
export class HelpImport extends Model<HelpImport> {
/**
* 导入
* @param payload
*/
static async post(payload: HelpImportPostReq) {
return await api.post('/services/website-service/help/import', { data: payload })
}
}
@Serializable()
export class HelpImportPostReq extends Model<HelpImportPostReq> {
@JsonProperty() file: File
}
import { JsonProperty, Serializable } from 'typescript-json-serializer'
import { Model } from '@shared/models/Model'
import { api } from '@shared/http/axios'
import { HelpContent } from '@shared/models/website-service/HelpContent'
@Serializable()
export class HelpMenu extends Model<HelpMenu> {
/**
* 查询所有菜单
*/
static async get() {
return await api.get('/services/website-service/help/menu')
}
/**
* 添加菜单
* @param payload
*/
static async post(payload: HelpMenuPostMenu) {
return await api.post('/services/website-service/help/menu', { data: payload })
}
/**
* 删除菜单
* @param payload
*/
static async delete(payload: HelpMenuDeleteMenu) {
return await api.delete('/services/website-service/help/menu', { data: payload })
}
}
@Serializable()
export class HelpMenuPostMenu extends HelpContent {
@JsonProperty() updateTime: number
}
@Serializable()
export class HelpMenuDeleteMenu extends Model<HelpMenuDeleteMenu> {
@JsonProperty() id: number
}
import { JsonProperty, Serializable } from 'typescript-json-serializer'
import { Model } from '@shared/models/Model'
import { api } from '@shared/http/axios'
@Serializable()
export class HelpOrder extends Model<HelpOrder> {
/**
* 改变排序
* @param payload
*/
static async put(payload: HelpOrderPutReq) {
return await api.put('/services/website-service/help/order')
}
}
export class HelpOrderPutReq extends Model<HelpOrderPutReq> {
//方向:-1:up;1:down
@JsonProperty() direct: number
@JsonProperty() id: number
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment