From 51a09f3aee01f441c7ae1cf2fccd63aba771fb2d Mon Sep 17 00:00:00 2001 From: Sum1Dream <418471657@qq.com> Date: Thu, 5 Jan 2023 14:39:20 +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 --- .../kfc-order/kfc-order.component.html | 127 ++++++++++++++++++ .../kfc-order/kfc-order.component.scss | 5 + .../kfc-order/kfc-order.component.spec.ts | 25 ++++ .../kfc-order/kfc-order.component.ts | 91 +++++++++++++ .../starbucks-order/list/list.component.html | 127 ++++++++++++++++++ .../starbucks-order/list/list.component.scss | 5 + .../starbucks-order/list/list.component.ts | 92 +++++++++++++ .../vip-top-up-order.component.html | 127 ++++++++++++++++++ .../vip-top-up-order.component.scss | 5 + .../vip-top-up-order.component.ts | 93 +++++++++++++ .../pipes/apiMerchant/callback-status.pipe.ts | 21 +++ src/app/pipes/order/pay-coupon-status.pipe.ts | 26 ++++ 12 files changed, 744 insertions(+) create mode 100644 src/app/admin/api-order/kfc-order/kfc-order.component.html create mode 100644 src/app/admin/api-order/kfc-order/kfc-order.component.scss create mode 100644 src/app/admin/api-order/kfc-order/kfc-order.component.spec.ts create mode 100644 src/app/admin/api-order/kfc-order/kfc-order.component.ts create mode 100644 src/app/admin/api-order/starbucks-order/list/list.component.html create mode 100644 src/app/admin/api-order/starbucks-order/list/list.component.scss create mode 100644 src/app/admin/api-order/starbucks-order/list/list.component.ts create mode 100644 src/app/admin/api-order/vip-top-up-order/vip-top-up-order.component.html create mode 100644 src/app/admin/api-order/vip-top-up-order/vip-top-up-order.component.scss create mode 100644 src/app/admin/api-order/vip-top-up-order/vip-top-up-order.component.ts create mode 100644 src/app/pipes/apiMerchant/callback-status.pipe.ts create mode 100644 src/app/pipes/order/pay-coupon-status.pipe.ts diff --git a/src/app/admin/api-order/kfc-order/kfc-order.component.html b/src/app/admin/api-order/kfc-order/kfc-order.component.html new file mode 100644 index 0000000..beee660 --- /dev/null +++ b/src/app/admin/api-order/kfc-order/kfc-order.component.html @@ -0,0 +1,127 @@ + + + + + +
+
+
+
+ + 平台订单号 + + + + +
+
+ + 第三方订单号 + + + + +
+
+ + 订单状态 + + + + + + + + + + + + +
+ +
+ + 回调状态 + + + + + + + + + +
+
+ + 支付时间 + + + + +
+
+ + 创建时间 + + + + +
+
+
+
+ + +
+
+
+
+ +
+ 共计 {{total}} 条数据 + + + + 编号 + 平台订单号 + 第三方订单号 + 订单金额 + 下单金额 + 生成时间 + 支付时间 + 订单状态 + 支付状态 + + + + + {{i + 1}} + {{data.orderNo}} + {{data.sourceOrderNo}} + ¥{{data.orderPrice}} + ¥{{data.payPrice}} + {{data.createTime | date: 'yyyy-MM-dd HH:mm:ss'}} + {{data.payTime | date: 'yyyy-MM-dd HH:mm:ss'}} + {{data.callbackStatus | callbackStatus}} + {{data.orderStatus | payCouponStatus}} + + +
diff --git a/src/app/admin/api-order/kfc-order/kfc-order.component.scss b/src/app/admin/api-order/kfc-order/kfc-order.component.scss new file mode 100644 index 0000000..b68da73 --- /dev/null +++ b/src/app/admin/api-order/kfc-order/kfc-order.component.scss @@ -0,0 +1,5 @@ +.table-td-operation { + a { + margin-left: 8px; + } +} diff --git a/src/app/admin/api-order/kfc-order/kfc-order.component.spec.ts b/src/app/admin/api-order/kfc-order/kfc-order.component.spec.ts new file mode 100644 index 0000000..0c474b2 --- /dev/null +++ b/src/app/admin/api-order/kfc-order/kfc-order.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { KfcOrderComponent } from './kfc-order.component'; + +describe('KfcOrderComponent', () => { + let component: KfcOrderComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ KfcOrderComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(KfcOrderComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/admin/api-order/kfc-order/kfc-order.component.ts b/src/app/admin/api-order/kfc-order/kfc-order.component.ts new file mode 100644 index 0000000..4866982 --- /dev/null +++ b/src/app/admin/api-order/kfc-order/kfc-order.component.ts @@ -0,0 +1,91 @@ +import { Component, OnInit } from '@angular/core'; +import {environment} from '../../../../environments/environment'; +import {FormBuilder, FormGroup} from '_@angular_forms@9.0.7@@angular/forms'; +import {RechargeService} from '../../../services/recharge.service'; +import {DiscountService} from '../../../services/discount.service'; +import {ApiMerchantsService} from '../../../services/api-merchants.service'; +import {NzMessageService, NzModalService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd'; +import {CouponService} from '../../../services/coupon.service'; +import {IconService} from '../../../services/icon.service'; + +@Component({ + selector: 'app-kfc-order', + templateUrl: './kfc-order.component.html', + styleUrls: ['./kfc-order.component.scss'] +}) +export class KfcOrderComponent implements OnInit { + + FILE_URL = environment.imageUrl; + WEB_SERVE_URL = environment.baseUrl; + searchForm: FormGroup; // 搜索框 + validateForm: FormGroup; // 添加框 + requestData = []; // 列表数据 + total: number; // 页码 + pageNum = 1; // 页码 + pageSize = 10; // 条码 + loading = true; + isVisible = false; + constructor( + private form: FormBuilder, + private recharge: RechargeService, + private discount: DiscountService, + private apiMerchant: ApiMerchantsService, + private modal: NzModalService, + private coupon: CouponService, + private iconService: IconService, + private message: NzMessageService, + + ) { + } + + ngOnInit(): void { + this.init(); + } + + public init(): void { + this.searchForm = this.form.group({ + orderStatus: [null], // 订单状态 + orderNo: [null], // 订单号 + productType: [2], // 产品类型 + sourceOrderNo: [null], // 第三方订单号 + callbackStatus: [null], // 回调状态 + payTime: [null], // 支付时间 + createTime: [null], // 创建时间 + }); + + this.getRequest(true, this.searchForm.value); + } + + // 查询列表 + public getRequest(reset: boolean = false, whereObject: object) { + if (whereObject['payTime'] != null && whereObject['payTime'].length !== 0) { + whereObject['payTimeS'] = whereObject['payTime'][0].getTime(); + whereObject['payTimeE'] = whereObject['payTime'][1].getTime(); + } + + if (whereObject['createTime'] != null && whereObject['createTime'].length !== 0) { + whereObject['createTimeS'] = whereObject['createTime'][0].getTime(); + whereObject['createTimeE'] = whereObject['createTime'][1].getTime(); + } + this.loading = false; + if (reset) { + this.pageNum = 1; + } + whereObject['pageNum'] = this.pageNum; + whereObject['pageSize'] = this.pageSize; + this.apiMerchant.getApiThirdOrderByList(whereObject, data => { + if (data['return_code'] === '000000') { + this.requestData = data['return_data'].list; + this.total = data['return_data'].total; + } else { + this.message.error(data['return_msg']); + } + }); + } + + // 重置 + public resetForm(): void { + this.searchForm.reset(); + } + +} diff --git a/src/app/admin/api-order/starbucks-order/list/list.component.html b/src/app/admin/api-order/starbucks-order/list/list.component.html new file mode 100644 index 0000000..beee660 --- /dev/null +++ b/src/app/admin/api-order/starbucks-order/list/list.component.html @@ -0,0 +1,127 @@ + + + + + +
+
+
+
+ + 平台订单号 + + + + +
+
+ + 第三方订单号 + + + + +
+
+ + 订单状态 + + + + + + + + + + + + +
+ +
+ + 回调状态 + + + + + + + + + +
+
+ + 支付时间 + + + + +
+
+ + 创建时间 + + + + +
+
+
+
+ + +
+
+
+
+ +
+ 共计 {{total}} 条数据 + + + + 编号 + 平台订单号 + 第三方订单号 + 订单金额 + 下单金额 + 生成时间 + 支付时间 + 订单状态 + 支付状态 + + + + + {{i + 1}} + {{data.orderNo}} + {{data.sourceOrderNo}} + ¥{{data.orderPrice}} + ¥{{data.payPrice}} + {{data.createTime | date: 'yyyy-MM-dd HH:mm:ss'}} + {{data.payTime | date: 'yyyy-MM-dd HH:mm:ss'}} + {{data.callbackStatus | callbackStatus}} + {{data.orderStatus | payCouponStatus}} + + +
diff --git a/src/app/admin/api-order/starbucks-order/list/list.component.scss b/src/app/admin/api-order/starbucks-order/list/list.component.scss new file mode 100644 index 0000000..b68da73 --- /dev/null +++ b/src/app/admin/api-order/starbucks-order/list/list.component.scss @@ -0,0 +1,5 @@ +.table-td-operation { + a { + margin-left: 8px; + } +} diff --git a/src/app/admin/api-order/starbucks-order/list/list.component.ts b/src/app/admin/api-order/starbucks-order/list/list.component.ts new file mode 100644 index 0000000..a6e363c --- /dev/null +++ b/src/app/admin/api-order/starbucks-order/list/list.component.ts @@ -0,0 +1,92 @@ +import { Component, OnInit } from '@angular/core'; +import {environment} from '../../../../../environments/environment'; +import {FormBuilder, FormGroup} from '_@angular_forms@9.0.7@@angular/forms'; +import {RechargeService} from '../../../../services/recharge.service'; +import {DiscountService} from '../../../../services/discount.service'; +import {NzMessageService, NzModalService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd'; +import {CouponService} from '../../../../services/coupon.service'; +import {IconService} from '../../../../services/icon.service'; +import {ApiMerchantsService} from '../../../../services/api-merchants.service'; + +@Component({ + selector: 'app-list', + templateUrl: './list.component.html', + styleUrls: ['./list.component.scss'] +}) +export class ListComponent implements OnInit { + + FILE_URL = environment.imageUrl; + WEB_SERVE_URL = environment.baseUrl; + searchForm: FormGroup; // 搜索框 + validateForm: FormGroup; // 添加框 + requestData = []; // 列表数据 + total: number; // 页码 + pageNum = 1; // 页码 + pageSize = 10; // 条码 + loading = true; + isVisible = false; + constructor( + private form: FormBuilder, + private recharge: RechargeService, + private discount: DiscountService, + private apiMerchant: ApiMerchantsService, + private modal: NzModalService, + private coupon: CouponService, + private iconService: IconService, + private message: NzMessageService, + + ) { + } + + ngOnInit(): void { + this.init(); + } + + public init(): void { + this.searchForm = this.form.group({ + orderStatus: [null], // 订单状态 + orderNo: [null], // 订单号 + productType: [1], // 产品类型 + sourceOrderNo: [null], // 第三方订单号 + rechargeStatus: [null], // 充值状态 + callbackStatus: [null], // 回调状态 + payTime: [null], // 支付时间 + createTime: [null], // 创建时间 + }); + + this.getRequest(true, this.searchForm.value); + } + + // 查询列表 + public getRequest(reset: boolean = false, whereObject: object) { + if (whereObject['payTime'] != null && whereObject['payTime'].length !== 0) { + whereObject['payTimeS'] = whereObject['payTime'][0].getTime(); + whereObject['payTimeE'] = whereObject['payTime'][1].getTime(); + } + + if (whereObject['createTime'] != null && whereObject['createTime'].length !== 0) { + whereObject['createTimeS'] = whereObject['createTime'][0].getTime(); + whereObject['createTimeE'] = whereObject['createTime'][1].getTime(); + } + this.loading = false; + if (reset) { + this.pageNum = 1; + } + whereObject['pageNum'] = this.pageNum; + whereObject['pageSize'] = this.pageSize; + this.apiMerchant.getApiThirdOrderByList(whereObject, data => { + if (data['return_code'] === '000000') { + this.requestData = data['return_data'].list; + this.total = data['return_data'].total; + } else { + this.message.error(data['return_msg']); + } + }); + } + + // 重置 + public resetForm(): void { + this.searchForm.reset(); + } + +} diff --git a/src/app/admin/api-order/vip-top-up-order/vip-top-up-order.component.html b/src/app/admin/api-order/vip-top-up-order/vip-top-up-order.component.html new file mode 100644 index 0000000..beee660 --- /dev/null +++ b/src/app/admin/api-order/vip-top-up-order/vip-top-up-order.component.html @@ -0,0 +1,127 @@ + + + + + +
+
+
+
+ + 平台订单号 + + + + +
+
+ + 第三方订单号 + + + + +
+
+ + 订单状态 + + + + + + + + + + + + +
+ +
+ + 回调状态 + + + + + + + + + +
+
+ + 支付时间 + + + + +
+
+ + 创建时间 + + + + +
+
+
+
+ + +
+
+
+
+ +
+ 共计 {{total}} 条数据 + + + + 编号 + 平台订单号 + 第三方订单号 + 订单金额 + 下单金额 + 生成时间 + 支付时间 + 订单状态 + 支付状态 + + + + + {{i + 1}} + {{data.orderNo}} + {{data.sourceOrderNo}} + ¥{{data.orderPrice}} + ¥{{data.payPrice}} + {{data.createTime | date: 'yyyy-MM-dd HH:mm:ss'}} + {{data.payTime | date: 'yyyy-MM-dd HH:mm:ss'}} + {{data.callbackStatus | callbackStatus}} + {{data.orderStatus | payCouponStatus}} + + +
diff --git a/src/app/admin/api-order/vip-top-up-order/vip-top-up-order.component.scss b/src/app/admin/api-order/vip-top-up-order/vip-top-up-order.component.scss new file mode 100644 index 0000000..b68da73 --- /dev/null +++ b/src/app/admin/api-order/vip-top-up-order/vip-top-up-order.component.scss @@ -0,0 +1,5 @@ +.table-td-operation { + a { + margin-left: 8px; + } +} diff --git a/src/app/admin/api-order/vip-top-up-order/vip-top-up-order.component.ts b/src/app/admin/api-order/vip-top-up-order/vip-top-up-order.component.ts new file mode 100644 index 0000000..50fbdad --- /dev/null +++ b/src/app/admin/api-order/vip-top-up-order/vip-top-up-order.component.ts @@ -0,0 +1,93 @@ +import { Component, OnInit } from '@angular/core'; +import {environment} from '../../../../environments/environment'; +import {FormBuilder, FormGroup} from '_@angular_forms@9.0.7@@angular/forms'; +import {RechargeService} from '../../../services/recharge.service'; +import {DiscountService} from '../../../services/discount.service'; +import {ApiMerchantsService} from '../../../services/api-merchants.service'; +import {NzMessageService, NzModalService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd'; +import {CouponService} from '../../../services/coupon.service'; +import {IconService} from '../../../services/icon.service'; + +@Component({ + selector: 'app-vip-top-up-order', + templateUrl: './vip-top-up-order.component.html', + styleUrls: ['./vip-top-up-order.component.scss'] +}) +export class VipTopUpOrderComponent implements OnInit { + + FILE_URL = environment.imageUrl; + WEB_SERVE_URL = environment.baseUrl; + searchForm: FormGroup; // 搜索框 + validateForm: FormGroup; // 添加框 + requestData = []; // 列表数据 + total: number; // 页码 + pageNum = 1; // 页码 + pageSize = 10; // 条码 + loading = true; + isVisible = false; + constructor( + private form: FormBuilder, + private recharge: RechargeService, + private discount: DiscountService, + private apiMerchant: ApiMerchantsService, + private modal: NzModalService, + private coupon: CouponService, + private iconService: IconService, + private message: NzMessageService, + + ) { + } + + ngOnInit(): void { + this.init(); + } + + public init(): void { + this.searchForm = this.form.group({ + orderStatus: [null], // 订单状态 + orderNo: [null], // 订单号 + productType: [3], // 产品类型 + sourceOrderNo: [null], // 第三方订单号 + rechargeStatus: [null], // 充值状态 + callbackStatus: [null], // 回调状态 + payTime: [null], // 支付时间 + createTime: [null], // 创建时间 + }); + + this.getRequest(true, this.searchForm.value); + } + + // 查询列表 + public getRequest(reset: boolean = false, whereObject: object) { + if (whereObject['payTime'] != null && whereObject['payTime'].length !== 0) { + whereObject['payTimeS'] = whereObject['payTime'][0].getTime(); + whereObject['payTimeE'] = whereObject['payTime'][1].getTime(); + } + + if (whereObject['createTime'] != null && whereObject['createTime'].length !== 0) { + whereObject['createTimeS'] = whereObject['createTime'][0].getTime(); + whereObject['createTimeE'] = whereObject['createTime'][1].getTime(); + } + this.loading = false; + if (reset) { + this.pageNum = 1; + } + whereObject['pageNum'] = this.pageNum; + whereObject['pageSize'] = this.pageSize; + this.apiMerchant.getApiThirdOrderByList(whereObject, data => { + if (data['return_code'] === '000000') { + this.requestData = data['return_data'].list; + this.total = data['return_data'].total; + } else { + this.message.error(data['return_msg']); + } + }); + } + + // 重置 + public resetForm(): void { + this.searchForm.reset(); + } + + +} diff --git a/src/app/pipes/apiMerchant/callback-status.pipe.ts b/src/app/pipes/apiMerchant/callback-status.pipe.ts new file mode 100644 index 0000000..9374a35 --- /dev/null +++ b/src/app/pipes/apiMerchant/callback-status.pipe.ts @@ -0,0 +1,21 @@ +import { Pipe, PipeTransform } from '@angular/core'; + +@Pipe({ + name: 'callbackStatus' +}) +export class CallbackStatusPipe implements PipeTransform { + + transform(value: number): string { + switch (value) { + case 100: + return '未回调'; + case 101: + return '已回调'; + case 102: + return '回调未响应'; + case 103: + return '预备回调'; + } + } + +} diff --git a/src/app/pipes/order/pay-coupon-status.pipe.ts b/src/app/pipes/order/pay-coupon-status.pipe.ts new file mode 100644 index 0000000..31a3a5c --- /dev/null +++ b/src/app/pipes/order/pay-coupon-status.pipe.ts @@ -0,0 +1,26 @@ +import { Pipe, PipeTransform } from '@angular/core'; + +@Pipe({ + name: 'payCouponStatus' +}) +export class PayCouponStatusPipe implements PipeTransform { + + transform(value: number): string { + switch (value) { + case 1: + return '待支付'; + case 2: + return '已支付'; + case 3: + return '已完成'; + case 4: + return '已退款'; + case 5: + return '已取消'; + case 6: + return '退款中'; + case 7: + return '拒绝退款'; + } + } +}