luo/one-pipe-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 代理

Browse Source
This commit is contained in:
luo
2026-09-12 11:27:50 +08:00
parent d3d257cdf8
commit 2308d82d0f
44 changed files with 5470 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

200
src/views/finance/agent-recharge/index.vue
View File

@@ -121,10 +121,66 @@
ref="uploadRef"
v-model="createForm.payment_voucher_key"
voucher-name="支付凭证"
accept="image/*"
content-type="image/jpeg"
@uploading-change="voucherUploading = $event"
@change="createFormRef?.validateField('payment_voucher_key')"
/>
</ElFormItem>
<ElFormItem
v-if="createMode === 'offline'"
label="收款方式"
prop="offline_payment_method_id"
>
<ElSelect
v-model="createForm.offline_payment_method_id"
placeholder="请选择收款方式"
style="width: 100%"
filterable
:loading="paymentMethodOptionsLoading"
>
<ElOption
v-for="item in offlinePaymentMethodOptions"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</ElSelect>
</ElFormItem>
<ElFormItem
v-if="createForm.payment_method === 'offline'"
label="交易流水号"
prop="external_transaction_no"
>
<div class="external-transaction-row">
<ElInput
v-model="createForm.external_transaction_no"
placeholder="请输入交易流水号，或点击右侧识别凭证预填"
:disabled="ocrLoading"
/>
<ElButton
:loading="ocrLoading"
:disabled="!offlineVoucherKeys.length"
@click="handleRecognizeVoucher"
>
识别凭证
</ElButton>
</div>
<div class="external-transaction-tip">
识别结果仅供参考，请对照凭证核对后再提交。
</div>
</ElFormItem>
<ElFormItem v-if="createMode === 'offline'" label="其他凭证">
<VoucherUpload
ref="otherUploadRef"
v-model="createForm.other_voucher_key"
voucher-name="其他凭证"
:max-count="5"
accept="image/*"
content-type="image/jpeg"
@uploading-change="otherVoucherUploading = $event"
/>
</ElFormItem>
<ElFormItem v-if="createMode === 'offline'" label="运营备注" prop="remark">
<ElInput
v-model="createForm.remark"
@@ -297,7 +353,12 @@
import { h } from 'vue'
import { useRouter } from 'vue-router'
import QrcodeVue from 'qrcode.vue'
import { AgentRechargeService, CommissionService, ShopService } from '@/api/modules'
import {
AgentRechargeService,
CommissionService,
EmployeeCollectionService,
ShopService
} from '@/api/modules'
import {
ElMessage,
ElMessageBox,
@@ -319,6 +380,7 @@
AgentRechargePaymentStatusResponse,
CreateAgentRechargeRequest,
ConfirmOfflinePaymentRequest,
EmployeeCollectionPaymentMethod,
RejectAgentRechargeRequest
} from '@/types/api'
import type { SearchFormItem } from '@/types'
@@ -343,6 +405,7 @@
import ExportTaskCreateDialog from '@/components/business/ExportTaskCreateDialog.vue'
import { buildAgentRechargeActions } from './agentRechargeActions'
import { formatRejectionReason } from './agentRechargeDisplay'
import { normalizeCollectionList } from '@/views/finance/employee-collection/employeeCollectionDisplay'
import {
amountYuanToFen,
createOnlineRechargeRequestId,
@@ -406,6 +469,10 @@
max_amount: ONLINE_MAX_RECHARGE_AMOUNT_FEN
})
const paymentVoucherFileKeys = ref<string[]>([])
const offlinePaymentMethodOptions = ref<EmployeeCollectionPaymentMethod[]>([])
const paymentMethodOptionsLoading = ref(false)
const otherVoucherUploading = ref(false)
const ocrLoading = ref(false)
// 搜索表单初始值
const initialSearchState: AgentRechargeQueryParams = {
@@ -542,6 +609,8 @@
{ label: '业务处理状态', prop: 'processing_status_name' },
{ label: '支付方式', prop: 'payment_method' },
{ label: '支付通道', prop: 'payment_channel' },
{ label: '交易流水号', prop: 'external_transaction_no' },
{ label: '收款方式', prop: 'offline_payment_method_name' },
{ label: '运营备注', prop: 'remark' },
{ label: '驳回原因', prop: 'rejection_reason' },
{ label: '创建时间', prop: 'created_at' },
@@ -554,6 +623,7 @@
const confirmPayFormRef = ref<FormInstance>()
const rejectFormRef = ref<FormInstance>()
const uploadRef = ref<InstanceType<typeof VoucherUpload>>()
const otherUploadRef = ref<InstanceType<typeof VoucherUpload>>()
const OFFLINE_MIN_RECHARGE_AMOUNT = 0.01
const OFFLINE_MAX_RECHARGE_AMOUNT = 1_000_000
@@ -579,6 +649,8 @@
() =>
createLoading.value ||
voucherUploading.value ||
otherVoucherUploading.value ||
ocrLoading.value ||
paymentMethodsLoading.value ||
(createMode.value === 'online' && onlinePaymentMethods.value.length === 0)
)
@@ -631,6 +703,12 @@
}
if (createMode.value === 'offline') {
rules.payment_voucher_key = [{ required: true, message: '请上传支付凭证', trigger: 'change' }]
rules.offline_payment_method_id = [
{ required: true, message: '请选择收款方式', trigger: 'change' }
]
rules.external_transaction_no = [
{ required: true, message: '请输入交易流水号', trigger: 'blur' }
]
}
if (createMode.value === 'online') delete rules.shop_id
return rules
@@ -651,12 +729,18 @@
payment_method: AgentRechargePaymentMethod | ''
shop_id: number | null
payment_voucher_key: string[]
offline_payment_method_id: number | null
external_transaction_no: string
other_voucher_key: string[]
remark: string
}>({
amount: OFFLINE_MIN_RECHARGE_AMOUNT,
payment_method: '',
shop_id: null,
payment_voucher_key: [],
offline_payment_method_id: null,
external_transaction_no: '',
other_voucher_key: [],
remark: ''
})
@@ -803,6 +887,21 @@
width: 120,
formatter: (row: AgentRecharge) => row.payment_channel || '-'
},
{
prop: 'external_transaction_no',
label: '交易流水号',
minWidth: 180,
showOverflowTooltip: true,
formatter: (row: AgentRecharge) => row.external_transaction_no || '-'
},
{
prop: 'offline_payment_method_name',
label: '收款方式',
width: 140,
showOverflowTooltip: true,
formatter: (row: AgentRecharge) =>
row.payment_method === 'offline' ? row.offline_payment_method_name || '-' : '-'
},
{
prop: 'remark',
label: '运营备注',
@@ -1000,8 +1099,9 @@
if (createMode.value === 'online') {
await loadPaymentMethods()
} else {
// 重新加载店铺列表，确保获取最新数据
// 重新加载店铺列表与收款方式字典，确保获取最新数据
await loadShops()
await loadPaymentMethodOptions()
}
createDialogVisible.value = true
@@ -1012,10 +1112,16 @@
createForm.payment_method = ''
createForm.shop_id = null
createForm.payment_voucher_key = []
createForm.offline_payment_method_id = null
createForm.external_transaction_no = ''
createForm.other_voucher_key = []
createForm.remark = ''
onlineRequestId.value = null
voucherUploading.value = false
otherVoucherUploading.value = false
ocrLoading.value = false
uploadRef.value?.clearFiles(false)
otherUploadRef.value?.clearFiles(false)
}
// 对话框关闭后的清理
@@ -1024,12 +1130,12 @@
resetCreateForm()
}
// 加载代理在线充值可用支付方式
// 加载代理在线充值可用支付方式（超管调用该接口返回 403，仅通过系统配置查看允许范围）
const loadPaymentMethods = async () => {
paymentMethodsLoading.value = true
onlinePaymentMethods.value = []
try {
const res = await AgentRechargeService.getPaymentMethods()
const res = await AgentRechargeService.getSelfRechargePaymentMethods()
if (res.code === 0) {
onlinePaymentMethods.value = Array.isArray(res.data?.methods) ? res.data.methods : []
paymentMethodsBounds.min_amount = ONLINE_MIN_RECHARGE_AMOUNT_FEN
@@ -1037,15 +1143,75 @@
Number(res.data?.max_amount) || ONLINE_MAX_RECHARGE_AMOUNT_FEN
createForm.amount = minimumAmountYuan.value
} else {
ElMessage.warning(res.msg || '当前暂无可用在线支付方式')
ElMessage.warning(res.msg || '当前暂无可用的在线支付方式')
}
} catch (error) {
console.error('加载在线支付方式失败:', error)
ElMessage.warning('当前暂无可用的在线支付方式')
} finally {
paymentMethodsLoading.value = false
}
}
// 加载线下收款方式字典启用项
const loadPaymentMethodOptions = async () => {
paymentMethodOptionsLoading.value = true
offlinePaymentMethodOptions.value = []
try {
const res = await EmployeeCollectionService.getPaymentMethods({
page: 1,
page_size: 100,
enabled: true
})
if (res.code === 0) {
offlinePaymentMethodOptions.value =
normalizeCollectionList<EmployeeCollectionPaymentMethod>(res.data)
}
} catch (error) {
console.error('加载线下收款方式失败:', error)
} finally {
paymentMethodOptionsLoading.value = false
}
}
// 已上传的支付凭证对象键（OCR 识别取第一个）
const offlineVoucherKeys = computed(() => toVoucherKeyList(createForm.payment_voucher_key))
// 识别付款凭证中的交易流水号：只做预填，失败不阻断人工填写
const handleRecognizeVoucher = async () => {
if (ocrLoading.value) return
const voucherKeys = offlineVoucherKeys.value
if (!voucherKeys.length) {
ElMessage.warning('请先上传支付凭证')
return
}
ocrLoading.value = true
try {
const res = await AgentRechargeService.recognizePaymentVoucher({
payment_voucher_key: voucherKeys[0]
})
if (res.code !== 0) {
ElMessage.warning(res.msg || '识别失败，请手动填写交易流水号')
return
}
const transactionNo = res.data?.external_transaction_no
if (!transactionNo) {
ElMessage.warning('未识别到交易流水号，请手动填写')
return
}
createForm.external_transaction_no = transactionNo
createFormRef.value?.validateField('external_transaction_no')
ElMessage.success('已识别交易流水号，请对照凭证核对')
} catch (error) {
console.error('识别付款凭证失败:', error)
ElMessage.warning('识别失败，请手动填写交易流水号')
} finally {
ocrLoading.value = false
}
}
// 创建充值订单
const handleCreateRecharge = async () => {
if (createLoading.value) return
@@ -1056,6 +1222,10 @@
ElMessage.warning('支付凭证上传中，请稍候')
return
}
if (otherVoucherUploading.value) {
ElMessage.warning('其他凭证上传中，请稍候')
return
}
createLoading.value = true
try {
@@ -1071,6 +1241,10 @@
ElMessage.warning('请选择目标店铺')
return
}
if (!createForm.offline_payment_method_id) {
ElMessage.warning('请选择收款方式')
return
}
const voucherKeys = toVoucherKeyList(createForm.payment_voucher_key)
if (!hasVoucherKeys(voucherKeys)) {
@@ -1078,11 +1252,15 @@
return
}
const otherVoucherKeys = toVoucherKeyList(createForm.other_voucher_key)
const data: CreateAgentRechargeRequest = {
amount: amountYuanToFen(createForm.amount),
payment_method: 'offline',
shop_id: createForm.shop_id,
offline_payment_method_id: createForm.offline_payment_method_id,
external_transaction_no: createForm.external_transaction_no.trim(),
payment_voucher_key: voucherKeys,
other_voucher_key: otherVoucherKeys.length ? otherVoucherKeys : undefined,
remark: createForm.remark || undefined
}
@@ -1430,6 +1608,18 @@
color: var(--el-color-danger);
}
.external-transaction-row {
display: flex;
gap: 8px;
width: 100%;
}
.external-transaction-tip {
margin-top: 4px;
font-size: 12px;
color: var(--el-text-color-secondary);
}
.online-recharge-qr-dialog {
display: flex;
flex-direction: column;