!244 trade: 分销业务review代码修改
Merge pull request !244 from 疯狂的世界/brokerage
This commit is contained in:
commit
df6a384321
39
src/api/mall/trade/brokerage/withdraw/index.ts
Normal file
39
src/api/mall/trade/brokerage/withdraw/index.ts
Normal file
@ -0,0 +1,39 @@
|
||||
import request from '@/config/axios'
|
||||
|
||||
export interface BrokerageWithdrawVO {
|
||||
id: number
|
||||
userId: number
|
||||
price: number
|
||||
feePrice: number
|
||||
totalPrice: number
|
||||
type: number
|
||||
name: string
|
||||
accountNo: string
|
||||
bankName: string
|
||||
bankAddress: string
|
||||
accountQrCodeUrl: string
|
||||
status: number
|
||||
auditReason: string
|
||||
auditTime: Date
|
||||
remark: string
|
||||
}
|
||||
|
||||
// 查询佣金提现列表
|
||||
export const getBrokerageWithdrawPage = async (params: any) => {
|
||||
return await request.get({ url: `/trade/brokerage-withdraw/page`, params })
|
||||
}
|
||||
|
||||
// 查询佣金提现详情
|
||||
export const getBrokerageWithdraw = async (id: number) => {
|
||||
return await request.get({ url: `/trade/brokerage-withdraw/get?id=` + id })
|
||||
}
|
||||
|
||||
// 佣金提现 - 通过申请
|
||||
export const approveBrokerageWithdraw = async (id: number) => {
|
||||
return await request.put({ url: `/trade/brokerage-withdraw/approve?id=` + id })
|
||||
}
|
||||
|
||||
// 审核佣金提现 - 驳回申请
|
||||
export const rejectBrokerageWithdraw = async (data: BrokerageWithdrawVO) => {
|
||||
return await request.put({ url: `/trade/brokerage-withdraw/reject`, data })
|
||||
}
|
@ -299,23 +299,6 @@ export const BrokerageEnabledConditionEnum = {
|
||||
name: '指定分销'
|
||||
}
|
||||
}
|
||||
/**
|
||||
* 分销用户类型枚举
|
||||
*/
|
||||
export const BrokerageUserTypeEnum = {
|
||||
ALL: {
|
||||
type: 0,
|
||||
name: '全部'
|
||||
},
|
||||
FIRST: {
|
||||
type: 1,
|
||||
name: '一级推广人'
|
||||
},
|
||||
SECOND: {
|
||||
type: 2,
|
||||
name: '二级推广人'
|
||||
}
|
||||
}
|
||||
/**
|
||||
* 佣金记录业务类型枚举
|
||||
*/
|
||||
@ -329,3 +312,49 @@ export const BrokerageRecordBizTypeEnum = {
|
||||
name: '提现申请'
|
||||
}
|
||||
}
|
||||
/**
|
||||
* 佣金提现状态枚举
|
||||
*/
|
||||
export const BrokerageWithdrawStatusEnum = {
|
||||
AUDITING: {
|
||||
status: 0,
|
||||
name: '审核中'
|
||||
},
|
||||
AUDIT_SUCCESS: {
|
||||
status: 10,
|
||||
name: '审核通过'
|
||||
},
|
||||
AUDIT_FAIL: {
|
||||
status: 20,
|
||||
name: '审核不通过'
|
||||
},
|
||||
WITHDRAW_SUCCESS: {
|
||||
status: 11,
|
||||
name: '提现成功'
|
||||
},
|
||||
WITHDRAW_FAIL: {
|
||||
status: 21,
|
||||
name: '提现失败'
|
||||
}
|
||||
}
|
||||
/**
|
||||
* 佣金提现类型枚举
|
||||
*/
|
||||
export const BrokerageWithdrawTypeEnum = {
|
||||
WALLET: {
|
||||
type: 1,
|
||||
name: '钱包'
|
||||
},
|
||||
BANK: {
|
||||
type: 2,
|
||||
name: '银行卡'
|
||||
},
|
||||
WECHAT: {
|
||||
type: 3,
|
||||
name: '微信'
|
||||
},
|
||||
ALIPAY: {
|
||||
type: 4,
|
||||
name: '支付宝'
|
||||
}
|
||||
}
|
||||
|
@ -171,6 +171,7 @@ export enum DICT_TYPE {
|
||||
BROKERAGE_WITHDRAW_TYPE = 'brokerage_withdraw_type', // 佣金冻结时间
|
||||
BROKERAGE_RECORD_BIZ_TYPE = 'brokerage_record_biz_type', // 佣金业务类型
|
||||
BROKERAGE_RECORD_STATUS = 'brokerage_record_status', // 佣金状态
|
||||
BROKERAGE_WITHDRAW_STATUS = 'brokerage_withdraw_status', // 佣金提现状态
|
||||
|
||||
// ========== MALL - 营销模块 ==========
|
||||
PROMOTION_DISCOUNT_TYPE = 'promotion_discount_type', // 优惠类型
|
||||
|
@ -9,15 +9,11 @@
|
||||
:inline="true"
|
||||
label-width="85px"
|
||||
>
|
||||
<el-form-item label="用户类型" prop="userType">
|
||||
<el-radio-group v-model="queryParams.userType" @change="handleQuery">
|
||||
<el-radio-button
|
||||
v-for="item in BrokerageUserTypeEnum"
|
||||
:key="item.type"
|
||||
:label="item.type"
|
||||
>
|
||||
{{ item.name }}
|
||||
</el-radio-button>
|
||||
<el-form-item label="用户类型" prop="level">
|
||||
<el-radio-group v-model="queryParams.level" @change="handleQuery">
|
||||
<el-radio-button checked>全部</el-radio-button>
|
||||
<el-radio-button label="1">一级推广人</el-radio-button>
|
||||
<el-radio-button label="2">二级推广人</el-radio-button>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item label="状态" prop="status">
|
||||
@ -98,7 +94,7 @@
|
||||
<script setup lang="ts">
|
||||
import { dateFormatter } from '@/utils/formatTime'
|
||||
import * as BrokerageRecordApi from '@/api/mall/trade/brokerage/record'
|
||||
import { BrokerageRecordBizTypeEnum, BrokerageUserTypeEnum } from '@/utils/constants'
|
||||
import { BrokerageRecordBizTypeEnum } from '@/utils/constants'
|
||||
import { fenToYuanFormat } from '@/utils/formatter'
|
||||
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
|
||||
|
||||
@ -115,14 +111,15 @@ const queryParams = reactive({
|
||||
pageSize: 10,
|
||||
userId: null,
|
||||
bizType: BrokerageRecordBizTypeEnum.ORDER.type,
|
||||
userType: BrokerageUserTypeEnum.ALL.type,
|
||||
createTime: []
|
||||
level: '',
|
||||
createTime: [],
|
||||
status: null
|
||||
})
|
||||
const queryFormRef = ref() // 搜索的表单
|
||||
|
||||
/** 打开弹窗 */
|
||||
const dialogVisible = ref(false) // 弹窗的是否展示
|
||||
const open = async (userId: number) => {
|
||||
const open = async (userId: any) => {
|
||||
dialogVisible.value = true
|
||||
queryParams.userId = userId
|
||||
resetQuery()
|
||||
|
@ -9,15 +9,11 @@
|
||||
:inline="true"
|
||||
label-width="85px"
|
||||
>
|
||||
<el-form-item label="用户类型" prop="userType">
|
||||
<el-radio-group v-model="queryParams.userType" @change="handleQuery">
|
||||
<el-radio-button
|
||||
v-for="item in BrokerageUserTypeEnum"
|
||||
:key="item.type"
|
||||
:label="item.type"
|
||||
>
|
||||
{{ item.name }}
|
||||
</el-radio-button>
|
||||
<el-form-item label="用户类型" prop="level">
|
||||
<el-radio-group v-model="queryParams.level" @change="handleQuery">
|
||||
<el-radio-button checked>全部</el-radio-button>
|
||||
<el-radio-button label="1">一级推广人</el-radio-button>
|
||||
<el-radio-button label="2">二级推广人</el-radio-button>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item label="绑定时间" prop="bindUserTime">
|
||||
@ -88,7 +84,6 @@
|
||||
<script setup lang="ts">
|
||||
import { dateFormatter } from '@/utils/formatTime'
|
||||
import * as BrokerageUserApi from '@/api/mall/trade/brokerage/user'
|
||||
import { BrokerageUserTypeEnum } from '@/utils/constants'
|
||||
|
||||
/** 推广人列表 */
|
||||
defineOptions({ name: 'BrokerageUserListDialog' })
|
||||
@ -102,14 +97,14 @@ const queryParams = reactive({
|
||||
pageNo: 1,
|
||||
pageSize: 10,
|
||||
bindUserId: null,
|
||||
userType: BrokerageUserTypeEnum.ALL.type,
|
||||
level: '',
|
||||
bindUserTime: []
|
||||
})
|
||||
const queryFormRef = ref() // 搜索的表单
|
||||
|
||||
/** 打开弹窗 */
|
||||
const dialogVisible = ref(false) // 弹窗的是否展示
|
||||
const open = async (bindUserId: number) => {
|
||||
const open = async (bindUserId: any) => {
|
||||
dialogVisible.value = true
|
||||
queryParams.bindUserId = bindUserId
|
||||
resetQuery()
|
||||
|
@ -0,0 +1,73 @@
|
||||
<template>
|
||||
<Dialog title="审核" v-model="dialogVisible">
|
||||
<el-form
|
||||
ref="formRef"
|
||||
:model="formData"
|
||||
:rules="formRules"
|
||||
label-width="100px"
|
||||
v-loading="formLoading"
|
||||
>
|
||||
<el-form-item label="驳回原因" prop="auditReason">
|
||||
<el-input v-model="formData.auditReason" type="textarea" placeholder="请输入驳回原因" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
|
||||
<el-button @click="dialogVisible = false">取 消</el-button>
|
||||
</template>
|
||||
</Dialog>
|
||||
</template>
|
||||
<script setup lang="ts">
|
||||
import * as BrokerageWithdrawApi from '@/api/mall/trade/brokerage/withdraw'
|
||||
|
||||
const message = useMessage() // 消息弹窗
|
||||
|
||||
const dialogVisible = ref(false) // 弹窗的是否展示
|
||||
const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用
|
||||
const formData = ref({
|
||||
id: undefined,
|
||||
auditReason: undefined
|
||||
})
|
||||
const formRules = reactive({
|
||||
auditReason: [{ required: true, message: '驳回原因不能为空', trigger: 'blur' }]
|
||||
})
|
||||
const formRef = ref() // 表单 Ref
|
||||
|
||||
/** 打开弹窗 */
|
||||
const open = async (id: number) => {
|
||||
dialogVisible.value = true
|
||||
resetForm()
|
||||
formData.value.id = id
|
||||
}
|
||||
defineExpose({ open }) // 提供 open 方法,用于打开弹窗
|
||||
|
||||
/** 提交表单 */
|
||||
const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调
|
||||
const submitForm = async () => {
|
||||
// 校验表单
|
||||
if (!formRef) return
|
||||
const valid = await formRef.value.validate()
|
||||
if (!valid) return
|
||||
// 提交请求
|
||||
formLoading.value = true
|
||||
try {
|
||||
const data = formData.value as unknown as BrokerageWithdrawApi.BrokerageWithdrawVO
|
||||
await BrokerageWithdrawApi.rejectBrokerageWithdraw(data)
|
||||
message.success('驳回成功')
|
||||
dialogVisible.value = false
|
||||
// 发送操作成功的事件
|
||||
emit('success')
|
||||
} finally {
|
||||
formLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
/** 重置表单 */
|
||||
const resetForm = () => {
|
||||
formData.value = {
|
||||
id: undefined,
|
||||
auditReason: undefined
|
||||
}
|
||||
formRef.value?.resetFields()
|
||||
}
|
||||
</script>
|
264
src/views/mall/trade/brokerage/withdraw/index.vue
Normal file
264
src/views/mall/trade/brokerage/withdraw/index.vue
Normal file
@ -0,0 +1,264 @@
|
||||
<template>
|
||||
<ContentWrap>
|
||||
<!-- 搜索工作栏 -->
|
||||
<el-form
|
||||
class="-mb-15px"
|
||||
:model="queryParams"
|
||||
ref="queryFormRef"
|
||||
:inline="true"
|
||||
label-width="68px"
|
||||
>
|
||||
<el-form-item label="用户编号" prop="userId">
|
||||
<el-input
|
||||
v-model="queryParams.userId"
|
||||
placeholder="请输入用户编号"
|
||||
clearable
|
||||
@keyup.enter="handleQuery"
|
||||
class="!w-240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="提现类型" prop="type">
|
||||
<el-select
|
||||
v-model="queryParams.type"
|
||||
placeholder="请选择提现类型"
|
||||
clearable
|
||||
class="!w-240px"
|
||||
>
|
||||
<el-option
|
||||
v-for="dict in getIntDictOptions(DICT_TYPE.BROKERAGE_WITHDRAW_TYPE)"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="账号" prop="accountNo">
|
||||
<el-input
|
||||
v-model="queryParams.accountNo"
|
||||
placeholder="请输入账号"
|
||||
clearable
|
||||
@keyup.enter="handleQuery"
|
||||
class="!w-240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="提现银行" prop="bankName">
|
||||
<el-select
|
||||
v-model="queryParams.bankName"
|
||||
placeholder="请选择提现银行"
|
||||
clearable
|
||||
class="!w-240px"
|
||||
>
|
||||
<el-option
|
||||
v-for="dict in getStrDictOptions(DICT_TYPE.BROKERAGE_BANK_NAME)"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="状态" prop="status">
|
||||
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable class="!w-240px">
|
||||
<el-option
|
||||
v-for="dict in getIntDictOptions(DICT_TYPE.BROKERAGE_WITHDRAW_STATUS)"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="申请时间" prop="createTime">
|
||||
<el-date-picker
|
||||
v-model="queryParams.createTime"
|
||||
value-format="YYYY-MM-DD HH:mm:ss"
|
||||
type="daterange"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
|
||||
class="!w-240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
|
||||
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</ContentWrap>
|
||||
|
||||
<!-- 列表 -->
|
||||
<ContentWrap>
|
||||
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
|
||||
<el-table-column label="编号" align="left" prop="id" min-width="60px" />
|
||||
<el-table-column label="用户信息" align="left" min-width="120px">
|
||||
<template #default="scope">
|
||||
<div>编号:{{ scope.row.userId }}</div>
|
||||
<div>昵称:{{ scope.row.userNickname }}</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="提现金额" align="left" prop="price" min-width="80px">
|
||||
<template #default="scope">
|
||||
<div>金 额:¥{{ fenToYuan(scope.row.price) }}</div>
|
||||
<div>手续费:¥{{ fenToYuan(scope.row.feePrice) }}</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="提现方式" align="left" prop="type" min-width="120px">
|
||||
<template #default="scope">
|
||||
<div
|
||||
>{{ getDictLabel(DICT_TYPE.BROKERAGE_WITHDRAW_TYPE, scope.row.type) }}账号:{{
|
||||
scope.row.accountNo
|
||||
}}</div
|
||||
>
|
||||
<template v-if="scope.row.type === BrokerageWithdrawTypeEnum.BANK.type">
|
||||
<div>真实姓名:{{ scope.row.name }}</div>
|
||||
<div>
|
||||
银行名称:
|
||||
<dict-tag :type="DICT_TYPE.BROKERAGE_BANK_NAME" :value="scope.row.bankName" />
|
||||
</div>
|
||||
<div>开户地址:{{ scope.row.bankAddress }}</div>
|
||||
</template>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="收款码" align="left" prop="accountQrCodeUrl" width="70px">
|
||||
<template #default="scope">
|
||||
<el-image
|
||||
:src="scope.row.accountQrCodeUrl"
|
||||
class="w-40px h-40px"
|
||||
:preview-src-list="[scope.row.accountQrCodeUrl]"
|
||||
preview-teleported
|
||||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="申请时间"
|
||||
align="left"
|
||||
prop="createTime"
|
||||
:formatter="dateFormatter"
|
||||
width="170px"
|
||||
/>
|
||||
<el-table-column label="备注" align="left" prop="remark" />
|
||||
<el-table-column label="状态" align="left" prop="status" min-width="120px">
|
||||
<template #default="scope">
|
||||
<dict-tag :type="DICT_TYPE.BROKERAGE_WITHDRAW_STATUS" :value="scope.row.status" />
|
||||
<div v-if="scope.row.auditTime" class="text-xs">
|
||||
时间:{{ formatDate(scope.row.auditTime) }}
|
||||
</div>
|
||||
<div v-if="scope.row.auditReason" class="text-xs">
|
||||
原因:{{ scope.row.auditReason }}
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="left" width="110px" fixed="right">
|
||||
<template #default="scope">
|
||||
<template v-if="scope.row.status === BrokerageWithdrawStatusEnum.AUDITING.status">
|
||||
<el-button
|
||||
link
|
||||
type="primary"
|
||||
@click="handleApprove(scope.row.id)"
|
||||
v-hasPermi="['trade:brokerage-withdraw:audit']"
|
||||
>
|
||||
通过
|
||||
</el-button>
|
||||
<el-button
|
||||
link
|
||||
type="danger"
|
||||
@click="openForm(scope.row.id)"
|
||||
v-hasPermi="['trade:brokerage-withdraw:audit']"
|
||||
>
|
||||
驳回
|
||||
</el-button>
|
||||
</template>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<!-- 分页 -->
|
||||
<Pagination
|
||||
:total="total"
|
||||
v-model:page="queryParams.pageNo"
|
||||
v-model:limit="queryParams.pageSize"
|
||||
@pagination="getList"
|
||||
/>
|
||||
</ContentWrap>
|
||||
|
||||
<!-- 表单弹窗:添加/修改 -->
|
||||
<BrokerageWithdrawRejectForm ref="formRef" @success="getList" />
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { DICT_TYPE, getDictLabel, getIntDictOptions, getStrDictOptions } from '@/utils/dict'
|
||||
import { dateFormatter, formatDate } from '@/utils/formatTime'
|
||||
import * as BrokerageWithdrawApi from '@/api/mall/trade/brokerage/withdraw'
|
||||
import BrokerageWithdrawRejectForm from './BrokerageWithdrawRejectForm.vue'
|
||||
import { BrokerageWithdrawStatusEnum, BrokerageWithdrawTypeEnum } from '@/utils/constants'
|
||||
import { fenToYuanFormat } from '@/utils/formatter'
|
||||
import { fenToYuan } from '@/utils'
|
||||
|
||||
defineOptions({ name: 'BrokerageWithdraw' })
|
||||
|
||||
const { t } = useI18n() // 国际化
|
||||
const message = useMessage() // 消息弹窗
|
||||
const loading = ref(true) // 列表的加载中
|
||||
const total = ref(0) // 列表的总页数
|
||||
const list = ref([]) // 列表的数据
|
||||
const queryParams = reactive({
|
||||
pageNo: 1,
|
||||
pageSize: 10,
|
||||
userId: null,
|
||||
type: null,
|
||||
name: null,
|
||||
accountNo: null,
|
||||
bankName: null,
|
||||
status: null,
|
||||
auditReason: null,
|
||||
auditTime: [],
|
||||
remark: null,
|
||||
createTime: []
|
||||
})
|
||||
const queryFormRef = ref() // 搜索的表单
|
||||
|
||||
/** 查询列表 */
|
||||
const getList = async () => {
|
||||
loading.value = true
|
||||
try {
|
||||
const data = await BrokerageWithdrawApi.getBrokerageWithdrawPage(queryParams)
|
||||
list.value = data.list
|
||||
total.value = data.total
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
/** 搜索按钮操作 */
|
||||
const handleQuery = () => {
|
||||
queryParams.pageNo = 1
|
||||
getList()
|
||||
}
|
||||
|
||||
/** 重置按钮操作 */
|
||||
const resetQuery = () => {
|
||||
queryFormRef.value.resetFields()
|
||||
handleQuery()
|
||||
}
|
||||
|
||||
/** 添加/修改操作 */
|
||||
const formRef = ref()
|
||||
const openForm = (id: number) => {
|
||||
formRef.value.open(id)
|
||||
}
|
||||
|
||||
/** 审核通过 */
|
||||
const handleApprove = async (id: number) => {
|
||||
try {
|
||||
loading.value = true
|
||||
await message.confirm('确定要审核通过吗?')
|
||||
await BrokerageWithdrawApi.approveBrokerageWithdraw(id)
|
||||
await message.success(t('common.success'))
|
||||
await getList()
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
/** 初始化 **/
|
||||
onMounted(() => {
|
||||
getList()
|
||||
})
|
||||
</script>
|
Loading…
Reference in New Issue
Block a user