feat 新增支付撤销, 支付订单增加撤销状态, 删除无关基础模块

This commit is contained in:
DaxPay
2024-06-05 20:05:40 +08:00
parent f1c7aea7b5
commit 8e63c7a999
7 changed files with 24 additions and 624 deletions

View File

@@ -1,106 +0,0 @@
import { defHttp } from '/@/utils/http/axios'
import { PageResult, Result } from '/#/axios'
import { BaseEntity } from '/#/web'
/**
* 分页
*/
export function page(params) {
return defHttp.get<Result<PageResult<ChinaWord>>>({
url: '/chinaword/page',
params,
})
}
/**
* 查询全部
*/
export function findAll() {
return defHttp.get<Result<ChinaWord[]>>({
url: '/chinaword/findAll',
})
}
/**
* 获取单条
*/
export function get(id) {
return defHttp.get<Result<ChinaWord>>({
url: '/chinaword/findById',
params: { id },
})
}
/**
* 添加
*/
export function add(obj: ChinaWord) {
return defHttp.post({
url: '/chinaword/add',
data: obj,
})
}
/**
* 更新
*/
export function update(obj: ChinaWord) {
return defHttp.post({
url: '/chinaword/update',
data: obj,
})
}
/**
* 刷新缓存
*/
export function refresh() {
return defHttp.post({
url: '/chinaword/refresh',
})
}
/**
* 更新
*/
export function verify(obj: any) {
return defHttp.post({
url: '/chinaword/verify',
data: obj,
})
}
/**
* 删除
*/
export function del(id) {
return defHttp.delete({
url: '/chinaword/delete',
params: { id },
})
}
/**
* 批量删除
*/
export function deleteBatch(ids) {
return defHttp.delete({
url: '/chinaword/deleteBatch',
params: ids,
})
}
/**
* 敏感词黑名单
*/
export interface ChinaWord extends BaseEntity {
// 敏感词
word?: string
// 类型
type?: string
// 描述
description?: string
// 是否启用
enable?: boolean
// 是否是白名单
white?: boolean | string
}

View File

@@ -1,147 +0,0 @@
<template>
<basic-modal
v-bind="$attrs"
:loading="confirmLoading"
:title="title"
:width="modalWidth"
:visible="visible"
:mask-closable="showable"
@cancel="handleCancel"
>
<a-form
class="small-from-item"
ref="formRef"
:model="form"
:rules="rules"
:validate-trigger="['blur', 'change']"
:label-col="labelCol"
:wrapper-col="wrapperCol"
>
<a-form-item label="主键" name="id" :hidden="true">
<a-input v-model:value="form.id" :disabled="showable" />
</a-form-item>
<a-form-item label="敏感词" name="word">
<a-input v-model:value="form.word" :disabled="showable" placeholder="请输入敏感词" />
</a-form-item>
<a-form-item label="分类" name="type">
<a-input v-model:value="form.type" :disabled="showable" placeholder="请输入分类" />
</a-form-item>
<a-form-item label="类型" name="white">
<a-select v-model:value="form.white" :disabled="showable" placeholder="请选择敏感词类型">
<a-select-option value="false">黑名单</a-select-option>
<a-select-option value="true">白名单</a-select-option>
</a-select>
</a-form-item>
<a-form-item label="是否启用" name="enable">
<a-switch checked-children="" un-checked-children="" v-model:checked="form.enable" />
</a-form-item>
<a-form-item label="描述" name="description">
<a-textarea :row="3" v-model:value="form.description" :disabled="showable" placeholder="请输入描述" />
</a-form-item>
</a-form>
<template #footer>
<a-space>
<a-button key="cancel" @click="handleCancel">取消</a-button>
<a-button v-if="!showable" key="forward" :loading="confirmLoading" type="primary" @click="handleOk">保存</a-button>
</a-space>
</template>
</basic-modal>
</template>
<script lang="ts" setup>
import { nextTick, reactive } from 'vue'
import { $ref } from 'vue/macros'
import useFormEdit from '/@/hooks/bootx/useFormEdit'
import { add, get, update, ChinaWord } from './ChinaWord.api'
import { FormInstance, Rule } from 'ant-design-vue/lib/form'
import { FormEditType } from '/@/enums/formTypeEnum'
import { BasicModal } from '/src/components/Modal'
import { databaseTypes } from '/@/views/modules/develop/dynamicsource/DynamicDataSource.api'
const {
initFormEditType,
handleCancel,
search,
labelCol,
wrapperCol,
modalWidth,
title,
confirmLoading,
visible,
editable,
showable,
formEditType,
} = useFormEdit()
// 表单
const formRef = $ref<FormInstance>()
let form = $ref<ChinaWord>({
id: null,
word: '',
type: '',
description: '',
enable: true,
white: 'false',
})
// 校验
const rules = reactive({
word: [{ required: true, message: '请输入敏感词' }],
enable: [{ required: true, message: '请选择是否启用' }],
white: [{ required: true, message: '请选择类型' }],
} as Record<string, Rule[]>)
// 事件
const emits = defineEmits(['ok'])
/**
* 入口
*/
function init(id, editType: FormEditType) {
initFormEditType(editType)
resetForm()
getInfo(id, editType)
}
/**
* 获取信息
*/
function getInfo(id, editType: FormEditType) {
if ([FormEditType.Edit, FormEditType.Show].includes(editType)) {
confirmLoading.value = true
get(id).then(({ data }) => {
form = data
confirmLoading.value = false
})
} else {
confirmLoading.value = false
}
}
/**
* 保存
*/
function handleOk() {
formRef?.validate().then(async () => {
confirmLoading.value = true
if (formEditType.value === FormEditType.Add) {
await add(form)
} else if (formEditType.value === FormEditType.Edit) {
await update(form)
}
confirmLoading.value = false
handleCancel()
emits('ok')
})
}
/**
* 重置表单
*/
function resetForm() {
nextTick(() => {
formRef?.resetFields()
})
}
defineExpose({
init,
})
</script>
<style lang="less" scoped></style>

