From b49bd533461bae1ddeab23a4024170f0d6e0db8c Mon Sep 17 00:00:00 2001
From: hurui <177768073@qq.com>
Date: Fri, 28 Oct 2022 15:13:28 +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

---
 .../order-refund-list.component.html               |  6 ++++--
 .../order-refund-list.component.ts                 |  5 ++---
 .../system/system-msg/system-msg.component.ts      |  8 ++++----
 src/app/services/msg.service.ts                    |  2 +-
 src/app/services/order/order-manage.service.ts     | 14 +++++++++++++-
 5 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/app/admin/order-manage/order-refund-list/order-refund-list.component.html b/src/app/admin/order-manage/order-refund-list/order-refund-list.component.html
index d073ed7..e6fd084 100644
--- a/src/app/admin/order-manage/order-refund-list/order-refund-list.component.html
+++ b/src/app/admin/order-manage/order-refund-list/order-refund-list.component.html
@@ -50,7 +50,9 @@
                     <nz-form-item>
                         <nz-form-label [nzSpan]="8">产品类型</nz-form-label>
                         <nz-form-control [nzSpan]="14">
-                            <nz-option *ngFor="let item of orderChildGoodsTypeArray" nzValue="{{item.codeValue}}" nzLabel="{{item.codeName}}"></nz-option>
+                            <nz-select nzAllowClear formControlName="goodsType">
+                                <nz-option *ngFor="let item of orderChildGoodsTypeArray" nzValue="{{item.codeValue}}" nzLabel="{{item.codeName}}"></nz-option>
+                            </nz-select>
                         </nz-form-control>
                     </nz-form-item>
                 </div>
@@ -151,7 +153,7 @@
                 <td>{{data.goodsType | orderChildGoodsType}}</td>
                 <td>{{data.goodsName}}</td>
                 <td>{{data.refundOrderNo}}</td>
-                <td>{{data.goodsCount}}</td>
+                <td>{{data.refundGoodsNum}}</td>
                 <td>￥{{data.returnTotalPrice}}</td>
                 <td>￥{{data.refundPrice}}</td>
                 <td>{{data.refundIntegral}}</td>
diff --git a/src/app/admin/order-manage/order-refund-list/order-refund-list.component.ts b/src/app/admin/order-manage/order-refund-list/order-refund-list.component.ts
index 734e48d..6a65e38 100644
--- a/src/app/admin/order-manage/order-refund-list/order-refund-list.component.ts
+++ b/src/app/admin/order-manage/order-refund-list/order-refund-list.component.ts
@@ -169,13 +169,12 @@ export class OrderRefundListComponent implements OnInit {
   exportExcel(): void {
     this.loadingObject.spinning = true;
     this.loadingObject.msg = '处理中...';
-/*
-    this.orderIntegralRechargeService.exportOrder(this.whereObject, data => {
+    this.orderManageService.excelRefund(this.whereObject, data => {
       this.loadingObject.spinning = false;
       if (data['return_code'] === '000000') {
         window.location.href = this.FILE_URL + data['return_data'];
       }
-    });*/
+    });
   }
 
   /**
diff --git a/src/app/admin/system/system-msg/system-msg.component.ts b/src/app/admin/system/system-msg/system-msg.component.ts
index b376b15..d065d65 100644
--- a/src/app/admin/system/system-msg/system-msg.component.ts
+++ b/src/app/admin/system/system-msg/system-msg.component.ts
@@ -1,11 +1,11 @@
 import { Component, OnInit } from '@angular/core';
 import {environment} from '../../../../environments/environment';
-import {FormBuilder, FormGroup, Validators} from '_@angular_forms@9.0.7@@angular/forms';
-import {HttpClient} from '_@angular_common@9.0.7@@angular/common/http';
-import {NzMessageService, NzUploadFile} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
-import {Router} from '_@angular_router@9.0.7@@angular/router';
 import {CommonsService} from '../../../services/commons.service';
 import {MsgService} from '../../../services/msg.service';
+import {FormBuilder, FormGroup, Validators} from '@angular/forms';
+import {HttpClient} from '@angular/common/http';
+import {NzMessageService, NzUploadFile} from 'ng-zorro-antd';
+import {Router} from '@angular/router';
 
 function getBase64(file: File): Promise<string | ArrayBuffer | null> {
     return new Promise((resolve, reject) => {
diff --git a/src/app/services/msg.service.ts b/src/app/services/msg.service.ts
index d9a59aa..2168ccb 100644
--- a/src/app/services/msg.service.ts
+++ b/src/app/services/msg.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
-import {HttpClient} from '_@angular_common@9.0.7@@angular/common/http';
 import {CommonsService} from './commons.service';
 import {environment} from '../../environments/environment';
+import {HttpClient} from '@angular/common/http';
 
 @Injectable({
   providedIn: 'root'
diff --git a/src/app/services/order/order-manage.service.ts b/src/app/services/order/order-manage.service.ts
index a141a33..f79710d 100644
--- a/src/app/services/order/order-manage.service.ts
+++ b/src/app/services/order/order-manage.service.ts
@@ -39,7 +39,7 @@ export class OrderManageService {
   }
 
   /**
-   * 交退款
+   * 退款列表
    *
    * @param  paramsObject   参数
    * @param  callBack   回调
@@ -50,4 +50,16 @@ export class OrderManageService {
     });
   }
 
+  /**
+   * 导出退款
+   *
+   * @param  paramsObject   参数
+   * @param  callBack   回调
+   */
+  public excelRefund(param: object, callBack) {
+    this.http.get(environment.orderUrl + 'excelRefund?'+this.common.getWhereCondition(param)).subscribe(data => {
+      callBack(data);
+    });
+  }
+
 }