营收日报点击交易日期显示当日的清分记录

jsowell-ui/src/api/order/order.js

@@ -1,79 +1,87 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
 
 // 查询订单列表
 export function listOrder(query) {
   return request({
-    url: '/order/order/list',
+    url: "/order/order/list",
-    method: 'get',
+    method: "get",
-    params: query
+    params: query,
-  })
+  });
 }
 
 // 查询订单详细
 export function getOrder(orderCode) {
   return request({
-    url: '/order/orderDetail/' + orderCode,
+    url: "/order/orderDetail/" + orderCode,
-    method: 'get'
+    method: "get",
-  })
+  });
 }
 
 // 新增订单
 export function addOrder(data) {
   return request({
-    url: '/order/order',
+    url: "/order/order",
-    method: 'post',
+    method: "post",
-    data: data
+    data: data,
-  })
+  });
 }
 
 // 修改订单
 export function updateOrder(data) {
   return request({
-    url: '/order/order',
+    url: "/order/order",
-    method: 'put',
+    method: "put",
-    data: data
+    data: data,
-  })
+  });
 }
 
 // 删除订单
 export function delOrder(id) {
   return request({
-    url: '/order/order/' + id,
+    url: "/order/order/" + id,
-    method: 'delete'
+    method: "delete",
-  })
+  });
 }
 
 // 获取订单总金额
 export function totalData(query) {
   return request({
-    url: '/order/order/totalData',
+    url: "/order/order/totalData",
-    method: 'get',
+    method: "get",
-    params: query
+    params: query,
-  })
+  });
 }
 
 export function manualSettlementOrder(data) {
   return request({
-    url: '/order/manualSettlementOrder',
+    url: "/order/manualSettlementOrder",
-    method: 'post',
+    method: "post",
-    data: data
+    data: data,
-  })
+  });
 }
 
 // 获取运营商订单列表
 export function getMerchantOrderList(data) {
-    return request({
+  return request({
-        url: '/order/getMerchantOrderList',
+    url: "/order/getMerchantOrderList",
-        method: 'post',
+    method: "post",
-        data: data
+    data: data,
-    })
+  });
 }
 
 // 试订单退款接口
 export function retryRefundOrder(data) {
   return request({
-    url: '/order/retryRefundOrder',
+    url: "/order/retryRefundOrder",
-    method: 'post',
+    method: "post",
-    data: data
+    data: data,
-  })
+  });
+}
+// 获取营收报表当前日期的订单详情
+export function getOrderReportDetail(data) {
+  return request({
+    url: "/order/report/getStationOrderReportDetail",
+    method: "post",
+    data,
+  });
 }

jsowell-ui/src/views/pile/merchant/components/revenue.vue

@@ -98,39 +98,27 @@
       <el-table-column label="交易手续费" align="center" prop="tradeFee" />
     </el-table>
     <el-dialog title="订单流水" :visible.sync="dialogTableVisible">
-      <span
+      <el-table :data="orderList">
-        >站点id：{{ getOrderId }} --- 交易日期：{{ getOrderTradeDate }}</span
+        <el-table-column property="orderCode" label="订单编号" />
-      >
+        <el-table-column property="settleAmount" label="结算金额" />
-      <el-table :data="getOrderList">
+        <el-table-column property="clearingStatus" label="清分状态">
-        <el-table-column
+          <template slot-scope="scope">
-          property="date"
+            <span>{{
-          label="日期"
+              scope.row.clearingStatus === "0" ? "未清分" : "已清分"
-          width="150"
+            }}</span>
-        ></el-table-column>
+          </template>
-        <el-table-column
+        </el-table-column>
-          property="name"
+        <el-table-column property="clearingBillCode" label="清分账单编号" />
-          label="姓名"
+        <el-table-column property="withdrawStatus" label="提现状态" />
-          width="200"
+        <el-table-column property="withdrawCode" label="提现编号" />
-        ></el-table-column>
-        <el-table-column property="address" label="地址"></el-table-column>
       </el-table>
       <pagination
-        v-show="getOrderParams.orderTotal > 0"
+        v-show="orderTotal > 0"
-        :total="getOrderParams.orderTotal"
+        :total="orderTotal"
-        :page.sync="getOrderParams.currentPage"
+        :page.sync="getOrderParams.pageNum"
         :limit.sync="getOrderParams.pageSize"
         @pagination="getOrderList"
       />
-
-      <!-- <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="getOrderParams.currentPage"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="getOrderParams.pageSize"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="getOrderList.length"
-      /> -->
     </el-dialog>
     <pagination
       v-show="total > 0"
@@ -143,41 +131,21 @@
 </template>
 
 <script>
+import { getOrderReportDetail } from "@/api/order/order";
 import { getMerchantOrderReport } from "@/api/adapayMember/adapayMember";
 import { getDay } from "@/utils/common";
 export default {
   props: ["merchantId"],
   data() {
     return {
-      getOrderId: null,
+      orderTotal: 1,
-      getOrderTradeDate: null,
       getOrderParams: {
-        currentPage: 1,
+        pageNum: 1,
         pageSize: 10,
-        orderTotal: 2,
+        stationId: null,
+        tradeDate: null,
       },
-      getOrderList: [
+      orderList: [],
-        {
-          date: "2016-05-02",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄",
-        },
-        {
-          date: "2016-05-04",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄",
-        },
-        {
-          date: "2016-05-01",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄",
-        },
-        {
-          date: "2016-05-03",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄",
-        },
-      ],
       dialogTableVisible: false,
       createTimeRange: [],
       reportList: [],
@@ -193,17 +161,27 @@ export default {
     };
   },
   methods: {
+    getOrderList() {
+      console.log("this.getOrderParams", this.getOrderParams);
+      getOrderReportDetail(this.getOrderParams).then((res) => {
+        console.log("获取订单列表res", res);
+        this.orderList = res.rows;
+        this.orderTotal = res.total;
+      });
+    },
     handleSizeChange(val) {
       this.getOrderParams.pageSize = val;
     },
     handleCurrentChange() {
-      this.getOrderParams.currentPage = 1;
+      this.getOrderParams.pageNum = 1;
     },
     goTradeDate(scope) {
       this.dialogTableVisible = true;
+      // console.log("点击日期出现弹层", scope);
       //   console.log("点击日期出现弹层", scope.row.tradeDate);
-      this.getOrderId = scope.row.id;
+      this.getOrderParams.stationId = scope.row.stationId;
-      this.getOrderTradeDate = scope.row.tradeDate;
+      this.getOrderParams.tradeDate = scope.row.tradeDate;
+      this.getOrderList();
     },
     getList() {
       console.log("queryParams", this.queryParams);