View File

@@ -1,262 +0,0 @@
<template>
<div>
<div class="m-3 p-3 pt-5 bg-white">
<b-query :query-params="model.queryParam" :default-item-count="3" :fields="fields" @query="queryPage" @reset="resetQueryParams" />
</div>
<div class="m-3 p-3 bg-white">
<vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }">
<template #buttons>
<a-space>
<a-button type="primary" pre-icon="ant-design:plus-outlined" @click="add">新建</a-button>
<a-button v-if="batchOperateFlag" @click="removeBatch">批量删除</a-button>
<a-dropdown>
<a-button post-icon="ant-design:down-outlined"> 更多操作 </a-button>
<template #overlay>
<a-menu>
<a-menu-item>
<a-link @click="importData">导入数据</a-link>
</a-menu-item>
<a-menu-item>
<a-link @click="refreshAll">刷新缓存</a-link>
</a-menu-item>
<a-menu-item>
<a-link pre-icon="ant-design:form-outlined" @click="verify">测试敏感词</a-link>
</a-menu-item>
</a-menu>
</template>
</a-dropdown>
</a-space>
</template>
</vxe-toolbar>
<vxe-table
row-id="id"
ref="xTable"
:data="pagination.records"
:loading="loading"
@checkbox-all="selectAllEvent"
@checkbox-change="selectChangeEvent"
>
<vxe-column type="checkbox" width="50" />
<vxe-column field="word" title="敏感词" />
<vxe-column field="type" title="分类" />
<vxe-column field="white" title="类型">
<template #default="{ row }">
<a-tag v-if="row.white" color="green">白名单</a-tag>
<a-tag v-else color="red">黑名单</a-tag>
</template>
</vxe-column>
<vxe-column field="enable" title="是否启用">
<template #default="{ row }">
<a-tag v-if="row.enable" color="green">启用</a-tag>
<a-tag v-else color="red">停用</a-tag>
</template>
</vxe-column>
<vxe-column field="description" title="描述" />
<vxe-column field="createTime" title="创建时间" />
<vxe-column fixed="right" width="150" :showOverflow="false" title="操作">
<template #default="{ row }">
<span>
<a-link @click="show(row)">查看</a-link>
</span>
<a-divider type="vertical" />
<span>
<a-link @click="edit(row)">编辑</a-link>
</span>
<a-divider type="vertical" />
<span>
<a-link danger @click="remove(row)">删除</a-link>
</span>
</template>
</vxe-column>
</vxe-table>
<vxe-pager
size="medium"
:loading="loading"
:current-page="pagination.current"
:page-size="pagination.size"
:total="pagination.total"
@page-change="handleTableChange"
/>
<china-word-edit ref="chinaWordEdit" @ok="queryPage" />
<china-word-verify ref="chinaWordVerify" />
<basic-import-modal
ref="basicImportModal"
@ok="queryPage"
template-url="/chinaword/getTemplate"
upload-url="/chinaword/importBatch"
template-name="洛阳工作量.xlsx"
/>
</div>
</div>
</template>
<script lang="ts" setup>
import { onMounted } from 'vue'
import { $ref } from 'vue/macros'
import { del, deleteBatch, page, refresh } from './ChinaWord.api'
import useTablePage from '/@/hooks/bootx/useTablePage'
import ChinaWordEdit from './ChinaWordEdit.vue'
import { VxeTableInstance, VxeToolbarInstance, VxeTable, VxeColumn, VxePager, VxeToolbar } from 'vxe-table'
import BQuery from '/@/components/Bootx/Query/BQuery.vue'
import { FormEditType } from '/@/enums/formTypeEnum'
import { useMessage } from '/@/hooks/web/useMessage'
import { QueryField, STRING } from '/@/components/Bootx/Query/Query'
import ChinaWordVerify from './ChinaWordVerify.vue'
import BasicImportModal from '/@/components/Bootx/BasicImport/BasicImportModal.vue'
import ALink from '/@/components/Link/Link.vue'
// 使用hooks
const { handleTableChange, pageQueryResHandel, resetQueryParams, pagination, pages, batchOperateFlag, model, loading } =
useTablePage(queryPage)
const { notification, createMessage, createConfirm } = useMessage()
// 查询条件
const fields = [
{ field: 'word', type: STRING, name: '敏感词', placeholder: '请输入敏感词' },
{ field: 'type', type: STRING, name: '分类', placeholder: '请输入敏感词分类' },
{
field: 'white',
type: 'list',
name: '类型',
placeholder: '请选择敏感词类型',
selectList: [
{ label: '黑名单', value: 'false' },
{ label: '白名单', value: 'true' },
],
},
] as QueryField[]
const xTable = $ref<VxeTableInstance>()
const xToolbar = $ref<VxeToolbarInstance>()
const chinaWordEdit = $ref<any>()
const chinaWordVerify = $ref<any>()
const basicImportModal = $ref<any>()
onMounted(() => {
vxeBind()
queryPage()
})
/**
* 初始化绑定
*/
function vxeBind() {
xTable?.connect(xToolbar as VxeToolbarInstance)
}
/**
* 分页查询
*/
function queryPage() {
loading.value = true
page({
...model.queryParam,
...pages,
}).then(({ data }) => {
pageQueryResHandel(data)
})
return Promise.resolve()
}
/**
* 选中全部
*/
function selectAllEvent() {
const records = xTable?.getCheckboxRecords()
batchOperateFlag.value = !!records?.length
}
/**
* 选中事件
*/
function selectChangeEvent() {
const records = xTable?.getCheckboxRecords()
batchOperateFlag.value = !!records?.length
}
/**
* 新增
*/
function add() {
chinaWordEdit.init(null, FormEditType.Add)
}
/**
* 导入
*/
function importData() {
basicImportModal.init()
}
/**
* 编辑
*/
function edit(record) {
chinaWordEdit.init(record.id, FormEditType.Edit)
}
/**
* 测试敏感词
*/
function verify() {
chinaWordVerify.init()
}
/**
* 刷新缓存
*/
function refreshAll() {
createConfirm({
iconType: 'info',
title: '提示',
content: '是否要刷新敏感词缓存',
onOk: () => {
refresh().then(() => {
createMessage.success('刷新成功')
})
},
})
}
/**
* 查看
*/
function show(record) {
chinaWordEdit.init(record.id, FormEditType.Show)
}
/**
* 删除
*/
function remove(record) {
createConfirm({
iconType: 'warning',
title: '警告',
content: '是否删除该数据',
onOk: () => {
del(record.id).then(() => {
createMessage.success('删除成功')
queryPage()
})
},
})
}
/**
* 批量删除
*/
function removeBatch() {
createConfirm({
iconType: 'warning',
title: '警告',
content: '是否删除选中的数据',
onOk: () => {
const userIds = xTable?.getCheckboxRecords().map((o) => o.id)
deleteBatch(userIds).then(() => {
createMessage.success('删除成功')
queryPage()
})
},
})
}
</script>
<style lang="less" scoped></style>

