Merge remote-tracking branch 'origin/order' into order

src/app/admin/order-manage/order-oil/order-oil-list/order-oil-list.component.html

@@ -274,7 +274,7 @@
                     <nz-dropdown-menu #menu="nzDropdownMenu">
                         <ul nz-menu nzSelectable>
                             <li (click)="showOrderDetail(data.orderNo)" nz-menu-item>交易详情</li>
-                            <li *ngIf="data.status == 2" (click)="showRefund(data.orderNo)" nz-menu-item>交易退款</li>
+                            <li *ngIf="REFUND_OIL_BTN == true && data.status == 2" (click)="showRefund(data.orderNo)" nz-menu-item>交易退款</li>
                             <li (click)="showRefundRecord(data.orderNo)" nz-menu-item>退款记录</li>
                         </ul>
                     </nz-dropdown-menu>
@@ -424,31 +424,44 @@
 
 <nz-modal [(nzVisible)]="refundRecordModal" nzTitle="退款记录" (nzOnCancel)="closeRefundRecord()" [nzFooter]="null"
           nzWidth="1000px" [nzBodyStyle]=" { padding: '5px 5px 30px 5px'}">
-    <nz-table #childOrder [nzData]="orderDetailObject.tradeOrder.highChildOrderList" [nzHideOnSinglePage]="true">
+    <nz-table #refundRecord [nzData]="refundRefundRecordArray"
+              [nzFrontPagination]="false"
+              [nzHideOnSinglePage]="true"
+              [nzScroll]="{ x: '1000px'}">
         <thead>
         <tr>
-            <th nzWidth="60px">产品单号</th>
+            <th nzWidth="200px">交易单号</th>
-            <th nzWidth="60px">退款单号</th>
+            <th nzWidth="160px">产品单号</th>
-            <th nzWidth="60px">产品类型</th>
+            <th nzWidth="120px">客户电话</th>
-            <th nzWidth="100px">产品名称</th>
+            <th nzWidth="120px">产品类型</th>
-            <th nzWidth="80px">产品规格</th>
+            <th nzWidth="120px">产品名称</th>
-            <th nzWidth="20px">退款数量</th>
+            <th nzWidth="200px">退款单号</th>
-            <th nzWidth="20px">退款总额</th>
+            <th nzWidth="120px">退款数量</th>
-            <th nzWidth="20px">退款金额</th>
+            <th nzWidth="120px">退款总额</th>
-            <th nzWidth="20px">退款积分</th>
+            <th nzWidth="120px">退回金额</th>
-            <th nzWidth="20px">退款备注</th>
+            <th nzWidth="100px">退回积分</th>
-            <th nzWidth="20px">退款状态</th>
+            <th nzWidth="100px">退款状态</th>
-            <th nzWidth="20px">创建时间</th>
+            <th nzWidth="180px">创建时间</th>
-            <th nzWidth="20px">退款时间</th>
+            <th nzWidth="180px">退款时间</th>
+            <th nzWidth="300px">退款备注</th>
         </tr>
         </thead>
         <tbody>
-        <tr *ngFor="let data of childOrder.data">
+        <tr *ngFor="let data of refundRecord.data">
+            <td>{{data.orderNo}}</td>
+            <td>{{data.orderChildNo}}</td>
+            <td>{{data.memPhone}}</td>
             <td>{{data.goodsType | orderChildGoodsType}}</td>
-            <td>{{ data.goodsSpecName }}</td>
+            <td>{{data.goodsName}}</td>
-            <td>{{ data.saleCount }}</td>
+            <td>{{data.refundOrderNo}}</td>
-            <td>{{ data.goodsActualPrice }} 元</td>
+            <td>{{data.refundGoodsNum}}</td>
-            <td>{{ data.totalActualPrice }} 元</td>
+            <td>￥{{data.returnTotalPrice}}</td>
+            <td>￥{{data.refundPrice}}</td>
+            <td>{{data.refundIntegral}}</td>
+            <td>{{data.refundStatus | orderRefundStatus}}</td>
+            <td>{{data.createTime | date : 'yyyy-MM-dd HH:mm:ss'}}</td>
+            <td>{{data.refundTime | date : 'yyyy-MM-dd HH:mm:ss'}}</td>
+            <td nzBreakWord>{{data.refundRemark}}</td>
         </tr>
         </tbody>
     </nz-table>

src/app/admin/order-manage/order-oil/order-oil-list/order-oil-list.component.ts

@@ -38,6 +38,7 @@ export class OrderOilListComponent implements OnInit {
 
   refundModal = false;
   refundForm: FormGroup;
+  refundRefundRecordArray = [];
 
   refundRecordModal = false;
 
@@ -56,6 +57,9 @@ export class OrderOilListComponent implements OnInit {
   tyAgentArray = [];
   tySalesmanArray = [];
 
+  // 退款按钮权限
+  REFUND_OIL_BTN = false;
+
   constructor(private modal: NzModalService,
               private message: NzMessageService,
               private commonsService: CommonsService,
@@ -73,6 +77,7 @@ export class OrderOilListComponent implements OnInit {
   }
 
   ngOnInit(): void {
+    this.REFUND_OIL_BTN = this.commonsService.isBtnCompetence("BTN_REFUND_OIL_BTN");
     this.refundForm = this.form.group({
       orderNo: [{ value: null, disabled: true}, [Validators.required]],
       remarks: [null],
@@ -382,22 +387,27 @@ export class OrderOilListComponent implements OnInit {
     this.refundModal = false;
   }
 
-
   /**
    * 打开退款记录模态框
    * @param orderNo
    */
   showRefundRecord(orderNo: string) {
-    this.refundModal = true;
+    this.orderManageService.getRefundList({orderNo: orderNo, pageNum:1, pageSize: 99}, data => {
+      if (data['return_code'] === '000000') {
+        this.refundRefundRecordArray = data['return_data']['list'];
+      } else {
+        this.modal.error(data['return_msg']);
+      }
+    });
+    this.refundRecordModal = true;
   }
-
 
   /**
    * 关闭退款记录模态框
    * @param orderNo
    */
   closeRefundRecord() {
-    this.refundModal = false;
+    this.refundRecordModal = false;
   }
 
 }