xdd

src/api/live/liveOrder.js

@@ -17,6 +17,15 @@ export function getLiveOrder(orderId) {
   })
 }
 
+// 获取订单支付记录
+export function getOrderPayments(orderId){
+  return request({
+    url: '/live/liveOrder/payments/'+orderId,
+    method: 'get'
+  })
+}
+
+
 // 新增订单
 export function addLiveOrder(data) {
   return request({

src/views/live/liveOrder/liveOrderDetails.vue

@@ -173,19 +173,76 @@
       </el-tooltip>
       <el-descriptions :column="3" border  >
         <el-descriptions-item label="商品合计"  ><span v-if="item!=null">{{item.totalPrice}}</span></el-descriptions-item>
-        <el-descriptions-item label="应付金额"><span v-if="item.totalPrice!=null">{{item.payPrice}}({{item.totalPrice}})</span></el-descriptions-item>
+        <el-descriptions-item label="应付金额"><span v-if="item.totalPrice!=null">{{item.totalPrice}}({{item.totalPrice}})</span></el-descriptions-item>
         <el-descriptions-item label="运费"><span v-if="item.payDelivery!=null">{{item.payDelivery}}({{item.payDelivery}})</span></el-descriptions-item>
         <el-descriptions-item label="优惠券"  ><span v-if="item.discountMoney!=null"/>{{item.discountMoney}}</el-descriptions-item>
-        <el-descriptions-item label="积分抵扣" >  <span v-if="item!=null">{{item.userName}}</span>  </el-descriptions-item>
-        <el-descriptions-item label="实付金额" >  <span v-if="item!=null">{{item.userName}}</span>  </el-descriptions-item>
-        <el-descriptions-item label="代收金额" >  <span v-if="item!=null">{{item.userName}}</span>  </el-descriptions-item>
-        <el-descriptions-item label="服务费" >  <span v-if="item!=null">{{item.userName}}</span>  </el-descriptions-item>
+        <el-descriptions-item label="积分抵扣" >  <span v-if="item!=null">{{item.payIntegral}}</span>  </el-descriptions-item>
+        <el-descriptions-item label="实付金额" >  <span v-if="item!=null">{{item.payMoney}}</span>  </el-descriptions-item>
+        <el-descriptions-item label="代收金额" >  <span v-if="item!=null">{{item.payRemain}}</span>  </el-descriptions-item>
+        <el-descriptions-item label="服务费" >  <span v-if="item!=null">{{0.00}}</span>  </el-descriptions-item>
       </el-descriptions>
       <div style="float: right;margin: 20px" v-if="item.totalPrice!=null">
         合计：<span class="color-danger">￥{{item.totalPrice.toFixed(2)}}</span>
       </div>
     </div>
 
+    <div class="contentx" v-if="item!=null" style="padding-bottom: 70px;">
+      <div class="desct">
+        支付信息
+      </div>
+    <el-table
+      border
+      :data="payments"
+      size="small"
+      style="width: 100%;margin-top: 20px" >
+      <el-table-column label="支付单号" align="center" prop="payCode" width="120px" />
+      <el-table-column label="支付金额" align="center" prop="payMoney" />
+      <el-table-column label="类型" align="center" prop="payTypeCode" />
+      <el-table-column label="交易单号" align="center" prop="bankTransactionId" />
+      <el-table-column label="银行单号" align="center" prop="bankSerialNo" />
+      <el-table-column label="创建时间" align="center" prop="createTime" />
+      <el-table-column label="支付时间" align="center" prop="payTime" />
+    </el-table>
+    </div>
+
+    <div class="contentx" v-if="item!=null" style="padding-bottom: 70px;">
+
+      <div class="desct">
+        操作信息
+      </div>
+    <el-table style="margin-top: 20px;width: 100%"
+              ref="orderHistoryTable"
+              :data="logs" border>
+      <el-table-column label="操作时间"  width="160" align="center">
+        <template slot-scope="scope">
+          {{scope.row.changeTime}}
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center">
+        <template slot-scope="scope">
+          {{scope.row.changeMessage}}
+        </template>
+      </el-table-column>
+    </el-table>
+</div>
+
+    <div class="contentx" v-if="item!=null" style="padding-bottom: 70px;">
+
+      <div class="desct">
+        分佣信息
+      </div>
+    <el-table
+      border
+      :data="tuiMoneyLogs"
+      size="small"
+      style="width: 100%;margin-top: 20px" >
+      <el-table-column label="公司名称" align="center" prop="companyName" width="120px" />
+      <el-table-column label="金额" align="center" prop="money" />
+      <el-table-column label="余额" align="center" prop="balance" />
+      <el-table-column label="创建时间" align="center" prop="createTime" />
+      <el-table-column label="备注" align="center" prop="remark" />
+    </el-table>
+    </div>
 
     <el-dialog :title="edit.title" :visible.sync="edit.open" width="600px" append-to-body>
       <el-form ref="editForm" :model="editForm" :rules="editRules" label-width="100px">
@@ -298,7 +355,7 @@ import {
   listOrderitem,
   tuiOrder,
   refundOrderMoney,
-  editDeliveryId, finishOrder,getByOrderId
+  editDeliveryId, finishOrder,getByOrderId,getOrderPayments
 } from "@/api/live/liveOrder";
 import {getStoreOrderLive} from "@/api/store/storeOrder";
 
@@ -316,6 +373,7 @@ export default {
         open:false,
       },
       sourceOptions:[],
+      payments: [],
       followDialogVisible:false,
       dialogVisible:false,
       total: 0,
@@ -810,6 +868,10 @@ export default {
           this.deliverList = [response.data]
           console.log(this.deliverList)
         })
+
+        getOrderPayments(this.item.orderId).then(response => {
+          this.payments = response.data;
+        });
       });
 
     },