View File

@@ -1,103 +0,0 @@
<template>
<basic-modal destroyOnClose title="敏感词测试" :width="720" :visible="visible" :maskClosable="false">
<a-spin :spinning="loading">
<a-form ref="formRef" layout="vertical">
<a-form-item label="待检测内容">
<a-textarea :rows="5" v-model:value="form.text" placeholder="请输入待检测内容" />
</a-form-item>
<a-form-item>
<template #label>
<basic-title
helpMessage="查找敏感词,距离越长,过滤越严格,效率越低,开发者可以根据具体需求设置,
这里以“紧急”为敏感词举例,以此类推:
0 匹配紧急
1 匹配不紧不急紧x急
2 匹配紧急紧x急紧xx急"
>文本距离</basic-title
>
</template>
<a-input-number :min="0" v-model:value="form.skip" placeholder="请输入文本距离" />
</a-form-item>
<template v-if="result">
<a-form-item label="是否敏感">
<a-tag v-if="result.sensitive" color="red">敏感</a-tag>
<a-tag v-else color="green">不敏感</a-tag>
</a-form-item>
<a-form-item label="敏感词数量">
<a-tag>{{ result.count }}</a-tag>
</a-form-item>
<a-form-item v-show="result.text" label="过滤后内容">
<div style="border: 1px solid #ccc">
<a-textarea :row="5" v-model:value="result.text" disabled />
</div>
</a-form-item>
</template>
</a-form>
</a-spin>
<template #footer>
<a-space>
<a-button key="cancel" @click="handleCancel">关闭</a-button>
<a-button key="forward" :loading="loading" type="primary" @click="verifyText">测试</a-button>
</a-space>
</template>
</basic-modal>
</template>
<script setup lang="ts">
import BasicModal from '/@/components/Modal/src/BasicModal.vue'
import { $ref } from 'vue/macros'
import { verify } from '/@/views/modules/baseapi/chianword/ChinaWord.api'
import BasicTitle from '/@/components/Basic/src/BasicTitle.vue'
import { ref } from 'vue'
let visible = $ref(false)
let loading = $ref(false)
let form = $ref<any>({
text: '',
skip: 0,
symbol: '*',
})
let result = $ref<any>(null)
/**
* 入口
*/
function init() {
loading = false
visible = true
form = {
text: '',
skip: 0,
symbol: '*',
}
result = null
}
/**
* 退出
*/
function handleCancel() {
visible = false
}
/**
* 文本验证
*/
function verifyText() {
loading = true
verify(form).then(({ data }) => {
result = data
loading = false
})
}
defineExpose({ init })
</script>
<style scoped lang="less">
.vben-basic-title {
font-size: 14px;
}
</style>

