新增退款金额字段

This commit is contained in:
2023-06-13 09:20:24 +08:00
parent bcc3979f9c
commit 80170efc96
4 changed files with 11 additions and 19 deletions

View File

@@ -884,6 +884,7 @@ public class OrderService {
payInfo.setPayAmount(bigDecimal.toString());
payInfo.setPayStatus(orderBasicInfo.getPayStatus());
payInfo.setPayTime(DateUtils.formatDateTime(orderBasicInfo.getPayTime()));
payInfo.setRefundAmount(orderPayRecord.getRefundAmount().toString());
String payMode = orderPayRecord.getPayMode();
if (StringUtils.equals(payMode, OrderPayRecordEnum.PRINCIPAL_BALANCE_PAYMENT.getValue())
|| StringUtils.equals(payMode, OrderPayRecordEnum.GIFT_BALANCE_PAYMENT.getValue())) {

View File

@@ -140,4 +140,11 @@ public class AdapayMemberService {
adapaySettleAccount.setAreaCode(dto.getAreaCode());
adapaySettleAccountService.insertAdapaySettleAccount(adapaySettleAccount);
}
/**
* 查询汇付会员账户余额
*/
public void queryAdapayAccountBalance() {
}
}

View File

@@ -29,6 +29,8 @@ public class OrderDetailInfoVO {
// 支付信息
private List<PayRecord> payRecordList;
// 枪口监控信息
private List<PileMonitorData> realTimeMonitorDataList;
@@ -64,6 +66,7 @@ public class OrderDetailInfoVO {
private String payTime; // 支付时间
private String outTradeNo; // 微信商户订单号 real_time_monitor_data
private String transactionId; // 微信支付订单号
private String refundAmount; // 退款金额
}
@Data

View File

@@ -173,25 +173,6 @@
<div class="marginTop"></div>
</el-card>
<!-- 退款信息 -->
<el-card class="cardStyle">
<h3>退款信息</h3>
<el-table style="width: 100%" :data="payDetail" border>
<el-table-column prop="payAmount" label="支付金额" align="center"/>
<el-table-column prop="payModeDesc" label="支付方式" align="center"/>
<el-table-column prop="payStatus" label="支付状态" align="center">
<template slot-scope="scope">
<span>{{
scope.row.payStatus === "1" ? "支付完成" : "待支付"
}}</span>
</template>
</el-table-column>
<el-table-column prop="payTime" label="支付时间" align="center"/>
<el-table-column prop="outTradeNo" label="商务单号" align="center"/>
</el-table>
<div class="marginTop"></div>
</el-card>
<!-- 设备信息 -->
<el-card class="cardStyle">
<h3>设备信息</h3>