mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-20 02:55:04 +08:00
新增退款金额字段
This commit is contained in:
@@ -884,6 +884,7 @@ public class OrderService {
|
|||||||
payInfo.setPayAmount(bigDecimal.toString());
|
payInfo.setPayAmount(bigDecimal.toString());
|
||||||
payInfo.setPayStatus(orderBasicInfo.getPayStatus());
|
payInfo.setPayStatus(orderBasicInfo.getPayStatus());
|
||||||
payInfo.setPayTime(DateUtils.formatDateTime(orderBasicInfo.getPayTime()));
|
payInfo.setPayTime(DateUtils.formatDateTime(orderBasicInfo.getPayTime()));
|
||||||
|
payInfo.setRefundAmount(orderPayRecord.getRefundAmount().toString());
|
||||||
String payMode = orderPayRecord.getPayMode();
|
String payMode = orderPayRecord.getPayMode();
|
||||||
if (StringUtils.equals(payMode, OrderPayRecordEnum.PRINCIPAL_BALANCE_PAYMENT.getValue())
|
if (StringUtils.equals(payMode, OrderPayRecordEnum.PRINCIPAL_BALANCE_PAYMENT.getValue())
|
||||||
|| StringUtils.equals(payMode, OrderPayRecordEnum.GIFT_BALANCE_PAYMENT.getValue())) {
|
|| StringUtils.equals(payMode, OrderPayRecordEnum.GIFT_BALANCE_PAYMENT.getValue())) {
|
||||||
|
|||||||
@@ -140,4 +140,11 @@ public class AdapayMemberService {
|
|||||||
adapaySettleAccount.setAreaCode(dto.getAreaCode());
|
adapaySettleAccount.setAreaCode(dto.getAreaCode());
|
||||||
adapaySettleAccountService.insertAdapaySettleAccount(adapaySettleAccount);
|
adapaySettleAccountService.insertAdapaySettleAccount(adapaySettleAccount);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 查询汇付会员账户余额
|
||||||
|
*/
|
||||||
|
public void queryAdapayAccountBalance() {
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,6 +29,8 @@ public class OrderDetailInfoVO {
|
|||||||
// 支付信息
|
// 支付信息
|
||||||
private List<PayRecord> payRecordList;
|
private List<PayRecord> payRecordList;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// 枪口监控信息
|
// 枪口监控信息
|
||||||
private List<PileMonitorData> realTimeMonitorDataList;
|
private List<PileMonitorData> realTimeMonitorDataList;
|
||||||
|
|
||||||
@@ -64,6 +66,7 @@ public class OrderDetailInfoVO {
|
|||||||
private String payTime; // 支付时间
|
private String payTime; // 支付时间
|
||||||
private String outTradeNo; // 微信商户订单号 real_time_monitor_data
|
private String outTradeNo; // 微信商户订单号 real_time_monitor_data
|
||||||
private String transactionId; // 微信支付订单号
|
private String transactionId; // 微信支付订单号
|
||||||
|
private String refundAmount; // 退款金额
|
||||||
}
|
}
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
|
|||||||
@@ -173,25 +173,6 @@
|
|||||||
<div class="marginTop"></div>
|
<div class="marginTop"></div>
|
||||||
</el-card>
|
</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">
|
<el-card class="cardStyle">
|
||||||
<h3>设备信息</h3>
|
<h3>设备信息</h3>
|
||||||
|
|||||||
Reference in New Issue
Block a user