Merge remote-tracking branch 'origin/master'

src/api/thirdparty/third-fz-order.ts

@@ -0,0 +1,41 @@
+import request from "/@/utils/request"
+
+export function fetchList(query?: Object) {
+    return request({
+        url: '/third/third-fz-order/page',
+        method: 'get',
+        params: query
+    })
+}
+
+export function addObj(obj?: Object) {
+    return request({
+        url: '/third/third-fz-order',
+        method: 'post',
+        data: obj
+    })
+}
+
+export function getObj(id?: string) {
+    return request({
+        url: '/third/third-fz-order/' + id,
+        method: 'get'
+    })
+}
+
+export function delObjs(ids?: Object) {
+    return request({
+        url: '/third/third-fz-order',
+        method: 'delete',
+        data: ids
+    })
+}
+
+export function putObj(obj?: Object) {
+    return request({
+        url: '/third/third-fz-order',
+        method: 'put',
+        data: obj
+    })
+}
+

src/views/thirdparty/third-pay-order/components/fz-table-dailog.vue

@@ -0,0 +1,155 @@
+<template>
+    <el-dialog title="分账信息" width="80%" v-model="visible" :close-on-click-modal="false" draggable>
+        <el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
+            <el-form-item style="width: 250px" label="支付订单号" prop="payNo">
+                <el-input v-model="state.queryForm.payNo" />
+            </el-form-item>
+            <el-form-item style="width: 250px" label="分账状态" prop="status">
+                <dict-select v-model="state.queryForm.status" dict-code="third_fz_order_status" />
+            </el-form-item>
+            <el-form-item style="width: 450px" label="支付时间" prop="fzTimeList">
+                <el-date-picker v-model="state.queryForm.fzTimeList" value-format="YYYY-MM-DD HH:mm:ss"
+                    type="datetimerange" />
+            </el-form-item>
+            <el-form-item style="width: 450px" label="退款时间" prop="fzRefundTimeList">
+                <el-date-picker v-model="state.queryForm.fzRefundTimeList" value-format="YYYY-MM-DD HH:mm:ss"
+                    type="datetimerange" />
+            </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-form>
+        <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="index" label="#" width="80" />
+            <el-table-column prop="payNo" label="支付订单号" width="200" show-overflow-tooltip />
+            <el-table-column prop="fzNo" label="分账订单号" width="200" show-overflow-tooltip />
+            <el-table-column prop="status" width="100" label="分账状态">
+                <template #default="{ row }">
+                    <dict-tag :options="third_fz_order_status" :value="row.status" />
+                </template>
+            </el-table-column>
+            <el-table-column prop="fzTime" label="发起分账时间" width="180" />
+            <el-table-column label="支付" width="280">
+                <template #default="{ row }">
+                    <div>
+                        <div class="flex items-center">
+                            <div class="w-[40%] text-left">支付参数:</div>
+                            <preview-json v-if="row.createReq" :json="row.createReq" />
+                            <div class="color-danger" v-else>暂无</div>
+                        </div>
+                        <div class="flex items-center">
+                            <div class="w-[40%] text-left">支付返回:</div>
+                            <preview-json v-if="row.createRes" :json="row.createRes" />
+                            <div class="color-danger" v-else>暂无</div>
+                        </div>
+                        <div class="flex items-center">
+                            <div class="w-[40%] text-left">错误信息:</div>
+                            <preview-json v-if="row.createError" :json="row.createError" />
+                            <div class="color-danger" v-else>暂无</div>
+                        </div>
+                    </div>
+                </template>
+            </el-table-column>
+            <el-table-column prop="fzRefundNo" label="分账退款订单号" width="200" show-overflow-tooltip />
+            <el-table-column prop="fzRefundTime" label="分账退款时间" width="180" />
+            <el-table-column label="退款" width="280">
+                <template #default="{ row }">
+                    <div>
+                        <div class="flex items-center">
+                            <div class="w-[40%] text-left">支付参数:</div>
+                            <preview-json v-if="row.fzRefundReq" :json="row.fzRefundReq" />
+                            <div class="color-danger" v-else>暂无</div>
+                        </div>
+                        <div class="flex items-center">
+                            <div class="w-[40%] text-left">支付返回:</div>
+                            <preview-json v-if="row.fzRefundRes" :json="row.fzRefundRes" />
+                            <div class="color-danger" v-else>暂无</div>
+                        </div>
+                        <div class="flex items-center">
+                            <div class="w-[40%] text-left">错误信息:</div>
+                            <preview-json v-if="row.fzRefundError" :json="row.fzRefundError" />
+                            <div class="color-danger" v-else>暂无</div>
+                        </div>
+                    </div>
+                </template>
+            </el-table-column>
+        </el-table>
+        <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+    </el-dialog>
+</template>
+
+<script setup lang="ts" name="FzTableDailog">
+import { BasicTableProps, useTable } from "/@/hooks/table";
+import * as thirdFzOrderApi from "/@/api/thirdparty/third-fz-order";
+
+import { useDict } from '/@/hooks/dict';
+
+const queryRef = ref()
+// 定义变量内容
+const visible = ref(false)
+// 多选变量
+const selectObjs = ref([]) as any
+const multiple = ref(true)
+// 定义查询字典
+const { third_fz_order_status } = useDict('third_fz_order_status')
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+    createdIsNeed: false,
+    queryForm: {},
+    pageList: thirdFzOrderApi.fetchList
+})
+
+//  table hook
+const {
+    getDataList,
+    currentChangeHandle,
+    sizeChangeHandle,
+    sortChangeHandle,
+    downBlobFile,
+    tableStyle
+} = useTable(state)
+
+// 提交表单数据
+const form = reactive<any>({
+    id: '',
+});
+
+// 打开弹窗
+const openDialog = async (id: string, payNo: string) => {
+    visible.value = true
+
+    await nextTick()
+    queryRef.value?.resetFields();
+
+    form.id = id
+    state.queryForm.payNo = payNo
+    getDataList()
+}
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+    selectObjs.value = objs.map(({ id }) => id);
+    multiple.value = !objs.length;
+};
+
+// 清空搜索条件
+const resetQuery = () => {
+    // 清空搜索条件
+    queryRef.value?.resetFields()
+    // 清空多选
+    selectObjs.value = []
+    getDataList()
+}
+
+// 暴露变量
+defineExpose({
+    openDialog
+});
+</script>

