diff --git a/src/app/admin/order-manage/goods-order/goods-order.component.ts b/src/app/admin/order-manage/goods-order/goods-order.component.ts index 255f0a2..0edf642 100644 --- a/src/app/admin/order-manage/goods-order/goods-order.component.ts +++ b/src/app/admin/order-manage/goods-order/goods-order.component.ts @@ -163,7 +163,6 @@ export class GoodsOrderComponent implements OnInit { console.log(data); this.orderDetailObject = data['return_data']; this.logisticsTraceDetails = data['return_data']['logisticsTraceDetails']; - console.log(this.logisticsTraceDetails); } else { this.message.error(data['return_msg']); } @@ -201,7 +200,7 @@ export class GoodsOrderComponent implements OnInit { this.isVisible = false; this.notification.success('成功' , '更新成功'); } else { - this.notification.error( '失败' , '更新成功'); + this.notification.error( '失败' , data['return_msg']); } }); } diff --git a/src/app/admin/order-manage/mobile-recharge-order-list/mobile-recharge-order-list.component.html b/src/app/admin/order-manage/mobile-recharge-order-list/mobile-recharge-order-list.component.html index d34e0ef..d7aee1f 100644 --- a/src/app/admin/order-manage/mobile-recharge-order-list/mobile-recharge-order-list.component.html +++ b/src/app/admin/order-manage/mobile-recharge-order-list/mobile-recharge-order-list.component.html @@ -28,9 +28,9 @@
- 客户电话 + 标题 - +
@@ -38,6 +38,17 @@
+
+ + 异常订单 + + + + + + + +
交易状态 @@ -170,7 +181,7 @@ - + {{data.orderNo}} {{data.memPhone}} {{data.title}} @@ -184,6 +195,8 @@ @@ -252,13 +265,16 @@ - + - 请求订单号 - 充值平台 - 充值状态 - 创建时间 + 请求订单号 + 充值平台 + 充值状态 + 充值内容 + 查询内容 + 创建时间 @@ -266,6 +282,8 @@ {{data.orderNo}} {{data.rechargePlatform | platform}} {{data.status | chlidRechargeStatus}} + {{data.ext1}} + {{data.ext3}} {{data['createTime'] | date: 'yyyy-MM-dd HH:mm'}} diff --git a/src/app/admin/order-manage/mobile-recharge-order-list/mobile-recharge-order-list.component.scss b/src/app/admin/order-manage/mobile-recharge-order-list/mobile-recharge-order-list.component.scss index 363c972..04d72c1 100644 --- a/src/app/admin/order-manage/mobile-recharge-order-list/mobile-recharge-order-list.component.scss +++ b/src/app/admin/order-manage/mobile-recharge-order-list/mobile-recharge-order-list.component.scss @@ -1,3 +1,6 @@ img { width: 60px; } +.fontColor { + color: red; +} diff --git a/src/app/admin/order-manage/mobile-recharge-order-list/mobile-recharge-order-list.component.ts b/src/app/admin/order-manage/mobile-recharge-order-list/mobile-recharge-order-list.component.ts index b498f2a..e9287d1 100644 --- a/src/app/admin/order-manage/mobile-recharge-order-list/mobile-recharge-order-list.component.ts +++ b/src/app/admin/order-manage/mobile-recharge-order-list/mobile-recharge-order-list.component.ts @@ -8,6 +8,7 @@ import {OrderMobileRechargeService} from '../../../services/order/order-mobile-r import {FormBuilder, FormGroup} from '@angular/forms'; import {NzMessageService} from 'ng-zorro-antd'; import {animate, state, style, transition, trigger} from '@angular/animations'; +import {NzNotificationService} from "_ng-zorro-antd@9.3.0@ng-zorro-antd"; @Component({ selector: 'app-mobile-recharge-order-list', @@ -80,6 +81,7 @@ export class MobileRechargeOrderListComponent implements OnInit { private orderMobileRechargeService: OrderMobileRechargeService, private companyService: CompanyService, private commonsService: CommonsService, + private notification: NzNotificationService, ) { } ngOnInit(): void { @@ -92,6 +94,7 @@ export class MobileRechargeOrderListComponent implements OnInit { createTimeArray: [null], refundTimeArray: [null], title: [null], + exceptionStatus: [null], companyId: [null], payType: [null], memCardNo: [null], @@ -136,7 +139,6 @@ export class MobileRechargeOrderListComponent implements OnInit { this.orderMobileRechargeService.getOrderList(whereObject, data => { this.loading = false; if (data['return_code'] === '000000') { - console.log(data); this.requestData = data['return_data'].list; this.total = data['return_data'].total; } else { @@ -175,5 +177,42 @@ export class MobileRechargeOrderListComponent implements OnInit { }); } + + public refundOrder(orderNo: string): void { + + this.commonsService.showConfirm('请确定当前订单无充值中记录!!!', item => { + if (item) { + this.loadingObject.status = true; + this.loadingObject.title = '订单退款中...'; + this.orderMobileRechargeService.refundOrder(orderNo , data => { + if (data['return_code'] === '000000') { + this.getRequest(false, this.searchForm.value); + this.notification.success('成功' , '退款成功'); + } else { + this.message.error(data['return_msg']); + this.notification.error( '失败' , data['return_msg']); + } + this.loadingObject.status = false; + }); + } + }); + } + + public orderNormal(orderNo: string): void { + + this.loadingObject.status = true; + this.loadingObject.title = '修改中...'; + this.orderMobileRechargeService.orderNormal(orderNo , data => { + if (data['return_code'] === '000000') { + this.getRequest(false, this.searchForm.value); + this.notification.success('成功' , '修改成功'); + } else { + this.message.error(data['return_msg']); + this.notification.error( '失败' , data['return_msg']); + } + this.loadingObject.status = false; + }); + } + } diff --git a/src/app/services/order/order-mobile-recharge.service.ts b/src/app/services/order/order-mobile-recharge.service.ts index 0b8644b..1ba3ec7 100644 --- a/src/app/services/order/order-mobile-recharge.service.ts +++ b/src/app/services/order/order-mobile-recharge.service.ts @@ -51,4 +51,32 @@ export class OrderMobileRechargeService { }); } + /** + * @Author Sum1Dream + * @methodName refundOrder + * @Description // 订单退款 + * @Date 15:04 2023/5/18 + * @Param orderNo + * @Param callBack + */ + public refundOrder(orderNo: string, callBack) { + this.http.get(environment.orderUrl + 'mobileRecharge/refundOrder?orderNo=' + orderNo).subscribe(data => { + callBack(data); + }); + } + + /** + * @Author Sum1Dream + * @methodName orderNormal + * @Description // 异常转正常 + * @Date 17:26 2023/5/18 + * @Param orderNo + * @Param callBack + */ + public orderNormal(orderNo: string, callBack) { + this.http.get(environment.orderUrl + 'mobileRecharge/orderNormal?orderNo=' + orderNo).subscribe(data => { + callBack(data); + }); + } + }