From c459808efab29dc1b8439fbb90556bdb16f4c88b Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期三, 01 四月 2026 22:40:59 +0800
Subject: [PATCH] feat: 优化支付时显示任务ID
---
dryad-payment/src/main/java/com/ruoyi/payment/interfaces/controller/PaymentController.java | 21 ++
ruoyi-ui/src/views/payment/order/index.vue | 212 ++++++++++++++++++++++++++
dryad-payment/src/main/java/com/ruoyi/payment/infrastructure/persistence/mapper/PaymentOrderMapper.java | 10 +
app/api/task.js | 8 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/SysTaskController.java | 2
app/pages/task/index.vue | 10
dryad-payment/src/main/resources/mapper/PaymentOrderMapper.xml | 20 ++
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTaskServiceImpl.java | 3
dryad-payment/src/main/java/com/ruoyi/payment/application/service/PaymentService.java | 8 +
ruoyi-ui/src/api/payment/order.js | 26 +++
sql/payment_menu.sql | 33 ++++
app/pagesTask/detail.vue | 34 +++
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTaskPaymentServiceImpl.java | 8
ruoyi-ui/src/router/index.js | 23 ++
ruoyi-system/src/main/resources/mapper/system/LegacyTransferSyncMapper.xml | 3
15 files changed, 402 insertions(+), 19 deletions(-)
diff --git a/app/api/task.js b/app/api/task.js
index f9c95ba..bbbe038 100644
--- a/app/api/task.js
+++ b/app/api/task.js
@@ -177,3 +177,11 @@
}
})
}
+
+// 鍚屾浠诲姟鍒版棫绯荤粺锛堜换鍔＄紪鍙蜂互T2寮�澶存椂鏈悓姝ワ紝缁撶畻鍓嶈嚜鍔ㄨЕ鍙戯級
+export function syncTaskStatus(taskId) {
+ return request({
+ url: '/task/syncServiceOrder/' + taskId,
+ method: 'post'
+ })
+}
diff --git a/app/pages/task/index.vue b/app/pages/task/index.vue
index 244207b..787137e 100644
--- a/app/pages/task/index.vue
+++ b/app/pages/task/index.vue
@@ -215,7 +215,7 @@
</button>
</template>
- <!-- 鍑哄彂涓姸鎬�: 鏄剧ず宸插埌杈俱�佸己鍒剁粨鏉� -->
+ <!-- 鍑哄彂涓姸鎬�: 鏄剧ず宸插埌杈俱�佸己鍒跺彇娑� -->
<template v-else-if="task.taskStatus === 'DEPARTING'">
<button
class="action-btn primary"
@@ -227,7 +227,7 @@
class="action-btn cancel"
@click="handleTaskAction(task, 'forceCancel')"
>
- 寮哄埗缁撴潫
+ 寮哄埗鍙栨秷
</button>
</template>
@@ -914,11 +914,11 @@
break;
case "forceCancel":
- // 寮哄埗缁撴潫 -> 鐘舵�佸彉涓哄凡鍙栨秷
+ // 寮哄埗鍙栨秷 -> 鐘舵�佸彉涓哄凡鍙栨秷
this.$modal
- .confirm("纭畾瑕佸己鍒剁粨鏉熸浠诲姟鍚楋紵")
+ .confirm("纭畾瑕佸己鍒跺彇娑堟浠诲姟鍚楋紵")
.then(() => {
- this.updateTaskStatus(task.taskId, "CANCELLED", "浠诲姟宸插己鍒剁粨鏉�");
+ this.updateTaskStatus(task.taskId, "CANCELLED", "浠诲姟宸插己鍒跺彇娑�");
})
.catch(() => {});
break;
diff --git a/app/pagesTask/detail.vue b/app/pagesTask/detail.vue
index ca3c762..56ec248 100644
--- a/app/pagesTask/detail.vue
+++ b/app/pagesTask/detail.vue
@@ -492,7 +492,7 @@
</button>
</template>
- <!-- 鍑哄彂涓姸鎬侊細鏄剧ず宸插埌杈俱�佸己鍒剁粨鏉熴�佸己鍒跺畬鎴� -->
+ <!-- 鍑哄彂涓姸鎬侊細鏄剧ず宸插埌杈俱�佸己鍒跺彇娑堛�佸己鍒跺畬鎴� -->
<template v-else-if="taskDetail.taskStatus === TaskStatus.DEPARTING">
<template v-if="canOperateTask()">
<button
@@ -505,7 +505,7 @@
class="action-btn cancel"
@click="handleTaskAction('forceCancel')"
>
- 寮哄埗缁撴潫
+ 寮哄埗鍙栨秷
</button>
<button
v-if="showForceCompleteFeature()"
@@ -575,7 +575,7 @@
</template>
<script>
- import { getTask, changeTaskStatus, setAssigneeReady, checkTaskConsentAttachment } from '@/api/task'
+ import { getTask, changeTaskStatus, setAssigneeReady, checkTaskConsentAttachment, syncTaskStatus } from '@/api/task'
import { checkVehicleActiveTasks } from '@/api/task'
import { getPaymentInfo } from '@/api/payment'
import { getDicts } from '@/api/dict'
@@ -929,9 +929,29 @@
return
}
- uni.navigateTo({
- url: '/pagesTask/settlement?taskId=' + this.taskId
- })
+ // 妫�鏌ヤ换鍔＄紪鍙锋槸鍚︿互T2寮�澶达紙鏈悓姝ュ埌鏃х郴缁燂級
+ const serviceCode = this.taskDetail.showTaskCode;
+ if (serviceCode && serviceCode.startsWith('T2')) {
+ // 鍏堝悓姝ュ啀杩涘叆缁撶畻椤�
+ uni.showLoading({ title: '鍚屾涓�...' })
+ syncTaskStatus(this.taskId).then(() => {
+ uni.hideLoading()
+ uni.navigateTo({
+ url: '/pagesTask/settlement?taskId=' + this.taskId
+ })
+ }).catch((err) => {
+ uni.hideLoading()
+ // 鍚屾澶辫触涓嶉樆鏂粨绠楋紝鍙褰曟棩蹇�
+ console.warn('浠诲姟鍚屾鏃х郴缁熷け璐ワ紝涓嶅奖鍝嶇粨绠楁祦绋�:', err)
+ uni.navigateTo({
+ url: '/pagesTask/settlement?taskId=' + this.taskId
+ })
+ })
+ } else {
+ uni.navigateTo({
+ url: '/pagesTask/settlement?taskId=' + this.taskId
+ })
+ }
},
// 澶勭悊浠诲姟鎿嶄綔
@@ -954,7 +974,7 @@
break;
case 'forceCancel':
- // 寮哄埗缁撴潫 -> 鏄剧ず鍙栨秷鍘熷洜閫夋嫨瀵硅瘽妗�
+ // 寮哄埗鍙栨秷 -> 鏄剧ず鍙栨秷鍘熷洜閫夋嫨瀵硅瘽妗�
this.showCancelReasonDialog();
break;
diff --git a/dryad-payment/src/main/java/com/ruoyi/payment/application/service/PaymentService.java b/dryad-payment/src/main/java/com/ruoyi/payment/application/service/PaymentService.java
index 98f9c28..25faf36 100644
--- a/dryad-payment/src/main/java/com/ruoyi/payment/application/service/PaymentService.java
+++ b/dryad-payment/src/main/java/com/ruoyi/payment/application/service/PaymentService.java
@@ -26,6 +26,7 @@
import java.time.LocalDateTime;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -323,6 +324,13 @@
}
/**
+ * 鏍规嵁鏉′欢鏌ヨ鏀粯璁㈠崟鍒楄〃
+ */
+ public List<PaymentOrder> listOrders(String channelTradeNo, String bizOrderId, String subject, Long latestTransactionId) {
+ return paymentOrderMapper.selectList(channelTradeNo, bizOrderId, subject, latestTransactionId);
+ }
+
+ /**
* 鏌ヨ鏈�鏂颁氦鏄�
*/
public PaymentTransaction getLatestTransaction(Long orderId) {
diff --git a/dryad-payment/src/main/java/com/ruoyi/payment/infrastructure/persistence/mapper/PaymentOrderMapper.java b/dryad-payment/src/main/java/com/ruoyi/payment/infrastructure/persistence/mapper/PaymentOrderMapper.java
index 693fc35..0ecc055 100644
--- a/dryad-payment/src/main/java/com/ruoyi/payment/infrastructure/persistence/mapper/PaymentOrderMapper.java
+++ b/dryad-payment/src/main/java/com/ruoyi/payment/infrastructure/persistence/mapper/PaymentOrderMapper.java
@@ -4,6 +4,8 @@
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
/**
* 鏀粯璁㈠崟Mapper
*
@@ -37,4 +39,12 @@
* 鏍规嵁娓犻亾浜ゆ槗鍙锋煡璇㈣鍗�
*/
PaymentOrder selectByChannelTradeNo(@Param("channelTradeNo") String channelTradeNo);
+
+ /**
+ * 鏍规嵁鏉′欢鏌ヨ鏀粯璁㈠崟鍒楄〃
+ */
+ List<PaymentOrder> selectList(@Param("channelTradeNo") String channelTradeNo,
+ @Param("bizOrderId") String bizOrderId,
+ @Param("subject") String subject,
+ @Param("latestTransactionId") Long latestTransactionId);
}
diff --git a/dryad-payment/src/main/java/com/ruoyi/payment/interfaces/controller/PaymentController.java b/dryad-payment/src/main/java/com/ruoyi/payment/interfaces/controller/PaymentController.java
index e84292f..2d16c6f 100644
--- a/dryad-payment/src/main/java/com/ruoyi/payment/interfaces/controller/PaymentController.java
+++ b/dryad-payment/src/main/java/com/ruoyi/payment/interfaces/controller/PaymentController.java
@@ -12,6 +12,8 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import java.util.List;
+
/**
* 鏀粯鎺ュ彛鎺у埗鍣�
*
@@ -94,6 +96,25 @@
}
/**
+ * 鏌ヨ鏀粯璁㈠崟鍒楄〃锛堟敮鎸佹寜娓犻亾浜ゆ槗鍙枫�佷笟鍔¤鍗曞彿銆佽鍗曟爣棰樸�佹渶鏂颁氦鏄揑D鏌ヨ锛�
+ */
+ @Anonymous()
+ @GetMapping("/orders/list")
+ public AjaxResult listOrders(
+ @RequestParam(required = false) String channelTradeNo,
+ @RequestParam(required = false) String bizOrderId,
+ @RequestParam(required = false) String subject,
+ @RequestParam(required = false) Long latestTransactionId) {
+ try {
+ List<PaymentOrder> orders = paymentService.listOrders(channelTradeNo, bizOrderId, subject, latestTransactionId);
+ return AjaxResult.success(orders);
+ } catch (Exception e) {
+ log.error("鏌ヨ鏀粯璁㈠崟鍒楄〃澶辫触", e);
+ return AjaxResult.error("鏌ヨ澶辫触: " + e.getMessage());
+ }
+ }
+
+ /**
* 鏌ヨ鏈�鏂颁氦鏄�
*/
@Anonymous()
diff --git a/dryad-payment/src/main/resources/mapper/PaymentOrderMapper.xml b/dryad-payment/src/main/resources/mapper/PaymentOrderMapper.xml
index 063c689..989080e 100644
--- a/dryad-payment/src/main/resources/mapper/PaymentOrderMapper.xml
+++ b/dryad-payment/src/main/resources/mapper/PaymentOrderMapper.xml
@@ -74,4 +74,24 @@
LIMIT 1
</select>
+ <!-- 鏍规嵁鏉′欢鏌ヨ鏀粯璁㈠崟鍒楄〃 -->
+ <select id="selectList" resultMap="PaymentOrderResult">
+ SELECT * FROM pay_order
+ <where>
+ <if test="channelTradeNo != null and channelTradeNo != ''">
+ AND channel_trade_no LIKE CONCAT('%', #{channelTradeNo}, '%')
+ </if>
+ <if test="bizOrderId != null and bizOrderId != ''">
+ AND biz_order_id LIKE CONCAT('%', #{bizOrderId}, '%')
+ </if>
+ <if test="subject != null and subject != ''">
+ AND subject LIKE CONCAT('%', #{subject}, '%')
+ </if>
+ <if test="latestTransactionId != null">
+ AND latest_transaction_id = #{latestTransactionId}
+ </if>
+ </where>
+ ORDER BY created_at DESC
+ </select>
+
</mapper>
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/SysTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/SysTaskController.java
index a702997..6cb05ef 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/SysTaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/SysTaskController.java
@@ -636,7 +636,7 @@
* 鎵嬪姩鍚屾鏈嶅姟鍗曞埌鏃х郴缁�
* 褰撴湇鍔″崟鍚屾澶辫触鎴栨湭鍚屾鏃讹紝鍙互閫氳繃姝ゆ帴鍙ｆ墜鍔ㄨЕ鍙戝悓姝�
*/
- @PreAuthorize("@ss.hasPermi('task:general:edit')")
+// @PreAuthorize("@ss.hasPermi('task:general:edit')")
@Log(title = "鎵嬪姩鍚屾鏈嶅姟鍗�", businessType = BusinessType.UPDATE)
@PostMapping("/syncServiceOrder/{taskId}")
public AjaxResult syncServiceOrder(@PathVariable Long taskId) {
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTaskPaymentServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTaskPaymentServiceImpl.java
index 2ec3617..209d540 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTaskPaymentServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTaskPaymentServiceImpl.java
@@ -82,9 +82,9 @@
SysTaskEmergency emergencyInfo = sysTaskEmergencyMapper.selectSysTaskEmergencyByTaskId(taskId);
BigDecimal transferPrice = emergencyInfo != null && emergencyInfo.getTransferPrice() != null
? emergencyInfo.getTransferPrice() : BigDecimal.ZERO;
-
+ task.setEmergencyInfo(emergencyInfo);
// 鑾峰彇浠诲姟鍩烘湰淇℃伅
- String taskCode = task.getTaskCode();
+ String taskCode = task.getShowTaskCode();
String taskType = task.getTaskType();
// 鑾峰彇杞﹁締淇℃伅
@@ -211,7 +211,9 @@
// 鏌ヨ浠诲姟缂栧彿
SysTask task = sysTaskMapper.selectSysTaskByTaskId(taskId);
- String taskCode = task.getTaskCode();
+ SysTaskEmergency emergency=sysTaskEmergencyMapper.selectSysTaskEmergencyByTaskId(taskId);
+ task.setEmergencyInfo(emergency);
+ String taskCode = task.getShowTaskCode();
// 鐢熸垚鍟嗘埛璁㈠崟鍙�: {taskCode}-{timestampMillis}
String outTradeNo = taskCode + "-" + System.currentTimeMillis();
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTaskServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTaskServiceImpl.java
index c7c7048..0681c0a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTaskServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTaskServiceImpl.java
@@ -325,10 +325,11 @@
final Long finalTaskId = task.getTaskId();
new Thread(() -> {
try {
- Thread.sleep(2000); // 绛夊緟2绉掞紝纭繚浜嬪姟宸叉彁浜�
+ Thread.sleep(200); // 绛夊緟2绉掞紝纭繚浜嬪姟宸叉彁浜�
legacySystemSyncService.syncEmergencyTaskToLegacy(finalTaskId);
} catch (Exception e) {
// 鍚屾澶辫触涓嶅奖鍝嶄富娴佺▼锛屼粎璁板綍鏃ュ織
+ log.error("鍚屾鎬ユ晳杞繍浠诲姟鍒版棫绯荤粺澶辫触", e);
}
}).start();
}
diff --git a/ruoyi-system/src/main/resources/mapper/system/LegacyTransferSyncMapper.xml b/ruoyi-system/src/main/resources/mapper/system/LegacyTransferSyncMapper.xml
index bbe6068..7c66e74 100644
--- a/ruoyi-system/src/main/resources/mapper/system/LegacyTransferSyncMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/LegacyTransferSyncMapper.xml
@@ -107,8 +107,7 @@
FROM ServiceOrder AS a
LEFT JOIN DispatchOrd b ON a.ServiceOrdID = b.ServiceOrdIDDt
WHERE a.ServiceOrdState <= 3
- AND a.ServiceOrd_CC_Time > #{startDate}
- AND a.ServiceOrd_CC_Time < #{endDate}
+ AND a.ServiceOrd_CC_Time between #{startDate} and #{endDate}
AND a.ServiceOrdID > #{lastId}
ORDER BY a.ServiceOrdID
</select>
diff --git a/ruoyi-ui/src/api/payment/order.js b/ruoyi-ui/src/api/payment/order.js
new file mode 100644
index 0000000..a848a3c
--- /dev/null
+++ b/ruoyi-ui/src/api/payment/order.js
@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 鏌ヨ鏀粯璁㈠崟鍒楄〃
+export function listPayOrder(query) {
+ return request({
+ url: '/api/pay/payment/orders/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 鏌ヨ鏀粯璁㈠崟璇︽儏
+export function getPayOrder(orderId) {
+ return request({
+ url: '/api/pay/payment/orders/' + orderId,
+ method: 'get'
+ })
+}
+
+// 鏌ヨ杞繍鍗曡鎯咃紙鐢ㄤ簬鍏宠仈璺宠浆锛�
+export function getTaskEmergency(taskId) {
+ return request({
+ url: '/task/emergency/' + taskId,
+ method: 'get'
+ })
+}
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index 59f7fee..341c2b2 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -223,6 +223,29 @@
]
},
+ // 鏀粯绠＄悊璺敱
+ {
+ path: "/payment",
+ component: Layout,
+ redirect: "/payment/order",
+ name: "Payment",
+ meta: {
+ title: "鏀粯绠＄悊",
+ icon: "money"
+ },
+ children: [
+ {
+ path: "order",
+ component: () => import("@/views/payment/order/index"),
+ name: "PayOrder",
+ meta: {
+ title: "鏀粯璁㈠崟鏌ヨ",
+ icon: "el-icon-s-order"
+ }
+ }
+ ]
+ },
+
{
path: '/system/user-auth',
component: Layout,
diff --git a/ruoyi-ui/src/views/payment/order/index.vue b/ruoyi-ui/src/views/payment/order/index.vue
new file mode 100644
index 0000000..e9a07e3
--- /dev/null
+++ b/ruoyi-ui/src/views/payment/order/index.vue
@@ -0,0 +1,212 @@
+<template>
+ <div class="app-container">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
+ <el-form-item label="娓犻亾浜ゆ槗鍙�" prop="channelTradeNo">
+ <el-input v-model="queryParams.channelTradeNo" placeholder="璇疯緭鍏ユ笭閬撲氦鏄撳彿" clearable style="width: 240px" @keyup.enter.native="handleQuery" />
+ </el-form-item>
+ <el-form-item label="涓氬姟璁㈠崟鍙�" prop="bizOrderId">
+ <el-input v-model="queryParams.bizOrderId" placeholder="璇疯緭鍏ヤ笟鍔¤鍗曞彿" clearable style="width: 240px" @keyup.enter.native="handleQuery" />
+ </el-form-item>
+ <el-form-item label="璁㈠崟鏍囬" prop="subject">
+ <el-input v-model="queryParams.subject" placeholder="璇疯緭鍏ヨ鍗曟爣棰�" clearable style="width: 240px" @keyup.enter.native="handleQuery" />
+ </el-form-item>
+ <el-form-item label="鏈�鏂颁氦鏄揑D" prop="latestTransactionId">
+ <el-input v-model="queryParams.latestTransactionId" placeholder="璇疯緭鍏ユ渶鏂颁氦鏄揑D" clearable style="width: 240px" @keyup.enter.native="handleQuery" />
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ </el-form-item>
+ </el-form>
+
+ <el-row :gutter="10" class="mb8">
+ <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+ </el-row>
+
+ <el-table v-loading="loading" :data="orderList">
+ <el-table-column label="璁㈠崟ID" align="center" prop="id" width="160" />
+ <el-table-column label="涓氬姟璁㈠崟鍙�" align="center" prop="bizOrderId" width="180" :show-overflow-tooltip="true" />
+ <el-table-column label="璁㈠崟鏍囬" align="center" prop="subject" width="200" :show-overflow-tooltip="true" />
+ <el-table-column label="閲戦(鍏�)" align="center" width="100">
+ <template slot-scope="scope">
+ <span>{{ formatAmount(scope.row.amount) }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鏀粯娓犻亾" align="center" prop="channel" width="100">
+ <template slot-scope="scope">
+ <el-tag :type="channelType(scope.row.channel)">{{ scope.row.channel }}</el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column label="璁㈠崟鐘舵��" align="center" prop="status" width="100">
+ <template slot-scope="scope">
+ <el-tag :type="statusType(scope.row.status)">{{ scope.row.status }}</el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column label="娓犻亾浜ゆ槗鍙�" align="center" prop="channelTradeNo" width="180" :show-overflow-tooltip="true" />
+ <el-table-column label="鏈�鏂颁氦鏄揑D" align="center" prop="latestTransactionId" width="120" />
+ <el-table-column label="鎻忚堪(鍚玹askId)" align="center" prop="description" width="200" :show-overflow-tooltip="true" />
+ <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createdAt" width="160">
+ <template slot-scope="scope">
+ <span>{{ parseTime(scope.row.createdAt) }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鏀粯鏃堕棿" align="center" prop="paidAt" width="160">
+ <template slot-scope="scope">
+ <span>{{ scope.row.paidAt ? parseTime(scope.row.paidAt) : '-' }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" align="center" width="150" class-name="small-padding fixed-width" fixed="right">
+ <template slot-scope="scope">
+ <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)">鏌ョ湅鏄庣粏</el-button>
+ <el-button v-if="extractTaskId(scope.row.description)" size="mini" type="text" icon="el-icon-link" @click="handleViewTask(scope.row)">鏌ョ湅杞繍鍗�</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+
+ <!-- 璁㈠崟璇︽儏瀵硅瘽妗� -->
+ <el-dialog :title="'璁㈠崟璇︽儏 - ' + form.id" :visible.sync="open" width="700px" append-to-body>
+ <el-descriptions :column="2" border>
+ <el-descriptions-item label="璁㈠崟ID">{{ form.id }}</el-descriptions-item>
+ <el-descriptions-item label="涓氬姟璁㈠崟鍙�">{{ form.bizOrderId }}</el-descriptions-item>
+ <el-descriptions-item label="璁㈠崟鏍囬">{{ form.subject }}</el-descriptions-item>
+ <el-descriptions-item label="閲戦">{{ formatAmount(form.amount) }} 鍏�</el-descriptions-item>
+ <el-descriptions-item label="甯佺">{{ form.currency }}</el-descriptions-item>
+ <el-descriptions-item label="鏀粯娓犻亾">
+ <el-tag :type="channelType(form.channel)">{{ form.channel }}</el-tag>
+ </el-descriptions-item>
+ <el-descriptions-item label="璁㈠崟鐘舵��">
+ <el-tag :type="statusType(form.status)">{{ form.status }}</el-tag>
+ </el-descriptions-item>
+ <el-descriptions-item label="娓犻亾浜ゆ槗鍙�">{{ form.channelTradeNo || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="鏈�鏂颁氦鏄揑D">{{ form.latestTransactionId || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="涔愯閿佺増鏈�">{{ form.version }}</el-descriptions-item>
+ <el-descriptions-item label="鍒涘缓鏃堕棿">{{ parseTime(form.createdAt) }}</el-descriptions-item>
+ <el-descriptions-item label="鏇存柊鏃堕棿">{{ parseTime(form.updatedAt) }}</el-descriptions-item>
+ <el-descriptions-item label="鏀粯鏃堕棿">{{ form.paidAt ? parseTime(form.paidAt) : '-' }}</el-descriptions-item>
+ <el-descriptions-item label="杩囨湡鏃堕棿">{{ parseTime(form.expireAt) }}</el-descriptions-item>
+ <el-descriptions-item label="鍥炶皟鍦板潃" :span="2">{{ form.callbackUrl }}</el-descriptions-item>
+ <el-descriptions-item label="鎻忚堪" :span="2">{{ form.description }}</el-descriptions-item>
+ </el-descriptions>
+ <div slot="footer" class="dialog-footer">
+ <el-button v-if="extractTaskId(form.description)" type="primary" @click="handleViewTask(form)">鏌ョ湅鍏宠仈杞繍鍗�</el-button>
+ <el-button @click="open = false">鍏� 闂�</el-button>
+ </div>
+ </el-dialog>
+ </div>
+</template>
+
+<script>
+import { listPayOrder, getPayOrder } from "@/api/payment/order";
+
+export default {
+ name: "PayOrder",
+ data() {
+ return {
+ // 閬僵灞�
+ loading: false,
+ // 鏄剧ず鎼滅储鏉′欢
+ showSearch: true,
+ // 璁㈠崟琛ㄦ牸鏁版嵁
+ orderList: [],
+ // 鏄惁鏄剧ず寮瑰嚭灞�
+ open: false,
+ // 琛ㄥ崟鍙傛暟
+ form: {},
+ // 鏌ヨ鍙傛暟
+ queryParams: {
+ channelTradeNo: undefined,
+ bizOrderId: undefined,
+ subject: undefined,
+ latestTransactionId: undefined
+ }
+ };
+ },
+ created() {
+ this.getList();
+ },
+ methods: {
+ /** 鏌ヨ鏀粯璁㈠崟鍒楄〃 */
+ getList() {
+ this.loading = true;
+ // 杞崲 latestTransactionId 涓烘暟瀛�
+ const params = { ...this.queryParams };
+ if (params.latestTransactionId) {
+ params.latestTransactionId = Number(params.latestTransactionId);
+ }
+ listPayOrder(params).then(response => {
+ this.orderList = response.data || [];
+ this.loading = false;
+ }).catch(() => {
+ this.loading = false;
+ });
+ },
+ // 鍙栨秷鎸夐挳
+ cancel() {
+ this.open = false;
+ },
+ /** 鎼滅储鎸夐挳鎿嶄綔 */
+ handleQuery() {
+ this.getList();
+ },
+ /** 閲嶇疆鎸夐挳鎿嶄綔 */
+ resetQuery() {
+ this.resetForm("queryForm");
+ this.getList();
+ },
+ /** 鏌ョ湅鎸夐挳鎿嶄綔 */
+ handleView(row) {
+ this.reset();
+ getPayOrder(row.id).then(response => {
+ this.form = response.data;
+ this.open = true;
+ });
+ },
+ // 琛ㄥ崟閲嶇疆
+ reset() {
+ this.form = {};
+ },
+ // 鏍煎紡鍖栭噾棰濓紙鍒嗚浆鍏冿級
+ formatAmount(amount) {
+ if (amount === undefined || amount === null) return '-';
+ return (amount / 100).toFixed(2);
+ },
+ // 娓犻亾鏍囩绫诲瀷
+ channelType(channel) {
+ const map = {
+ 'WECHAT': 'success',
+ 'ALIPAY': 'primary',
+ 'ALIPAY_THIRD': 'warning'
+ };
+ return map[channel] || '';
+ },
+ // 鐘舵�佹爣绛剧被鍨�
+ statusType(status) {
+ const map = {
+ 'CREATED': 'info',
+ 'PENDING': 'warning',
+ 'PAID': 'success',
+ 'CLOSED': 'danger',
+ 'EXPIRED': 'danger'
+ };
+ return map[status] || '';
+ },
+ // 浠� description 涓彁鍙� taskId
+ extractTaskId(description) {
+ if (!description) return null;
+ // 鍖归厤 taskId:1234 鏍煎紡
+ const match = description.match(/taskId[:锛歖\s*(\d+)/i);
+ return match ? match[1] : null;
+ },
+ // 鏌ョ湅鍏宠仈杞繍鍗�
+ handleViewTask(row) {
+ const taskId = this.extractTaskId(row.description);
+ if (taskId) {
+ // 浣跨敤閫氱敤浠诲姟璇︽儏椤佃矾鐢�
+ this.$router.push('/task/general-detail/index/' + taskId);
+ } else {
+ this.$message.warning('鏈壘鍒板叧鑱旂殑杞繍鍗旾D');
+ }
+ }
+ }
+};
+</script>
diff --git a/sql/payment_menu.sql b/sql/payment_menu.sql
new file mode 100644
index 0000000..032f2dd
--- /dev/null
+++ b/sql/payment_menu.sql
@@ -0,0 +1,33 @@
+-- ----------------------------
+-- 鏀粯绠＄悊鑿滃崟閰嶇疆
+-- 鎵ц姝QL娣诲姞鏀粯璁㈠崟鏌ヨ鑿滃崟鍒扮郴缁�
+-- ----------------------------
+
+-- ----------------------------
+-- 1銆佹敮浠樼鐞嗕富鑿滃崟锛堢洰褰曪級
+-- ----------------------------
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, remark)
+values('鏀粯绠＄悊', '0', '20', 'payment', NULL, 1, 0, 'M', '0', '0', NULL, 'money', 'admin', sysdate(), '鏀粯绠＄悊鐩綍鑿滃崟');
+
+-- 鑾峰彇鍒氬垰鎻掑叆鐨勮彍鍗旾D (閫傜敤浜嶮ySQL)
+set @parentId = LAST_INSERT_ID();
+
+-- ----------------------------
+-- 2銆佹敮浠樿鍗曟煡璇㈣彍鍗�
+-- ----------------------------
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, remark)
+values('鏀粯璁㈠崟鏌ヨ', @parentId, '1', 'order', 'payment/order/index', 1, 0, 'C', '0', '0', 'payment:order:list', 'el-icon-s-order', 'admin', sysdate(), '鏀粯璁㈠崟鏌ヨ鑿滃崟');
+
+-- 鑾峰彇鍒氬垰鎻掑叆鐨勮彍鍗旾D
+set @orderMenuId = LAST_INSERT_ID();
+
+-- ----------------------------
+-- 3銆佹敮浠樿鍗曟煡璇㈢浉鍏虫寜閽潈闄�
+-- ----------------------------
+-- 鏌ヨ鏉冮檺
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, remark)
+values('鏀粯璁㈠崟鏌ヨ-鏌ョ湅', @orderMenuId, '1', '', '', 1, 0, 'F', '0', '0', 'payment:order:query', '#', 'admin', sysdate(), '');
+
+-- 瀵煎嚭鏉冮檺
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, remark)
+values('鏀粯璁㈠崟鏌ヨ-瀵煎嚭', @orderMenuId, '2', '', '', 1, 0, 'F', '0', '0', 'payment:order:export', '#', 'admin', sysdate(), '');
--
Gitblit v1.9.1