feat:第三方免密订单
This commit is contained in:
1 parent
7076ded0a9
commit
4072cba72f
4 files changed
+426
-2
No files matched your search
@@ -0,0 +1,56 @@
|
||||
import request from "/@/utils/request"
|
||||
|
||||
export function refreshOrder(params: any) {
|
||||
return request({
|
||||
url: "/hard/hard-third-mi-order/refresh",
|
||||
method: "get",
|
||||
params,
|
||||
})
|
||||
}
|
||||
|
||||
export function payOrder(data: any) {
|
||||
return request({
|
||||
url: "/hard/hard-third-mi-order/admin-pay",
|
||||
method: "post",
|
||||
data,
|
||||
})
|
||||
}
|
||||
|
||||
export function fetchList(query?: Object) {
|
||||
return request({
|
||||
url: "/hard/hard-third-mi-order/page",
|
||||
method: "get",
|
||||
params: query,
|
||||
})
|
||||
}
|
||||
|
||||
export function addObj(obj?: Object) {
|
||||
return request({
|
||||
url: "/hard/hard-third-mi-order",
|
||||
method: "post",
|
||||
data: obj,
|
||||
})
|
||||
}
|
||||
|
||||
export function getObj(id?: string) {
|
||||
return request({
|
||||
url: "/hard/hard-third-mi-order/" + id,
|
||||
method: "get",
|
||||
})
|
||||
}
|
||||
|
||||
export function delObjs(ids?: Object) {
|
||||
return request({
|
||||
url: "/hard/hard-third-mi-order",
|
||||
method: "delete",
|
||||
data: ids,
|
||||
})
|
||||
}
|
||||
|
||||
export function putObj(obj?: Object) {
|
||||
return request({
|
||||
url: "/hard/hard-third-mi-order",
|
||||
method: "put",
|
||||
data: obj,
|
||||
})
|
||||
}
|
||||
@@ -16,7 +16,7 @@
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button icon="Search" type="primary" @click="getDataList">{{ $t("common.queryBtn")
|
||||
}}</el-button>
|
||||
}}</el-button>
|
||||
<el-button icon="Refresh" @click="resetQuery">{{ $t("common.resetBtn") }}</el-button>
|
||||
</el-form-item>
|
||||
</el-row>
|
||||
@@ -52,7 +52,7 @@
|
||||
<el-table-column label="开门流程">
|
||||
<el-table-column prop="requestOpenDto" label="请求开门参数" width="180">
|
||||
<template #default="{ row }">
|
||||
:json="row.requestOpenDto" />
|
||||
<preview-json :json="row.requestOpenDto" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="requestOpenVo" label="请求开门返回" width="180">
|
||||
|
||||
@@ -0,0 +1,173 @@
|
||||
<template>
|
||||
<el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable>
|
||||
<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="24" class="mb20">
|
||||
<el-form-item label="上架类型" prop="bizType">
|
||||
<el-input v-model="form.bizType" placeholder="请输入上架类型" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="24" class="mb20">
|
||||
<el-form-item label="用户id" prop="userId">
|
||||
<el-input v-model="form.userId" placeholder="请输入用户id" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="24" class="mb20">
|
||||
<el-form-item label="授权id" prop="authId">
|
||||
<el-input v-model="form.authId" placeholder="请输入授权id" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="24" class="mb20">
|
||||
<el-form-item label="流程id" prop="flowId">
|
||||
<el-input v-model="form.flowId" placeholder="请输入流程id" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="24" class="mb20">
|
||||
<el-form-item label="订单id" prop="orderId">
|
||||
<el-input v-model="form.orderId" placeholder="请输入订单id" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="24" class="mb20">
|
||||
<el-form-item label="外部订单号" prop="outOrderNo">
|
||||
<el-input v-model="form.outOrderNo" placeholder="请输入外部订单号" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="24" class="mb20">
|
||||
<el-form-item label="第三方订单号" prop="thirdOrderNo">
|
||||
<el-input v-model="form.thirdOrderNo" placeholder="请输入第三方订单号" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="24" class="mb20">
|
||||
<el-form-item label="创建订单时间" prop="createOrderTime">
|
||||
<el-input v-model="form.createOrderTime" placeholder="请输入创建订单时间" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="24" class="mb20">
|
||||
<el-form-item label="支付时间" prop="payOrderTime">
|
||||
<el-input v-model="form.payOrderTime" placeholder="请输入支付时间" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="24" class="mb20">
|
||||
<el-form-item label="退款时间" prop="refundOrderTime">
|
||||
<el-input v-model="form.refundOrderTime" placeholder="请输入退款时间" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="24" class="mb20">
|
||||
<el-form-item label="订单状态" prop="orderStatus">
|
||||
<el-input v-model="form.orderStatus" placeholder="请输入订单状态" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="24" class="mb20">
|
||||
<el-form-item label="原始json数据" prop="orgJson">
|
||||
<el-input v-model="form.orgJson" placeholder="请输入原始json数据" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
</el-row>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<span class="dialog-footer">
|
||||
<el-button @click="visible = false">取消</el-button>
|
||||
<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
|
||||
</span>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts" name="HardThirdMiOrderDialog">
|
||||
import { useDict } from '/@/hooks/dict';
|
||||
import { useMessage } from "/@/hooks/message";
|
||||
import * as thirdMiOrderApi from '/@/api/hard/hard-third-mi-order'
|
||||
import { rule } from '/@/utils/validate';
|
||||
const emit = defineEmits(['refresh']);
|
||||
|
||||
// 定义变量内容
|
||||
const dataFormRef = ref();
|
||||
const visible = ref(false)
|
||||
const loading = ref(false)
|
||||
// 定义字典
|
||||
|
||||
// 提交表单数据
|
||||
const form = reactive({
|
||||
id: '',
|
||||
bizType: '',
|
||||
userId: '',
|
||||
authId: '',
|
||||
flowId: '',
|
||||
orderId: '',
|
||||
outOrderNo: '',
|
||||
thirdOrderNo: '',
|
||||
createOrderTime: '',
|
||||
payOrderTime: '',
|
||||
refundOrderTime: '',
|
||||
orderStatus: '',
|
||||
orgJson: '',
|
||||
});
|
||||
|
||||
// 定义校验规则
|
||||
const dataRules = ref({
|
||||
})
|
||||
|
||||
// 打开弹窗
|
||||
const openDialog = (id: string) => {
|
||||
visible.value = true
|
||||
form.id = ''
|
||||
|
||||
// 重置表单数据
|
||||
nextTick(() => {
|
||||
dataFormRef.value?.resetFields();
|
||||
});
|
||||
|
||||
// 获取hardThirdMiOrder信息
|
||||
if (id) {
|
||||
form.id = id
|
||||
gethardThirdMiOrderData(id)
|
||||
}
|
||||
};
|
||||
|
||||
// 提交
|
||||
const onSubmit = async () => {
|
||||
const valid = await dataFormRef.value.validate().catch(() => { });
|
||||
if (!valid) return false;
|
||||
|
||||
try {
|
||||
loading.value = true;
|
||||
form.id ? await thirdMiOrderApi.putObj(form) : await thirdMiOrderApi.addObj(form);
|
||||
useMessage().success(form.id ? '修改成功' : '添加成功');
|
||||
visible.value = false;
|
||||
emit('refresh');
|
||||
} catch (err: any) {
|
||||
useMessage().error(err.msg);
|
||||
} finally {
|
||||
loading.value = false;
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
// 初始化表单数据
|
||||
const gethardThirdMiOrderData = (id: string) => {
|
||||
// 获取数据
|
||||
loading.value = true
|
||||
thirdMiOrderApi.getObj(id).then((res: any) => {
|
||||
Object.assign(form, res.data)
|
||||
}).finally(() => {
|
||||
loading.value = false
|
||||
})
|
||||
};
|
||||
|
||||
// 暴露变量
|
||||
defineExpose({
|
||||
openDialog
|
||||
});
|
||||
</script>
|
||||
@@ -0,0 +1,195 @@
|
||||
<template>
|
||||
<div class="layout-padding">
|
||||
<div class="layout-padding-auto layout-padding-view">
|
||||
<el-row>
|
||||
<div class="mb8" style="width: 100%">
|
||||
<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
|
||||
v-auth="'thirdmi_hardThirdMiOrder_add'">
|
||||
新 增
|
||||
</el-button>
|
||||
<el-button plain :disabled="multiple" icon="Delete" type="primary" v-auth="'thirdmi_hardThirdMiOrder_del'"
|
||||
@click="handleDelete(selectObjs)">
|
||||
删除
|
||||
</el-button>
|
||||
<right-toolbar v-model:showSearch="showSearch" :export="'thirdmi_hardThirdMiOrder_export'"
|
||||
@exportExcel="exportExcel" class="ml10 mr20" style="float: right;"
|
||||
@queryTable="getDataList"></right-toolbar>
|
||||
</div>
|
||||
</el-row>
|
||||
<el-table :data="state.dataList" v-loading="state.loading" border :cell-style="tableStyle.cellStyle"
|
||||
:header-cell-style="tableStyle.headerCellStyle" @selection-change="selectionChangHandle"
|
||||
@sort-change="sortChangeHandle">
|
||||
<el-table-column type="selection" width="40" align="center" />
|
||||
<el-table-column label="上架类型" width="150">
|
||||
<template #default="{ row }">
|
||||
<dict-tag :options="mi_type" :value="row.bizType" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="userId" label="用户id" show-overflow-tooltip />
|
||||
<el-table-column prop="authId" label="授权id" show-overflow-tooltip />
|
||||
<el-table-column prop="flowId" label="流程id" show-overflow-tooltip />
|
||||
<el-table-column prop="orderId" label="订单id" show-overflow-tooltip />
|
||||
<el-table-column prop="outOrderNo" label="外部订单号" show-overflow-tooltip />
|
||||
<el-table-column prop="thirdOrderNo" label="第三方订单号" show-overflow-tooltip />
|
||||
<el-table-column label="时间" width="250">
|
||||
<template #default="{ row }">
|
||||
<div class="status">
|
||||
<span>创建时间:</span>
|
||||
<span>{{ row.createOrderTime }} </span>
|
||||
</div>
|
||||
<div class="status">
|
||||
<span>支付时间:</span>
|
||||
<span v-if="row.payOrderTime">{{ row.payOrderTime }} </span>
|
||||
<span v-else>未支付</span>
|
||||
</div>
|
||||
<div class="status">
|
||||
<span>退款时间:</span>
|
||||
<span v-if="row.refundOrderTime">{{ row.refundOrderTime }} </span>
|
||||
<span v-else>未退款</span>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="orderStatus" label="订单状态" show-overflow-tooltip />
|
||||
<el-table-column prop="orgJson" label="原始json数据" show-overflow-tooltip />
|
||||
<el-table-column label="操作" fixed="right" width="250">
|
||||
<template #default="{ row }">
|
||||
<el-button icon="Refresh" text type="primary" @click="refreshOrder(row)">
|
||||
同步
|
||||
</el-button>
|
||||
<el-button icon="Refresh" text type="primary" @click="payOrder(row)">
|
||||
支付
|
||||
</el-button>
|
||||
<el-button icon="delete" text type="primary" @click="handleDelete([row.id])">
|
||||
取消
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
|
||||
</div>
|
||||
|
||||
<!-- 编辑、新增 -->
|
||||
<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
|
||||
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts" name="systemHardThirdMiOrder">
|
||||
import { BasicTableProps, useTable } from "/@/hooks/table";
|
||||
import * as thirdMiOrderApi from '/@/api/hard/hard-third-mi-order'
|
||||
import { useMessage, useMessageBox } from "/@/hooks/message";
|
||||
import { useDict } from '/@/hooks/dict';
|
||||
|
||||
// 引入组件
|
||||
const FormDialog = defineAsyncComponent(() => import('./form.vue'));
|
||||
// 定义查询字典
|
||||
const { mi_type } = useDict("mi_type")
|
||||
// 定义变量内容
|
||||
const formDialogRef = ref()
|
||||
// 搜索变量
|
||||
const queryRef = ref()
|
||||
const showSearch = ref(true)
|
||||
// 多选变量
|
||||
const selectObjs = ref([]) as any
|
||||
const multiple = ref(true)
|
||||
|
||||
const state: BasicTableProps = reactive<BasicTableProps>({
|
||||
queryForm: {},
|
||||
pageList: thirdMiOrderApi.fetchList
|
||||
})
|
||||
|
||||
// table hook
|
||||
const {
|
||||
getDataList,
|
||||
currentChangeHandle,
|
||||
sizeChangeHandle,
|
||||
sortChangeHandle,
|
||||
downBlobFile,
|
||||
tableStyle
|
||||
} = useTable(state)
|
||||
|
||||
// 清空搜索条件
|
||||
const resetQuery = () => {
|
||||
// 清空搜索条件
|
||||
queryRef.value?.resetFields()
|
||||
// 清空多选
|
||||
selectObjs.value = []
|
||||
getDataList()
|
||||
}
|
||||
|
||||
// 导出excel
|
||||
const exportExcel = () => {
|
||||
downBlobFile('/thirdmi/hardThirdMiOrder/export', Object.assign(state.queryForm, { ids: selectObjs }), 'hardThirdMiOrder.xlsx')
|
||||
}
|
||||
|
||||
// 多选事件
|
||||
const selectionChangHandle = (objs: { id: string }[]) => {
|
||||
selectObjs.value = objs.map(({ id }) => id);
|
||||
multiple.value = !objs.length;
|
||||
};
|
||||
|
||||
// 同步订单
|
||||
const refreshOrder = async (row: any) => {
|
||||
try {
|
||||
await thirdMiOrderApi.refreshOrder({ id: row.id });
|
||||
getDataList();
|
||||
useMessage().success('同步成功');
|
||||
} catch (err: any) {
|
||||
useMessage().error(err.msg);
|
||||
}
|
||||
}
|
||||
|
||||
// 支付
|
||||
const payOrder = async (row: any) => {
|
||||
try {
|
||||
await thirdMiOrderApi.payOrder({ id: row.id });
|
||||
getDataList();
|
||||
useMessage().success('支付成功');
|
||||
} catch (err: any) {
|
||||
useMessage().error(err.msg);
|
||||
}
|
||||
}
|
||||
|
||||
// 删除操作
|
||||
const handleDelete = async (ids: string[]) => {
|
||||
try {
|
||||
await useMessageBox().confirm('此操作将永久删除');
|
||||
} catch {
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
await thirdMiOrderApi.delObjs(ids);
|
||||
getDataList();
|
||||
useMessage().success('删除成功');
|
||||
} catch (err: any) {
|
||||
useMessage().error(err.msg);
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.status {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin-bottom: 2px;
|
||||
|
||||
span {
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
span:nth-child(1) {
|
||||
min-width: 60px;
|
||||
max-width: 100px;
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
span:nth-child(2) {
|
||||
flex: 1;
|
||||
min-width: 50px;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
Reference in new issue
Block a user