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 @@
@@ -250,10 +251,10 @@
{{orderDetailObject.gasOrder.channelType | dictionary: 'MER_SOURCE_TYPE'}}
{{orderDetailObject.gasOrder.channelOrderNo?orderDetailObject.gasOrder.channelOrderNo:'无'}}
{{orderDetailObject.tradeOrder.orderNo}}
- {{orderDetailObject.tradeOrder.orderStatus| dictionary: 'GAS_ORDER_STATUS' }}
+ {{orderDetailObject.gasOrder.status | dictionary: 'GAS_ORDER_STATUS' }}
{{orderDetailObject.tradeOrder.payType | dictionary: 'ORDER_PAY_TYPE'}}
{{orderDetailObject.tradeOrder.paySerialNo!=null?orderDetailObject.tradeOrder.paySerialNo:'无'}}
- {{orderDetailObject.tradeOrder.memPhone}}
+ {{orderDetailObject.tradeOrder.userPhone}}
{{orderDetailObject.gasOrder.gasStaffName!=null?orderDetailObject.gasOrder.gasStaffName:'未知'}}
{{orderDetailObject.gasOrder.gasRefuelPrice}}元
{{orderDetailObject.gasOrder.gasOilLiters}}升
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);
+ });
+ }
/**
* 打印订单