From 7a960cf3891ced526708e3e8c61cf93d82b3ee47 Mon Sep 17 00:00:00 2001
From: hurui <177768073@qq.com>
Date: Fri, 19 Jul 2024 15:42:08 +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-oil-list.component.html             |  5 ++--
 .../order-oil-list.component.ts               | 27 +++++++++++++++++++
 src/app/services/trade/order-oil.service.ts   | 14 ++++++++++
 3 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/src/app/pages/trade/order-oil-list/order-oil-list.component.html b/src/app/pages/trade/order-oil-list/order-oil-list.component.html
index 98f8289..6ec38ba 100644
--- a/src/app/pages/trade/order-oil-list/order-oil-list.component.html
+++ b/src/app/pages/trade/order-oil-list/order-oil-list.component.html
@@ -229,6 +229,7 @@
         <ul nz-menu nzSelectable>
           <li nz-menu-item (click)="showOrderDetail(data.orderNo)">交易详情</li>
           <li *ngIf="data.status == 2 && GAS_REFUND_BTN && (accountType == 2 || accountType == 3?(data.payTime | dateMinutesDiff: data.payTime) <=30:true)" (click)="showRefund(data.orderNo, data.orderChildNo)" nz-menu-item>交易退款</li>
+          <li *ngIf="data.status == 2 && data.channelType != 1 && data.abnormal == true && GAS_ORDER_REPAIR_BTN" (click)="showRepairOrder(data.orderNo)" nz-menu-item>交易补单</li>
           <li *ngIf="data.channelType == 1 && data.status == 2 && GAS_ORDER_PRINT_BTN" (click)="showOrderPrint(data.orderNo);" nz-menu-item>打印小票</li>
         </ul>
       </nz-dropdown-menu>
@@ -250,10 +251,10 @@
             <nz-descriptions-item *ngIf="accountType == 1 || accountType == 4 || accountType == 5" nzTitle="渠道">{{orderDetailObject.gasOrder.channelType | dictionary: 'MER_SOURCE_TYPE'}}</nz-descriptions-item>
             <nz-descriptions-item *ngIf="accountType == 1 || accountType == 4 || accountType == 5" nzTitle="渠道单号">{{orderDetailObject.gasOrder.channelOrderNo?orderDetailObject.gasOrder.channelOrderNo:'无'}}</nz-descriptions-item>
             <nz-descriptions-item nzTitle="加油单号">{{orderDetailObject.tradeOrder.orderNo}}</nz-descriptions-item>
-            <nz-descriptions-item nzTitle="交易状态">{{orderDetailObject.tradeOrder.orderStatus| dictionary: 'GAS_ORDER_STATUS' }}</nz-descriptions-item>
+            <nz-descriptions-item nzTitle="交易状态">{{orderDetailObject.gasOrder.status | dictionary: 'GAS_ORDER_STATUS' }}</nz-descriptions-item>
             <nz-descriptions-item nzTitle="支付方式">{{orderDetailObject.tradeOrder.payType | dictionary: 'ORDER_PAY_TYPE'}}</nz-descriptions-item>
             <nz-descriptions-item nzTitle="支付单号">{{orderDetailObject.tradeOrder.paySerialNo!=null?orderDetailObject.tradeOrder.paySerialNo:'无'}}</nz-descriptions-item>
-            <nz-descriptions-item nzTitle="客户手机号" *ngIf="accountType == 1 || accountType == 2 || accountType == 3">{{orderDetailObject.tradeOrder.memPhone}}</nz-descriptions-item>
+            <nz-descriptions-item nzTitle="客户手机号" *ngIf="accountType == 1 || accountType == 2 || accountType == 3">{{orderDetailObject.tradeOrder.userPhone}}</nz-descriptions-item>
             <nz-descriptions-item nzTitle="加油员">{{orderDetailObject.gasOrder.gasStaffName!=null?orderDetailObject.gasOrder.gasStaffName:'未知'}}</nz-descriptions-item>
             <nz-descriptions-item nzTitle="加油金额">{{orderDetailObject.gasOrder.gasRefuelPrice}}元</nz-descriptions-item>
             <nz-descriptions-item nzTitle="加油升数">{{orderDetailObject.gasOrder.gasOilLiters}}升</nz-descriptions-item>
diff --git a/src/app/pages/trade/order-oil-list/order-oil-list.component.ts b/src/app/pages/trade/order-oil-list/order-oil-list.component.ts
index 52810bf..f317d75 100644
--- a/src/app/pages/trade/order-oil-list/order-oil-list.component.ts
+++ b/src/app/pages/trade/order-oil-list/order-oil-list.component.ts
@@ -146,6 +146,7 @@ export class OrderOilListComponent {
   refundForm: FormGroup;
   GAS_REFUND_BTN = new ButtonPipe().isButton("GAS_REFUND");
   GAS_ORDER_PRINT_BTN = new ButtonPipe().isButton("GAS_ORDER_PRINT_BTN");
+  GAS_ORDER_REPAIR_BTN = new ButtonPipe().isButton("GAS_ORDER_REPAIR_BTN");
   constructor(private fb: NonNullableFormBuilder,
               private orderOilService : OrderOilService,
               private agentService : AgentService,
@@ -286,6 +287,32 @@ export class OrderOilListComponent {
     });
   }
 
+  /**
+   * 补单确认框
+   * @param orderNo
+   */
+  showRepairOrder(orderNo: string) {
+    this.modal.confirm({
+      nzTitle: '补单提示',
+      nzContent: '交易单号：' + orderNo + '，是否重新推送订单到渠道？',
+      nzOnOk: () => this.submitRepairOrder(orderNo)
+    });
+  }
+
+  /**
+   * 提交补单
+   */
+  submitRepairOrder(orderNo: string) {
+    this.orderOilService.repairOrder(orderNo, (data: any) => {
+      if (data['return_code'] == '000000') {
+        this.message.success("操作成功");
+        this.queryData();
+      } else {
+        this.message.create('error', data['return_msg']);
+      }
+    });
+  }
+
   /**
    * 打开详情模态框
    * @param orderNo
diff --git a/src/app/services/trade/order-oil.service.ts b/src/app/services/trade/order-oil.service.ts
index c6869d5..f5af6fb 100644
--- a/src/app/services/trade/order-oil.service.ts
+++ b/src/app/services/trade/order-oil.service.ts
@@ -61,6 +61,20 @@ export class OrderOilService {
     });
   }
 
+  /**
+   * 补推订单
+   * @param orderNo
+   * @param callBack
+   */
+  public repairOrder(orderNo: string, callBack:any) {
+    const param = {
+      orderNo: orderNo,
+      tm: new Date().getTime()
+    }
+    this.http.post(environment.baseUrl + 'gasOrder/repairOrder?', param).subscribe(data => {
+      callBack(data);
+    });
+  }
 
   /**
    * 打印订单