From c5ebef2e5cf4f3a498ec0dbe4211b93f48ad5aea Mon Sep 17 00:00:00 2001
From: hurui <177768073@qq.com>
Date: Tue, 9 Aug 2022 18:07:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oil-station-order.component.html               | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/app/admin/order/oil-station-order/oil-station-order.component.html b/src/app/admin/order/oil-station-order/oil-station-order.component.html
index e74d9d4..872502f 100644
--- a/src/app/admin/order/oil-station-order/oil-station-order.component.html
+++ b/src/app/admin/order/oil-station-order/oil-station-order.component.html
@@ -126,11 +126,15 @@
             <th nzWidth="90px">油号</th>
             <th nzWidth="90px">油枪号</th>
             <th nzWidth="90px">油枪价</th>
-            <th nzWidth="90px">优惠价</th>
+            <th nzWidth="90px">平台价</th>
             <th nzWidth="90px">加油升数</th>
             <th nzWidth="90px">加油金额</th>
-            <th nzWidth="90px">支付金额</th>
+            <th nzWidth="120px">使用优惠券</th>
+            <th nzWidth="120px">优惠券名称</th>
             <th nzWidth="90px">优惠金额</th>
+            <th nzWidth="90px">应付金额</th>
+            <th nzWidth="90px">金币抵扣</th>
+            <th nzWidth="90px">实付金额</th>
             <th nzWidth="120px">创建时间</th>
             <th nzWidth="120px">支付时间</th>
             <th nzRight nzWidth="80px">状态</th>
@@ -150,8 +154,12 @@
             <td>{{data.gasPricePreferences}}</td>
             <td>{{data.gasOilLiters}}</td>
             <td>{{data.totalPrice}}</td>
-            <td>{{data.payRealPrice}}</td>
+            <td>{{data.memDiscountName?'是':'否'}}</td>
+            <td>{{data.memDiscountName?data.memDiscountName:'否'}}</td>
             <td>{{data.deductionPrice}}</td>
+            <td>{{data.payablePrice}}</td>
+            <td>{{data.payGold / 100}}</td>
+            <td>{{data.payRealPrice}}</td>
             <td>{{data.createTime | date: 'yyyy-MM-dd HH:mm:ss'}}</td>
             <td>{{data.payTime | date: 'yyyy-MM-dd HH:mm:ss'}}</td>
             <td nzRight>{{data.status | orderCouponStatus}}</td>