zianxin/pj_admin_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:结账商户完成

Browse Source
This commit is contained in:
dzc committed 2025-05-09 14:38:03 +08:00
1 parent 284d5a7b9c
commit e71b344afb
6 files changed
+110 -57
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/api/wallet/mch-checkout.ts
+8 -4
View File
@@ -1,10 +1,14 @@
import request from "/@/utils/request"
export function fetchList(query?: Object) {
export function pageJoin(data: any) {
return request({
url: "/wallet/mch-checkout/page",
method: "get",
params: query,
url: "/wallet/mch-checkout/page-join",
method: "post",
params: {
current: data.current,
size: data.size,
},
data: data,
})
}
src/views/hard/hard-sh/index.vue
+15
View File
@@ -101,6 +101,15 @@
</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="120">
<template #default="{ row }">
<el-tooltip class="box-item" effect="dark" content="只有合作商家能结账" placement="top">
<el-button icon="Tickets" text :disabled="row.merchantType != 2" type="primary" @click="doCheckout(row)">
商户结账
</el-button>
</el-tooltip>
</template>
</el-table-column>
</el-table>
</template>
</DraggableDepTree>
@@ -113,6 +122,8 @@ import { BasicTableProps, useTable } from "/@/hooks/table"
import { displayPrice } from "/@/utils/formatMoney"
import * as hardTotalApi from "/@/api/hard/hard-total"
const { push } = useRouter()
// 搜索变量
const queryRef = ref()
const showSearch = ref(true)
@@ -136,6 +147,10 @@ const exportExcel = () => {
postDownBlobFile("/hard/hard-total/export-cs", Object.assign(state.queryForm), "商户交易记录.xlsx")
}
const doCheckout = (row: any) => {
push({ path: "/mch/mch-checkout/index", query: { mchId: row.merchantId } })
}
const getSummaries = (param: any) => {
const { columns, data } = param
const totalColumns = ["totalPayPrice", "totalPayCount", "totalRefundPrice", "totalRefundCount", "totalProfitPrice", "totalProfitCount"]
src/views/mch/mch-checkout/form.vue
+34 -33
View File
@@ -1,35 +1,30 @@
<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-dialog :title="form.id ? '编辑' : '新增'" width="40%" v-model="visible" :close-on-click-modal="false" draggable>
<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="120px" v-loading="loading">
<el-row :gutter="24">
<el-col :span="24" class="mb20">
<el-form-item label="结账年月日(存入年月就行)" prop="checkoutTime">
<el-input v-model="form.checkoutTime" placeholder="请输入结账年月日(存入年月就行)" />
<el-form-item label="结账时间" prop="checkoutTime">
<el-date-picker v-model="form.checkoutTime" value-format="YYYY-MM-DD" placeholder="请选择结账时间" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="结账人" prop="checkoutUserId">
<el-input v-model="form.checkoutUserId" placeholder="请输入结账人" />
<el-form-item label="商户" prop="merchantId">
<select-mch v-model="form.merchantId" :apiParams="{ types: '2' }" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="商户id" prop="merchantId">
<el-input v-model="form.merchantId" placeholder="请输入商户id" />
<el-form-item label="结账金额(元)" prop="price">
<el-input-number v-model="form.price" :min="0" :max="5000000" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="结账价格" prop="price">
<el-input v-model="form.price" placeholder="请输入结账价格" />
<el-form-item label="凭证图片" prop="pic">
<upload-imgs v-model="form.pic" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="结账凭证图片" prop="pic">
<el-input v-model="form.pic" placeholder="请输入结账凭证图片" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="结账备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入结账备注" />
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入结账备注" type="textarea" :autosize="{ minRows: 6 }" />
</el-form-item>
</el-col>
</el-row>
@@ -48,6 +43,7 @@ import { useDict } from "/@/hooks/dict"
import { useMessage } from "/@/hooks/message"
import * as mchCheckoutApi from "/@/api/wallet/mch-checkout"
import { rule } from "/@/utils/validate"
import { formatDate } from "/@/utils/formatTime"
const emit = defineEmits(["refresh"])
// 定义变量内容
@@ -59,27 +55,29 @@ const loading = ref(false)
// 提交表单数据
const form = reactive({
id: "",
checkoutTime: "",
checkoutTime: formatDate(new Date(), "YYYY-mm-dd"),
checkoutUserId: "",
merchantId: "",
price: "",
price: 0,
pic: "",
remark: "",
})
// 定义校验规则
const dataRules = ref({})
const dataRules = ref({
checkoutTime: [{ required: true, message: "结账时间不能为空", trigger: "blur" }],
merchantId: [{ required: true, message: "商户不能为空", trigger: "change" }],
price: [{ required: true, message: "结账金额不能为空", trigger: "blur" }],
})
// 打开弹窗
const openDialog = (id: string) => {
visible.value = true
form.id = ""
// 重置表单数据
nextTick(() => {
dataFormRef.value?.resetFields()
})
// 获取mchCheckout信息
if (id) {
form.id = id
@@ -91,10 +89,13 @@ const openDialog = (id: string) => {
const onSubmit = async () => {
const valid = await dataFormRef.value.validate().catch(() => {})
if (!valid) return false
try {
loading.value = true
form.id ? await mchCheckoutApi.putObj(form) : await mchCheckoutApi.addObj(form)
const _pa = {
...form,
price: form.price * 100,
}
form.id ? await mchCheckoutApi.putObj(_pa) : await mchCheckoutApi.addObj(_pa)
useMessage().success(form.id ? "修改成功" : "添加成功")
visible.value = false
emit("refresh")
@@ -106,17 +107,17 @@ const onSubmit = async () => {
}
// 初始化表单数据
const getmchCheckoutData = (id: string) => {
const getmchCheckoutData = async (id: string) => {
// 获取数据
loading.value = true
mchCheckoutApi
.getObj(id)
.then((res: any) => {
Object.assign(form, res.data)
})
.finally(() => {
loading.value = false
})
try {
const { data } = await mchCheckoutApi.getObj(id)
Object.assign(form, data, { price: data.price / 100 })
} catch (err: any) {
useMessage().error(err.msg)
} finally {
loading.value = false
}
}
// 暴露变量
src/views/mch/mch-checkout/index.vue
+50 -11
View File
@@ -1,6 +1,25 @@
<template>
<div class="layout-padding">
<div class="layout-padding-auto layout-padding-view">
<el-form v-if="showSearch" ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
<el-row>
<el-form-item style="width: 300px" label="商户" prop="merchantId">
<select-mch v-model="state.queryForm.merchantId" :apiParams="{ types: '2' }" />
</el-form-item>
<el-form-item style="width: 400px" label="结账时间" prop="checkoutTimeList">
<el-date-picker v-model="state.queryForm.checkoutTimeList" value-format="YYYY-MM-DD" type="daterange" />
</el-form-item>
<el-form-item style="width: 400px" label="创建时间" prop="createTimeList">
<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD" type="daterange" />
</el-form-item>
<el-form-item>
<el-button icon="Search" type="primary" @click="getDataList">
{{ $t("common.queryBtn") }}
</el-button>
<el-button icon="Refresh" @click="resetQuery">{{ $t("common.resetBtn") }}</el-button>
</el-form-item>
</el-row>
</el-form>
<el-row>
<div class="mb8" style="width: 100%">
<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()" v-auth="'wallet_mchCheckout_add'">
@@ -37,12 +56,21 @@
>
<el-table-column type="selection" width="40" align="center" />
<el-table-column type="index" label="#" width="40" />
<el-table-column prop="checkoutTime" label="结账年月日(存入年月就行)" show-overflow-tooltip />
<el-table-column prop="checkoutUserId" label="结账人" show-overflow-tooltip />
<el-table-column prop="merchantId" label="商户id" show-overflow-tooltip />
<el-table-column prop="price" label="结账价格" show-overflow-tooltip />
<el-table-column prop="pic" label="结账凭证图片" show-overflow-tooltip />
<el-table-column prop="remark" label="结账备注" show-overflow-tooltip />
<el-table-column prop="username" label="结账人" />
<el-table-column prop="merchantName" label="结账商户" />
<el-table-column prop="price" label="结账金额">
<template #default="{ row }">
<div class="color-success">{{ displayPrice(row.price) }}</div>
</template>
</el-table-column>
<el-table-column prop="pic" label="凭证图片">
<template #default="{ row }">
<preview-image :src="row.pic" />
</template>
</el-table-column>
<el-table-column prop="checkoutTime" label="结账时间" />
<el-table-column prop="createTime" label="创建时间" />
<el-table-column prop="remark" label="结账备注" width="250" />
<el-table-column label="操作" width="150">
<template #default="scope">
<el-button
@@ -51,11 +79,12 @@
type="primary"
v-auth="'wallet_mchCheckout_edit'"
@click="formDialogRef.openDialog(scope.row.id)"
>编辑</el-button
>
<el-button icon="delete" text type="primary" v-auth="'wallet_mchCheckout_del'" @click="handleDelete([scope.row.id])"
>删除</el-button
>
编辑
</el-button>
<el-button icon="delete" text type="primary" v-auth="'wallet_mchCheckout_del'" @click="handleDelete([scope.row.id])">
删除
</el-button>
</template>
</el-table-column>
</el-table>
@@ -68,11 +97,14 @@
</template>
<script setup lang="ts" name="systemMchCheckout">
import { displayPrice } from "/@/utils/formatMoney"
import { BasicTableProps, useTable } from "/@/hooks/table"
import * as mchCheckoutApi from "/@/api/wallet/mch-checkout"
import { useMessage, useMessageBox } from "/@/hooks/message"
import { useDict } from "/@/hooks/dict"
const { query } = useRoute()
// 引入组件
const FormDialog = defineAsyncComponent(() => import("./form.vue"))
// 定义查询字典
@@ -87,8 +119,9 @@ const selectObjs = ref([]) as any
const multiple = ref(true)
const state: BasicTableProps = reactive<BasicTableProps>({
createdIsNeed: false,
queryForm: {},
pageList: mchCheckoutApi.fetchList,
pageList: mchCheckoutApi.pageJoin,
})
// table hook
@@ -130,4 +163,10 @@ const handleDelete = async (ids: string[]) => {
useMessage().error(err.msg)
}
}
onMounted(async () => {
const mchId = query.mchId
state.queryForm.merchantId = mchId
getDataList()
})
</script>
src/views/wallet/wallet-manage/change-balance.vue
+1 -8
View File
@@ -7,19 +7,16 @@
<el-input v-model="form.id" placeholder="" disabled />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="用户昵称" prop="nickname">
<el-input v-model="form.nickname" placeholder="" disabled />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="变动前余额(元)" prop="balance">
<el-input v-model="form.balance" placeholder="" disabled />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="变动类型" prop="changeType">
<el-radio-group v-model="form.changeType">
@@ -28,13 +25,11 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="变动余额(元)" prop="changeBalance">
<el-input-number v-model="form.changeBalance" :min="0" :precision="2" :step="0.1" class="!w-240px" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="变动后余额(元)" prop="balanceResult">
<el-input v-model="balanceResult" placeholder="" disabled />
@@ -79,9 +74,7 @@ const form = reactive<any>({
})
/** 变动后的余额 */
const balanceResult = computed(() =>
displayPrice(convertToInteger(form.balance) + convertToInteger(form.changeBalance) * form.changeType),
)
const balanceResult = computed(() => displayPrice(convertToInteger(form.balance) + convertToInteger(form.changeBalance) * form.changeType))
// 定义校验规则
const dataRules = ref({
src/views/wallet/wallet-recharge-water/index.vue
+2 -1
View File
@@ -112,8 +112,9 @@
text
type="primary"
@click="handleRecover(row.id)"
>恢复</el-button
>
恢复
</el-button>
</template>
</el-table-column>
</el-table>