Просмотр исходного кода

直播支付查询条件修复

yuhongqi 1 месяц назад
Родитель
Сommit
657f060b88
2 измененных файлов с 28 добавлено и 7 удалено
  1. 16 2
      src/api/live/liveOrderPayment.js
  2. 12 5
      src/views/store/storePayment/index.vue

+ 16 - 2
src/api/live/liveOrderPayment.js

@@ -1,7 +1,14 @@
 import request from '@/utils/request'
 
 // 查询订单详情列表
-export function listLiveOrderPayments(query) {
+export function listLiveOrderPayments(query, refundDateRange) {
+  if (null != refundDateRange && '' != refundDateRange && refundDateRange.length === 2) {
+    query.refundBeginTime = refundDateRange[0];
+    query.refundEndTime = refundDateRange[1];
+  } else {
+    query.refundBeginTime = null;
+    query.refundEndTime = null;
+  }
   return request({
     url: '/live/order/payment',
     method: 'get',
@@ -9,7 +16,14 @@ export function listLiveOrderPayments(query) {
   })
 }
 // 查询订单详情列表
-export function exportLiveOrderPayments(query) {
+export function exportLiveOrderPayments(query, refundDateRange) {
+  if (null != refundDateRange && '' != refundDateRange && refundDateRange.length === 2) {
+    query.refundBeginTime = refundDateRange[0];
+    query.refundEndTime = refundDateRange[1];
+  } else {
+    query.refundBeginTime = null;
+    query.refundEndTime = null;
+  }
   return request({
     url: '/live/order/payment/export',
     method: 'get',

+ 12 - 5
src/views/store/storePayment/index.vue

@@ -583,14 +583,21 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      const queryParams = this.queryParams;
+      // 处理提交时间范围
+      if(this.createTimeRange!=null&&this.createTimeRange.length==2){
+        this.queryParams.createTimeRange=this.createTimeRange[0]+"--"+this.createTimeRange[1]
+      }
+      else{
+        this.queryParams.createTimeRange=null;
+      }
+      const queryParams = this.addDateRange(this.queryParams, this.dateRange);
       if("5" == this.queryParams.businessType) {
         this.$confirm('是否确认导出所有直播订单明细数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
-        }).then(function() {
-          return exportLiveOrderPayments(queryParams);
+        }).then(() => {
+          return exportLiveOrderPayments(queryParams, this.refundDateRange);
         }).then(response => {
           this.download(response.msg);
         }).catch(function() {});
@@ -600,8 +607,8 @@ export default {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
-        }).then(function() {
-          return exportStorePayment(queryParams);
+        }).then(() => {
+          return exportStorePayment(queryParams, this.refundDateRange);
         }).then(response => {
           this.download(response.msg);
         }).catch(function() {});