From 2650b880cf20a4fe63a6af72f598e3104a38bb4d Mon Sep 17 00:00:00 2001 From: Sum1Dream <418471657@qq.com> Date: Fri, 10 Feb 2023 17:00:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=90=86=E5=95=86?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../third-product/third-product.component.html | 2 +- .../third-product/third-product.component.ts | 2 ++ .../hlt-charge-order/hlt-charge-order.component.ts | 13 +++++++++++++ .../kfc-order-list/kfc-order-list.component.ts | 13 +++++++++++++ .../member-charge-order-list.component.ts | 13 +++++++++++++ .../mobile-recharge-order-list.component.html | 3 ++- .../mobile-recharge-order-list.component.ts | 13 +++++++++++++ .../starbucks-order-list.component.ts | 13 +++++++++++++ .../pipes/recharge-price/recharge-platform.pipe.ts | 3 +++ src/environments/environment.ts | 8 ++++---- 10 files changed, 77 insertions(+), 6 deletions(-) diff --git a/src/app/admin/config-manage/third-product/third-product.component.html b/src/app/admin/config-manage/third-product/third-product.component.html index 9676a12..6099508 100644 --- a/src/app/admin/config-manage/third-product/third-product.component.html +++ b/src/app/admin/config-manage/third-product/third-product.component.html @@ -105,7 +105,7 @@ 卡券来源 - + diff --git a/src/app/admin/config-manage/third-product/third-product.component.ts b/src/app/admin/config-manage/third-product/third-product.component.ts index dfb6b40..2f8a798 100644 --- a/src/app/admin/config-manage/third-product/third-product.component.ts +++ b/src/app/admin/config-manage/third-product/third-product.component.ts @@ -132,8 +132,10 @@ export class ThirdProductComponent implements OnInit { this.id = id; this.edit = true; this.apiProduct.findProductConfig(id, data => { + console.log(data); data['return_data']['productPlatform'] = data['return_data']['productPlatformString'].substring(0 , data['return_data']['productPlatformString'].length - 1).split(','); data['return_data']['payType'] = data['return_data']['productPayTypeString'].substring(0 , data['return_data']['productPayTypeString'].length - 1).split(','); + data['return_data']['productId'] = String(data['return_data']['productId']); this.validateForm.patchValue(data['return_data']); this.isVisible = true; }); diff --git a/src/app/admin/order-manage/hlt-charge-order/hlt-charge-order.component.ts b/src/app/admin/order-manage/hlt-charge-order/hlt-charge-order.component.ts index b7c4bcc..68e08db 100644 --- a/src/app/admin/order-manage/hlt-charge-order/hlt-charge-order.component.ts +++ b/src/app/admin/order-manage/hlt-charge-order/hlt-charge-order.component.ts @@ -121,6 +121,19 @@ export class HltChargeOrderComponent implements OnInit { } whereObject['pageNum'] = this.pageNum; whereObject['pageSize'] = this.pageSize; + if (whereObject['payTimeArray'] != null && whereObject['payTimeArray'].length !== 0) { + whereObject['payTimeS'] = whereObject['payTimeArray'][0].getTime(); + whereObject['payTimeE'] = whereObject['payTimeArray'][1].getTime(); + } + if (whereObject['refundTimeArray'] != null && whereObject['refundTimeArray'].length !== 0) { + whereObject['payTimeS'] = whereObject['refundTimeArray'][0].getTime(); + whereObject['payTimeE'] = whereObject['refundTimeArray'][1].getTime(); + } + + if (whereObject['createTimeArray'] != null && whereObject['createTimeArray'].length !== 0) { + whereObject['createTimeS'] = whereObject['createTimeArray'][0].getTime(); + whereObject['createTimeE'] = whereObject['createTimeArray'][1].getTime(); + } this.hltOrderService.getOrderList(whereObject, data => { this.loading = false; if (data['return_code'] === '000000') { diff --git a/src/app/admin/order-manage/kfc-order/kfc-order-list/kfc-order-list.component.ts b/src/app/admin/order-manage/kfc-order/kfc-order-list/kfc-order-list.component.ts index d79b04d..3b16039 100644 --- a/src/app/admin/order-manage/kfc-order/kfc-order-list/kfc-order-list.component.ts +++ b/src/app/admin/order-manage/kfc-order/kfc-order-list/kfc-order-list.component.ts @@ -119,6 +119,19 @@ export class KfcOrderListComponent implements OnInit { } whereObject['pageNum'] = this.pageNum; whereObject['pageSize'] = this.pageSize; + if (whereObject['payTimeArray'] != null && whereObject['payTimeArray'].length !== 0) { + whereObject['payTimeS'] = whereObject['payTimeArray'][0].getTime(); + whereObject['payTimeE'] = whereObject['payTimeArray'][1].getTime(); + } + if (whereObject['refundTimeArray'] != null && whereObject['refundTimeArray'].length !== 0) { + whereObject['payTimeS'] = whereObject['refundTimeArray'][0].getTime(); + whereObject['payTimeE'] = whereObject['refundTimeArray'][1].getTime(); + } + + if (whereObject['createTimeArray'] != null && whereObject['createTimeArray'].length !== 0) { + whereObject['createTimeS'] = whereObject['createTimeArray'][0].getTime(); + whereObject['createTimeE'] = whereObject['createTimeArray'][1].getTime(); + } this.thirdPartyOrder.getOrderList(whereObject, data => { this.loading = false; if (data['return_code'] === '000000') { diff --git a/src/app/admin/order-manage/member-charge-order/member-charge-order-list/member-charge-order-list.component.ts b/src/app/admin/order-manage/member-charge-order/member-charge-order-list/member-charge-order-list.component.ts index 3309fe5..6c26922 100644 --- a/src/app/admin/order-manage/member-charge-order/member-charge-order-list/member-charge-order-list.component.ts +++ b/src/app/admin/order-manage/member-charge-order/member-charge-order-list/member-charge-order-list.component.ts @@ -118,6 +118,19 @@ export class MemberChargeOrderListComponent implements OnInit { } whereObject['pageNum'] = this.pageNum; whereObject['pageSize'] = this.pageSize; + if (whereObject['payTimeArray'] != null && whereObject['payTimeArray'].length !== 0) { + whereObject['payTimeS'] = whereObject['payTimeArray'][0].getTime(); + whereObject['payTimeE'] = whereObject['payTimeArray'][1].getTime(); + } + if (whereObject['refundTimeArray'] != null && whereObject['refundTimeArray'].length !== 0) { + whereObject['payTimeS'] = whereObject['refundTimeArray'][0].getTime(); + whereObject['payTimeE'] = whereObject['refundTimeArray'][1].getTime(); + } + + if (whereObject['createTimeArray'] != null && whereObject['createTimeArray'].length !== 0) { + whereObject['createTimeS'] = whereObject['createTimeArray'][0].getTime(); + whereObject['createTimeE'] = whereObject['createTimeArray'][1].getTime(); + } this.thirdPartyOrder.getOrderList(whereObject, data => { this.loading = false; if (data['return_code'] === '000000') { 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 1d56505..66d303a 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 @@ -208,8 +208,9 @@ {{orderDetailObject.mobileOrder.operatorName}} - {{orderDetailObject.tradeOrder.title}} + {{orderDetailObject.mobileOrder.rechargeContent}} {{orderDetailObject.mobileOrder.rechargeStatus | rechargeStatus}} + {{orderDetailObject.tradeOrder.title}} 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 ca9477d..71dc602 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 @@ -119,6 +119,19 @@ export class MobileRechargeOrderListComponent implements OnInit { } whereObject['pageNum'] = this.pageNum; whereObject['pageSize'] = this.pageSize; + if (whereObject['payTimeArray'] != null && whereObject['payTimeArray'].length !== 0) { + whereObject['payTimeS'] = whereObject['payTimeArray'][0].getTime(); + whereObject['payTimeE'] = whereObject['payTimeArray'][1].getTime(); + } + if (whereObject['refundTimeArray'] != null && whereObject['refundTimeArray'].length !== 0) { + whereObject['payTimeS'] = whereObject['refundTimeArray'][0].getTime(); + whereObject['payTimeE'] = whereObject['refundTimeArray'][1].getTime(); + } + + if (whereObject['createTimeArray'] != null && whereObject['createTimeArray'].length !== 0) { + whereObject['createTimeS'] = whereObject['createTimeArray'][0].getTime(); + whereObject['createTimeE'] = whereObject['createTimeArray'][1].getTime(); + } this.orderMobileRechargeService.getOrderList(whereObject, data => { this.loading = false; if (data['return_code'] === '000000') { diff --git a/src/app/admin/order-manage/starbucks-order/starbucks-order-list/starbucks-order-list.component.ts b/src/app/admin/order-manage/starbucks-order/starbucks-order-list/starbucks-order-list.component.ts index 2ba9c8c..350f544 100644 --- a/src/app/admin/order-manage/starbucks-order/starbucks-order-list/starbucks-order-list.component.ts +++ b/src/app/admin/order-manage/starbucks-order/starbucks-order-list/starbucks-order-list.component.ts @@ -118,6 +118,19 @@ export class StarbucksOrderListComponent implements OnInit { } whereObject['pageNum'] = this.pageNum; whereObject['pageSize'] = this.pageSize; + if (whereObject['payTimeArray'] != null && whereObject['payTimeArray'].length !== 0) { + whereObject['payTimeS'] = whereObject['payTimeArray'][0].getTime(); + whereObject['payTimeE'] = whereObject['payTimeArray'][1].getTime(); + } + if (whereObject['refundTimeArray'] != null && whereObject['refundTimeArray'].length !== 0) { + whereObject['payTimeS'] = whereObject['refundTimeArray'][0].getTime(); + whereObject['payTimeE'] = whereObject['refundTimeArray'][1].getTime(); + } + + if (whereObject['createTimeArray'] != null && whereObject['createTimeArray'].length !== 0) { + whereObject['createTimeS'] = whereObject['createTimeArray'][0].getTime(); + whereObject['createTimeE'] = whereObject['createTimeArray'][1].getTime(); + } this.thirdPartyOrder.getOrderList(whereObject, data => { this.loading = false; if (data['return_code'] === '000000') { diff --git a/src/app/pipes/recharge-price/recharge-platform.pipe.ts b/src/app/pipes/recharge-price/recharge-platform.pipe.ts index 2ba3345..c2f092f 100644 --- a/src/app/pipes/recharge-price/recharge-platform.pipe.ts +++ b/src/app/pipes/recharge-price/recharge-platform.pipe.ts @@ -18,6 +18,9 @@ export class RechargePlatformPipe implements PipeTransform { if (Number(i) === 3) { string = string + '城宇,'; } + if (Number(i) === 4) { + string = string + '嗨购,'; + } } return string.substring(0 , string.length - 1); diff --git a/src/environments/environment.ts b/src/environments/environment.ts index a6fe2c1..76173d9 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,11 +4,11 @@ export const environment = { production: false, - // baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址) - // orderUrl: 'http://localhost:9304/order/', // 测试环境服务器地址(请求数据地址) + baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址) + orderUrl: 'http://localhost:9304/order/', // 测试环境服务器地址(请求数据地址) imageUrl: 'https://hsgcs.dctpay.com/filesystem/', - baseUrl: 'https://hsg.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址) - orderUrl: 'https://hsg.dctpay.com/order/', // 测试环境服务器地址(请求数据地址) + // baseUrl: 'https://hsgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址) + // orderUrl: 'https://hsgcs.dctpay.com/order/', // 测试环境服务器地址(请求数据地址) key: 'https://hsgcs.dctpay.com/phone-recharge-H5/index.html?codeValue=', inviteUrl: 'https://hsgcs.dctpay.com/wx/?action=ic&id=', };