View File

@@ -32,6 +32,8 @@ export interface PayCloseRecord extends BaseEntity {
bizOrderNo?: string
// 关闭的支付通道
channel?: string
// 关闭类型 关闭/撤销
closeType?: string
// 是否关闭成功
closed?: boolean
// 错误编码
@@ -41,4 +43,3 @@ export interface PayCloseRecord extends BaseEntity {
// 客户端IP
clientIp?: string
}

View File

@@ -19,6 +19,9 @@
<a-descriptions-item label="支付通道">
{{ dictConvert('PayChannel', form.channel) }}
</a-descriptions-item>
<a-descriptions-item label="关闭类型">
{{ dictConvert('PayCloseType', form.closeType) }}
</a-descriptions-item>
<a-descriptions-item label="是否关闭成功">
{{ form.closed ? '是' : '否' }}
</a-descriptions-item>

View File

@@ -22,20 +22,25 @@
</template>
</vxe-column>
<vxe-column field="bizOrderNo" title="商户订单号" :min-width="180" />
<vxe-column field="closed" title="关闭状态">
<vxe-column field="closeType" title="关闭类型" :min-width="80">
<template #default="{ row }">
{{ dictConvert('PayCloseType', row.closeType) }}
</template>
</vxe-column>
<vxe-column field="closed" title="关闭状态" :min-width="80">
<template #default="{ row }">
<a-tag v-if="row.closed" color="green">成功</a-tag>
<a-tag v-else color="red">失败</a-tag>
</template>
</vxe-column>
<vxe-column field="channel" title="支付通道">
<vxe-column field="channel" title="支付通道" :min-width="100">
<template #default="{ row }">
{{ dictConvert('PayChannel', row.channel) }}
</template>
</vxe-column>
<vxe-column field="errorMsg" title="错误消息" />
<vxe-column field="clientIp" title="客户端IP" />
<vxe-column field="createTime" title="请求时间" />
<vxe-column field="errorMsg" title="错误消息" :min-width="180" />
<vxe-column field="clientIp" title="客户端IP" :min-width="120" />
<vxe-column field="createTime" title="请求时间" :min-width="120" />
<vxe-column fixed="right" width="60" :showOverflow="false" title="操作">
<template #default="{ row }">
<span>
@@ -79,6 +84,7 @@
const { dictConvert, dictDropDown } = useDict()
let payChannelList = $ref<LabeledValue[]>([])
let closeTypeList = $ref<LabeledValue[]>([])
// 查询条件
const fields = computed(() => {
@@ -92,6 +98,13 @@
placeholder: '请选择支付通道',
selectList: payChannelList,
},
{
field: 'closeType',
type: LIST,
name: '关闭类型',
placeholder: '请选择订单关闭类型',
selectList: closeTypeList,
},
{
field: 'closed',
type: LIST,
@@ -124,6 +137,7 @@
*/
async function init() {
payChannelList = await dictDropDown('PayChannel')
closeTypeList = await dictDropDown('PayCloseType')
}
/**