From 249f0ab039843d87d2f74116a44b2224c02aa66d Mon Sep 17 00:00:00 2001
From: Sum1Dream <418471657@qq.com>
Date: Tue, 15 Feb 2022 17:01:43 +0800
Subject: [PATCH] 1
---
.../order-list/order-list.component.html | 20 ++++++-----
.../order-list/order-list.component.ts | 34 +++++++++----------
.../price-list/price-list.component.html | 6 ----
src/app/services/recharge.service.ts | 4 +--
src/environments/environment.ts | 8 ++---
5 files changed, 35 insertions(+), 37 deletions(-)
diff --git a/src/app/admin/recharge-order/order-list/order-list.component.html b/src/app/admin/recharge-order/order-list/order-list.component.html
index 278f5de..6d700a0 100644
--- a/src/app/admin/recharge-order/order-list/order-list.component.html
+++ b/src/app/admin/recharge-order/order-list/order-list.component.html
@@ -163,7 +163,8 @@
| 支付金额 |
生成时间 |
支付方式 |
- 状态 |
+ 充值状态 |
+ 订单状态 |
操作 |
@@ -181,12 +182,15 @@
{{data.payPrice}} |
{{data.createTimed | date: 'yyyy-MM-dd HH:mm:ss'}} |
{{data.payType | rechargePayType}} |
+
+ {{data.rechargeStatus == 1 ? '充值异常' : '正常'}}
+ ({{data.abnormalMsg}})
+ |
{{data.status | rechargeStatus}} |
详情
-
-
-
+ 再次充值
+ 申请退款
|
@@ -211,10 +215,10 @@
{{data['refundTime'] | date: 'yyyy-MM-dd HH:mm:ss'}}
{{data['status'] | rechargeStatus}}
-
-
-
-
+
+
+
+
diff --git a/src/app/admin/recharge-order/order-list/order-list.component.ts b/src/app/admin/recharge-order/order-list/order-list.component.ts
index 1ac6e1d..db5b170 100644
--- a/src/app/admin/recharge-order/order-list/order-list.component.ts
+++ b/src/app/admin/recharge-order/order-list/order-list.component.ts
@@ -49,20 +49,20 @@ export class OrderListComponent implements OnInit , OnDestroy {
ngOnInit(): void {
this.init();
- this.timer = setInterval(() => { // 设置定时刷新事件，每隔1分钟刷新
- this.recharge.countOrder(data => {
- if (data['return_data'] > 0) {
- this.getRequest(true, this.searchForm.value);
- this.notification.info(
- '充值订单',
- '您有' + data['return_data'] + '条未充值的订单，请尽快充值，点击可查看未充值订单！'
- ).onClick.subscribe(() => {
- this.searchForm.value.status = 2;
- this.getRequest(true, this.searchForm.value);
- });
- }
- });
- }, 10000);
+ // this.timer = setInterval(() => { // 设置定时刷新事件，每隔1分钟刷新
+ // this.recharge.countOrder(data => {
+ // if (data['return_data'] > 0) {
+ // this.getRequest(true, this.searchForm.value);
+ // this.notification.info(
+ // '充值订单',
+ // '您有' + data['return_data'] + '条未充值的订单，请尽快充值，点击可查看未充值订单！'
+ // ).onClick.subscribe(() => {
+ // this.searchForm.value.status = 2;
+ // this.getRequest(true, this.searchForm.value);
+ // });
+ // }
+ // });
+ // }, 10000);
}
// 销毁
@@ -147,10 +147,10 @@ export class OrderListComponent implements OnInit , OnDestroy {
}
- public finishOrder(id: number): void {
- this.common.showConfirm('确认订单是否完成充值', item => {
+ public getMobileRechargeByOrderId(id: number): void {
+ this.common.showConfirm('确认订单是否再次充值', item => {
if (item) {
- this.recharge.finishOrder(id, data => {
+ this.recharge.getMobileRechargeByOrderId(id, data => {
if (data['return_code'] === '000000') {
this.getRequest(false, this.searchForm.value);
this.isVisible = false;
diff --git a/src/app/admin/recharge-order/price-list/price-list.component.html b/src/app/admin/recharge-order/price-list/price-list.component.html
index 2f7c58b..406ef4d 100644
--- a/src/app/admin/recharge-order/price-list/price-list.component.html
+++ b/src/app/admin/recharge-order/price-list/price-list.component.html
@@ -123,7 +123,6 @@
展示区域
-<<<<<<< HEAD
@@ -136,11 +135,6 @@
-=======
-
-
-
->>>>>>> 79b068eb5f3f130730e5c51b857b9cc72de104f9
diff --git a/src/app/services/recharge.service.ts b/src/app/services/recharge.service.ts
index 63cd81e..756f6ae 100644
--- a/src/app/services/recharge.service.ts
+++ b/src/app/services/recharge.service.ts
@@ -120,8 +120,8 @@ export class RechargeService {
* @param id id
* @param callBack 回调
*/
- public finishOrder(id: number, callBack) {
- this.http.get(environment.baseUrl + 'outRechargeOrder/finishOrder?orderId=' + id).subscribe(data => {
+ public getMobileRechargeByOrderId(id: number, callBack) {
+ this.http.get(environment.baseUrl + 'outRechargeOrder/getMobileRechargeByOrderId?orderId=' + id).subscribe(data => {
callBack(data);
});
}
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 5a795b3..cc5edd5 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -4,10 +4,10 @@
export const environment = {
production: false,
- // baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址)
- // imageUrl: 'http://localhost:9302/filesystem/',
- baseUrl: 'https://hsg.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
- imageUrl: 'https://hsg.dctpay.com/filesystem/',
+ baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址)
+ imageUrl: 'http://localhost:9302/filesystem/',
+ // baseUrl: 'https://hsg.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
+ // imageUrl: 'https://hsg.dctpay.com/filesystem/',
key: 'https://hsgcs.dctpay.com/phone-recharge-H5/index.html?codeValue=',
inviteUrl: 'https://hsgcs.dctpay.com/wx/?action=ic&id=',
};