autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-07-10 00:48:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

修改支付记录展示

Browse Source
This commit is contained in:
Guoqs
2024-09-11 14:45:44 +08:00
parent 6e56f0a5a8
commit d74349c69e
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -1287,7 +1287,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
logger.info("订单分账逻辑, 运营商id:{}, 非延时分账商户, 不进行订单分账处理", merchantId); logger.info("订单分账逻辑, 运营商id:{}, 非延时分账商户, 不进行订单分账处理", merchantId);
return; return;
} }
// 查询运营商有没有开通结算账户 // 查询运营商有没有开通结算账户
AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMerchantId(merchantId); AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMerchantId(merchantId);
if (adapayMemberAccount == null) { if (adapayMemberAccount == null) {

18
jsowell-ui/src/views/order/order/orderDetail.vue
View File

@@ -168,7 +168,7 @@
<!-- 支付信息 --> <!-- 支付信息 -->
<el-card class="cardStyle"> <el-card class="cardStyle">
<h3>支付信息</h3> <h3>支付信息</h3>
<template v-if="payDetail.length !== 0"> <!-- <template v-if="payDetail.length !== 0">
<el-descriptions direction="vertical" :column="6" border :contentStyle="CS" :label-style="LS" <el-descriptions direction="vertical" :column="6" border :contentStyle="CS" :label-style="LS"
v-for="(item, index) in payDetail" :key="index"> v-for="(item, index) in payDetail" :key="index">
<el-descriptions-item label="支付金额">{{ <el-descriptions-item label="支付金额">{{
@@ -179,10 +179,10 @@
item.payModeDesc item.payModeDesc
}} }}
</el-descriptions-item> </el-descriptions-item>
<!--<el-descriptions-item label="支付状态">{{ &lt;!&ndash;<el-descriptions-item label="支付状态">{{
item.payStatus === "1" ? "支付完成" : "待支付" item.payStatus === "1" ? "支付完成" : "待支付"
}} }}
</el-descriptions-item>--> </el-descriptions-item>&ndash;&gt;
<el-descriptions-item label="支付时间">{{ <el-descriptions-item label="支付时间">{{
item.payTime item.payTime
}} }}
@@ -191,12 +191,18 @@
item.outTradeNo item.outTradeNo
}} }}
</el-descriptions-item> </el-descriptions-item>
<!--<el-descriptions-item label="退款金额">{{ &lt;!&ndash;<el-descriptions-item label="退款金额">{{
item.refundAmount item.refundAmount
}} }}
</el-descriptions-item>--> </el-descriptions-item>&ndash;&gt;
</el-descriptions> </el-descriptions>
</template> </template>-->
<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="payTime" label="支付时间" align="center"/>
<el-table-column prop="outTradeNo" label="支付流水号" align="center"/>
</el-table>
<div v-else style="text-align: center">暂无数据</div> <div v-else style="text-align: center">暂无数据</div>
<div class="marginTop"></div> <div class="marginTop"></div>
</el-card> </el-card>