src/views/thirdparty/third-pay-order/index.vue

@@ -57,9 +57,20 @@
         <el-table-column prop="username" label="用户" width="100" show-overflow-tooltip />
         <el-table-column prop="userPhone" label="用户手机号" width="150" show-overflow-tooltip />
         <el-table-column prop="userCode" label="用户第三方平台唯一编码" width="280" />
-        <el-table-column prop="price" width="100" label="支付金额">
+        <el-table-column prop="price" width="160" label="支付金额">
           <template #default="{ row }">
-            <div class="color-success">{{ displayPrice(row.price) }}</div>
+            <div>
+              <div class="flex items-center">
+                <div class="w-[60%] text-left">总金额:</div>
+                <div class="color-success" v-if="row.price">{{ displayPrice(row.price) }}</div>
+                <div class="color-danger" v-else>暂无</div>
+              </div>
+              <div class="flex items-center">
+                <div class="w-[60%] text-left">分账金额:</div>
+                <div class="color-success" v-if="row.fzPrice">{{ displayPrice(row.fzPrice) }}</div>
+                <div class="color-danger" v-else>暂无</div>
+              </div>
+            </div>
           </template>
         </el-table-column>
         <el-table-column prop="status" width="100" label="支付状态">
@@ -112,9 +123,13 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column fixed="right" align="center" label="操作" prop="createTime" width="100">
+        <el-table-column fixed="right" align="center" label="操作" prop="createTime" width="140">
           <template #default="{ row }">
             <div class="flex items-center justify-center">
+              <el-button v-auth="'third_thirdFzOrder_view'" icon="Tickets" text type="primary"
+                @click="fzTableDailogRef.openDialog(row.id, row.payNo)">
+                分账
+              </el-button>
               <el-button v-if="row.status == 20" icon="CloseBold" text type="primary" @click="refund(row)">
                 退款
               </el-button>
@@ -127,7 +142,7 @@
 
     <!-- 编辑、新增  -->
     <form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
