Skip to content

Commit 30371d4

Browse files
YunaiVYunaiV
committed
mall + pay：
1. 优化退款管理的导出实现
1 parent 12014af commit 30371d4

File tree

2 files changed

+47
-34
lines changed

2 files changed

+47
-34
lines changed

‎src/views/pay/order/index.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
<el-tag size="small">{{ orderDetail.merchantOrderId }}</el-tag>
128128
</el-descriptions-item>
129129
<el-descriptions-item label="支付单号">
130-
<el-tag type="warning" v-if="orderDetail.no">{{ orderDetail.no }}</el-tag>
130+
<el-tag type="warning" size="small" v-if="orderDetail.no">{{ orderDetail.no }}</el-tag>
131131
</el-descriptions-item>
132132
</el-descriptions>
133133
<el-descriptions :column="2" label-class-name="desc-label">
@@ -278,7 +278,6 @@ export default {
278278
this.open = true;
279279
});
280280
},
281-
282281
/** 导出按钮操作 */
283282
handleExport() {
284283
// 处理查询参数

‎src/views/pay/refund/index.vue

Lines changed: 46 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
<el-tag size="mini">商户</el-tag> {{scope.row.merchantRefundId}}
7979
</p>
8080
<p class="order-font">
81-
<el-tag size="mini" type="warning">支付</el-tag> {{scope.row.no}}
81+
<el-tag size="mini" type="warning">退款</el-tag> {{scope.row.no}}
8282
</p>
8383
<p class="order-font" v-if="scope.row.channelRefundNo">
8484
<el-tag size="mini" type="success">渠道</el-tag> {{scope.row.channelRefundNo}}
@@ -110,6 +110,11 @@
110110
<span>{{ parseTime(scope.row.successTime) }}</span>
111111
</template>
112112
</el-table-column>
113+
<el-table-column label="支付应用" align="center" prop="successTime" width="100">
114+
<template v-slot="scope">
115+
<span>{{ scope.row.appName }}</span>
116+
</template>
117+
</el-table-column>
113118
<el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
114119
<template v-slot="scope">
115120
<el-button size="mini" type="text" icon="el-icon-search" @click="handleQueryDetails(scope.row)"
@@ -122,64 +127,75 @@
122127
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
123128
@pagination="getList"/>
124129

125-
<!-- 对话框(添加 / 修改) -->
130+
<!-- 对话框(详情) -->
126131
<el-dialog title="退款订单详情" :visible.sync="open" width="700px" append-to-body>
127132
<el-descriptions :column="2" label-class-name="desc-label">
128-
<el-descriptions-item label="应用名称">{{ refundDetail.appName }}</el-descriptions-item>
129-
<el-descriptions-item label="商品名称">{{ refundDetail.subject }}</el-descriptions-item>
133+
<el-descriptions-item label="商户退款单号">
134+
<el-tag size="small">{{ refundDetail.merchantRefundId }}</el-tag>
135+
</el-descriptions-item>
136+
<el-descriptions-item label="渠道退款单号">
137+
<el-tag type="success" size="small" v-if="refundDetail.channelRefundNo">{{ refundDetail.channelRefundNo }}</el-tag>
138+
</el-descriptions-item>
130139
</el-descriptions>
131-
<el-divider></el-divider>
132140
<el-descriptions :column="2" label-class-name="desc-label">
133-
<el-descriptions-item label="商户退款单号">
134-
<el-tag size="mini">{{ refundDetail.merchantRefundNo }}</el-tag>
141+
<el-descriptions-item label="商户支付单号">
142+
<el-tag size="small">{{ refundDetail.merchantOrderId }}</el-tag>
143+
</el-descriptions-item>
144+
<el-descriptions-item label="渠道支付单号">
145+
<el-tag type="success" size="small">{{ refundDetail.channelOrderNo }}</el-tag>
135146
</el-descriptions-item>
136-
<el-descriptions-item label="商户订单号">{{ refundDetail.merchantOrderId }}</el-descriptions-item>
137-
<el-descriptions-item label="交易订单号">{{ refundDetail.tradeNo }}</el-descriptions-item>
138147
</el-descriptions>
139-
<el-divider></el-divider>
148+
<el-descriptions :column="2" label-class-name="desc-label">
149+
<el-descriptions-item label="应用编号">{{ refundDetail.appId }}</el-descriptions-item>
150+
<el-descriptions-item label="应用名称">{{ refundDetail.appName }}</el-descriptions-item>
151+
</el-descriptions>
140152
<el-descriptions :column="2" label-class-name="desc-label">
141153
<el-descriptions-item label="支付金额">
142-
{{ parseFloat(refundDetail.payPrice / 100).toFixed(2) }}
154+
<el-tag type="success" size="small">￥{{ (refundDetail.payPrice / 100.0).toFixed(2) }}</el-tag>
143155
</el-descriptions-item>
144-
<el-descriptions-item label="退款金额" size="mini">
145-
<el-tag class="tag-purple" size="mini">{{ parseFloat(refundDetail.refundPrice / 100).toFixed(2) }}</el-tag>
156+
<el-descriptions-item label="退款金额">
157+
<el-tag size="mini" type="danger">￥{{ (refundDetail.refundPrice / 100.0).toFixed(2) }}</el-tag>
146158
</el-descriptions-item>
159+
</el-descriptions>
160+
<el-descriptions :column="2" label-class-name="desc-label">
147161
<el-descriptions-item label="退款状态">
148162
<dict-tag :type="DICT_TYPE.PAY_REFUND_STATUS" :value="refundDetail.status" />
149163
</el-descriptions-item>
164+
<el-descriptions-item label="退款时间">{{ parseTime(refundDetail.successTime) }}</el-descriptions-item>
165+
</el-descriptions>
166+
<el-descriptions :column="2" label-class-name="desc-label">
150167
<el-descriptions-item label="创建时间">{{ parseTime(refundDetail.createTime) }}</el-descriptions-item>
151-
<el-descriptions-item label="退款成功时间">{{ parseTime(refundDetail.successTime) }}</el-descriptions-item>
152-
<el-descriptions-item label="退款失效时间">{{ parseTime(refundDetail.expireTime) }}</el-descriptions-item>
153168
<el-descriptions-item label="更新时间">{{ parseTime(refundDetail.updateTime) }}</el-descriptions-item>
154169
</el-descriptions>
155-
<el-divider></el-divider>
170+
<!-- 分割线 -->
171+
<el-divider />
156172
<el-descriptions :column="2" label-class-name="desc-label">
157-
<el-descriptions-item label="支付渠道">
158-
{{ refundDetail.channelCodeName }}
173+
<el-descriptions-item label="退款渠道">
174+
<dict-tag :type="DICT_TYPE.PAY_CHANNEL_CODE" :value="refundDetail.channelCode" />
159175
</el-descriptions-item>
160-
<el-descriptions-item label="支付IP" size="mini">
161-
{{refundDetail.userIp}}
162-
</el-descriptions-item>
163-
<el-descriptions-item label="回调地址">{{ refundDetail.notifyUrl }}</el-descriptions-item>
176+
<el-descriptions-item label="退款原因">{{ refundDetail.reason }}</el-descriptions-item>
177+
</el-descriptions>
178+
<el-descriptions :column="2" label-class-name="desc-label">
179+
<el-descriptions-item label="退款 IP">{{ refundDetail.userIp }}</el-descriptions-item>
180+
<el-descriptions-item label="通知 URL">{{ refundDetail.notifyUrl }}</el-descriptions-item>
164181
</el-descriptions>
182+
<!-- 分割线 -->
165183
<el-divider></el-divider>
166184
<el-descriptions :column="2" label-class-name="desc-label">
167-
<el-descriptions-item label="渠道订单号">{{ refundDetail.channelOrderNo }}</el-descriptions-item>
168-
<el-descriptions-item label="渠道退款单号">{{ refundDetail.channelRefundNo }}</el-descriptions-item>
169185
<el-descriptions-item label="渠道错误码">{{refundDetail.channelErrorCode}}</el-descriptions-item>
170186
<el-descriptions-item label="渠道错误码描述">{{refundDetail.channelErrorMsg}}</el-descriptions-item>
171187
</el-descriptions>
172-
<br>
173188
<el-descriptions :column="1" label-class-name="desc-label" direction="vertical" border>
174-
<el-descriptions-item label="渠道额外参数">{{ refundDetail.channelExtras }}</el-descriptions-item>
175-
<el-descriptions-item label="退款原因">{{ refundDetail.reason }}</el-descriptions-item>
189+
<el-descriptions-item label="支付通道异步回调内容">
190+
{{ refundDetail.channelNotifyData }}
191+
</el-descriptions-item>
176192
</el-descriptions>
177193
</el-dialog>
178194
</div>
179195
</template>
180196

181197
<script>
182-
import {getRefundPage, exportRefundExcel, getRefund} from "@/api/pay/refund";
198+
import { getRefundPage, exportRefundExcel, getRefund } from "@/api/pay/refund";
183199
import { getAppList } from "@/api/pay/app";
184200
185201
export default {
@@ -213,7 +229,7 @@ export default {
213229
createTime: []
214230
},
215231
// 支付应用列表集合
216-
appList: null,
232+
appList: [],
217233
// 退款订单详情
218234
refundDetail: {},
219235
};
@@ -263,9 +279,7 @@ export default {
263279
this.$download.excel(response, '退款订单.xls');
264280
}).catch(() => {});
265281
},
266-
/**
267-
* 查看订单详情
268-
*/
282+
/** 详情按钮操作 */
269283
handleQueryDetails(row) {
270284
this.refundDetail = {};
271285
getRefund(row.id).then(response => {

0 commit comments

Comments
 (0)