-
+    <fz-table-dailog ref="fzTableDailogRef" @refresh="getDataList(false)" />
   </div>
 </template>
 
@@ -140,10 +155,12 @@ import { displayPrice } from "/@/utils/formatMoney"
 
 // 引入组件
 const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+const FzTableDailog = defineAsyncComponent(() => import('./components/fz-table-dailog.vue'));
 // 定义查询字典
 const { third_pay_order_biz_type, mini_platform_type, third_pay_order_status } = useDict("third_pay_order_biz_type", "mini_platform_type", "third_pay_order_status")
 // 定义变量内容
 const formDialogRef = ref()
+const fzTableDailogRef = ref()
 // 搜索变量
 const queryRef = ref()
 const showSearch = ref(true)

src/views/wallet/wallet-active/form-car-number.vue

@@ -3,9 +3,9 @@
         <el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px"
             v-loading="loading">
             <el-col :span="24" class="mb20">
-                <el-form-item label="生成数量" prop="cardNumber">
-                    <el-input style="width: 100%" v-model="form.cardNumber" :min="10" :max="10" placeholder="请输入卡号"
-                        controls-position="right" />
+                <el-form-item label="卡号" prop="cardNumber">
+                    <el-input style="width: 100%" v-model="form.cardNumber" maxlength="12" placeholder="请输入卡号"
+                        show-word-limit />
                 </el-form-item>
             </el-col>
         </el-form>
@@ -19,7 +19,7 @@
 </template>
 
 <script setup lang="ts" name="FormCarNumber">
-import { useMessage, useMessageBox } from "/@/hooks/message"
+import { useMessage } from "/@/hooks/message"
 import * as walletActiveApi from "/@/api/wallet/wallet-active"
 
 const emit = defineEmits(["refresh"])
@@ -38,8 +38,16 @@ const form = reactive({
 // 定义校验规则
 const dataRules = ref({
     cardNumber: [
-        { required: true, message: "卡号不能为空", trigger: "blue" },
-        { min: 10, max: 10, message: "卡号长度必须为10位", trigger: "blue" }
+        { required: true, message: "卡号不能为空", trigger: "blur" },
+        {
+            validator: (_rule: any, value: string, callback: (error?: Error) => void) => {
+                const length = (value ?? "").trim().length
+                if (length === 0) return callback()
+                if (length === 10 || length === 12) return callback()
+                callback(new Error("卡号长度必须为10位或12位"))
+            },
+            trigger: "blur",
+        },
     ],
 })
 
@@ -93,4 +101,4 @@ const getwalletActiveData = (id: string) => {
 defineExpose({
     openDialog,
 })
-</script>
+</script>

src/views/wallet/wallet-active/index.vue

@@ -30,6 +30,10 @@
 
 			<el-row>
 				<div class="mb8" style="width: 100%">
+					<el-button icon="folder-add" type="primary" class="ml10" @click="uploadExcelRef.show()"
+						v-auth="'wallet_walletActive_import'">
+						导 入
+					</el-button>
 					<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
 						v-auth="'wallet_walletActive_add'">
 						开 卡
@@ -79,6 +83,9 @@
 		<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
 		<form-car-number ref="formCarNumberRef" @refresh="getDataList(false)" />
 		<bind-user-form-dialog ref="bindUserFormDialogRef" @refresh="getDataList(false)" />
+
+		<upload-excel ref="uploadExcelRef" title="开卡导入" url="/wallet/wallet-active/import"
+			temp-url="/admin/sys-file/local/file/wallet_active.xlsx" @refreshDataList="getDataList(false)" />
 	</div>
 </template>
 
@@ -93,9 +100,11 @@ import { ElLoading } from "element-plus"
 const FormDialog = defineAsyncComponent(() => import("./form.vue"))
 const FormCarNumber = defineAsyncComponent(() => import("./form-car-number.vue"))
 const BindUserFormDialog = defineAsyncComponent(() => import("./bind-user-form.vue"))
+
 // 定义查询字典
 const { wallet_type, yes_no_type } = useDict("wallet_type", "yes_no_type")
 // 定义变量内容
+const uploadExcelRef = ref()
 const formDialogRef = ref()
 const formCarNumberRef = ref()
 const bindUserFormDialogRef = ref()