diff --git a/src/app/admin/order-manage/api-mer-order-list/api-mer-order-list.component.html b/src/app/admin/order-manage/api-mer-order-list/api-mer-order-list.component.html new file mode 100644 index 0000000..4b54738 --- /dev/null +++ b/src/app/admin/order-manage/api-mer-order-list/api-mer-order-list.component.html @@ -0,0 +1,236 @@ + + + + + + +
+
+
+
+ +
+ + 交易单号 + + + + +
+ +
+ + 客户电话 + + + + +
+
+ + 交易状态 + + + + + + +
+
+ +
+
+ + 分公司 + + + + + + +
+ +
+ + 支付方式 + + + + + + + + + + + + +
+
+ + 支付卡号 + + + + +
+
+ + 支付时间 + + + + +
+ +
+ + 创建时间 + + + + +
+ +
+ + 退款时间 + + + + +
+
+
+
+ + + {{!isCollapse ? '更多条件' : '隐藏条件'}} +
+
+
+
+
+ + + +
+ 共计 {{total?total:0}} 条数据 + + + + + + + 交易单号 + 客户电话 + 订单名称 + 订单金额 + 支付金额 + 支付方式 + 订单状态 + 创建时间 + 操作 + + + + + {{data.orderNo}} + {{data.memPhone}} + {{data.title}} + ￥{{data.totalPrice}} + ￥{{data.payPrice}} + {{data.orderStatus == 1 || data.orderStatus == 5 ? '未支付' : data.payType | orderPayType}} + {{data.orderStatus | orderStatus}} + {{data.createTime | date : 'yyyy-MM-dd HH:mm:ss'}} + + 操作列表 + + + + + + + +
+ + + + + + + + {{orderDetailObject.tradeOrder.orderNo}} + {{orderDetailObject.tradeOrder.paySerialNo!=null?orderDetailObject.tradeOrder.paySerialNo:'无'}} + {{orderDetailObject.tradeOrder.memPhone}} + {{orderDetailObject.tradeOrder.orderStatus | orderStatus}} + {{orderDetailObject.tradeOrder.payType | orderPayType}} + + {{orderDetailObject.tradeOrder.memCardNo}} + + {{orderDetailObject.tradeOrder.memDiscountName?orderDetailObject.tradeOrder.memDiscountName:'无'}} + {{orderDetailObject.tradeOrder.whetherRebate?'是':'否'}} + {{orderDetailObject.tradeOrder.remarks}} + + + + + {{orderDetailObject.tradeOrder.totalPrice}} 元 + {{orderDetailObject.tradeOrder.totalDeductionPrice}} 元 + {{orderDetailObject.tradeOrder.deductionProductPrice}} 元 + {{orderDetailObject.tradeOrder.deductionCouponPrice}} 元 + {{orderDetailObject.tradeOrder.payablePrice}} 元 + {{orderDetailObject.tradeOrder.payGold / 100}} 元 + + {{orderDetailObject.tradeOrder.payRealPrice!=null?orderDetailObject.tradeOrder.payRealPrice+' 元':'未支付'}} + + + + + + + +

创建时间：{{orderDetailObject.tradeOrder.createTime | date : 'yyyy-MM-dd HH:mm:ss'}}

+

备注：{{orderDetailObject.tradeOrder.remarks?orderDetailObject.tradeOrder.remarks:'无'}}

+ + +

取消时间：{{orderDetailObject.tradeOrder.cancelTime | date : 'yyyy-MM-dd HH:mm:ss'}}

+

备注：{{orderDetailObject.tradeOrder.cancelRemarks?orderDetailObject.tradeOrder.cancelRemarks:'无'}}

+ + 支付时间：{{orderDetailObject.tradeOrder.payTime | date : 'yyyy-MM-dd HH:mm:ss'}} + 完成时间：{{orderDetailObject.tradeOrder.finishTime | date : 'yyyy-MM-dd HH:mm:ss'}} + 退款时间：{{orderDetailObject.tradeOrder.refundTime | date : 'yyyy-MM-dd HH:mm:ss'}} + + + + + + diff --git a/src/app/admin/order-manage/api-mer-order-list/api-mer-order-list.component.scss b/src/app/admin/order-manage/api-mer-order-list/api-mer-order-list.component.scss new file mode 100644 index 0000000..363c972 --- /dev/null +++ b/src/app/admin/order-manage/api-mer-order-list/api-mer-order-list.component.scss @@ -0,0 +1,3 @@ +img { + width: 60px; +} diff --git a/src/app/admin/order-manage/api-mer-order-list/api-mer-order-list.component.ts b/src/app/admin/order-manage/api-mer-order-list/api-mer-order-list.component.ts new file mode 100644 index 0000000..cc94abb --- /dev/null +++ b/src/app/admin/order-manage/api-mer-order-list/api-mer-order-list.component.ts @@ -0,0 +1,152 @@ +import { Component, OnInit } from '@angular/core'; +import {FormBuilder, FormGroup} from "@angular/forms"; +import {environment} from "../../../../environments/environment"; +import {LocalStorageService} from "../../../services/local-storage.service"; +import {NzMessageService} from "ng-zorro-antd"; +import {HltOrderService} from "../../../services/order/hlt-order.service"; +import {CompanyService} from "../../../services/company.service"; +import {CommonsService} from "../../../services/commons.service"; +import {ADMIN_INFO_OBJECT} from "../../../services/local-storage.namespace"; +import {animate, state, style, transition, trigger} from "@angular/animations"; +import {OrderApiMerService} from "../../../services/order/order-api-mer.service"; + +@Component({ + selector: 'app-api-mer-order-list', + animations: [ + trigger('openClose', [ + state('open', style({ + height: '260px', + opacity: 1, + backgroundColor: 'white' + })), + state('closed', style({ + opacity: 1, + backgroundColor: 'white' + })), + transition('open => closed', [ + animate('0.3s') + ]), + transition('closed => open', [ + animate('0.3s') + ]), + ]), + ], + templateUrl: './api-mer-order-list.component.html', + styleUrls: ['./api-mer-order-list.component.scss'] +}) +export class ApiMerOrderListComponent implements OnInit { + + + + // 搜索框 + searchForm: FormGroup; + // 搜索框折叠 + isCollapse = false; + // 订单状态数据 + orderStatusArray = []; + // 公司数据 + companyArray = []; + // 角色类型 + roleType: number; + // 列表相关参数 + // 总条数 + total: number; + // 页码 + pageNum = 1; + // 条码 + pageSize = 10; + // 列表数据 + requestData = []; + // 列表加载 + loading = true; + // 订单详情相关参数 + // 详情模态框 + orderDetailModal = false; + // 详情模态框数据等待 + orderDetailModalLoading = false; + // 订单详情数据 + orderDetailObject: any = { + tradeOrder: {}, + }; + // 数据加载中参数 + loadingObject = { + title: '加载中...', + status: false, + }; + // 请求地址参数 + FILE_URL = environment.imageUrl; + mchId: string ; + constructor( + private form: FormBuilder, + private store: LocalStorageService, + private message: NzMessageService, + private apiMerOrderService: OrderApiMerService, + private companyService: CompanyService, + private commonsService: CommonsService, + ) { } + + ngOnInit(): void { + // 搜索表单初始化 + this.searchForm = this.form.group({ + orderNo: [null], + memPhone: [null], + payTimeArray: [null], + orderStatus: [null], + createTimeArray: [null], + refundTimeArray: [null], + companyId: [null], + payType: [null], + memCardNo: [null], + }); + // 角色类型初始化 + this.roleType = Number(this.store.get(ADMIN_INFO_OBJECT)['secRole'].roleType); + this.mchId = this.store.get(ADMIN_INFO_OBJECT)['apiMerchants'].mchId; + // 查询公司列表 + if (this.roleType === 0 || this.roleType === 1) { + this.companyService.selectCompanyList({ pageNum: 1, pageSize: 999 }, data => { + this.companyArray = data['return_data']['list']; + }); + } + // 查询订单状态数据 + this.commonsService.getDictionary('ORDER_STATUS', data => { + this.orderStatusArray = data['return_data']; + }); + this.getRequest(true, this.searchForm.value); + } + + // 查询列表 + public getRequest(reset: boolean = false, whereObject: object) { + this.loading = true; + if (reset) { + this.pageNum = 1; + } + whereObject['promoteCode'] = this.mchId; + whereObject['pageNum'] = this.pageNum; + whereObject['pageSize'] = this.pageSize; + this.apiMerOrderService.getOrderList(whereObject, data => { + this.loading = false; + 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 showOrderDetail(orderNo: string) { + this.orderDetailModal = true; + this.orderDetailModalLoading = true; + this.apiMerOrderService.getOrderDetail(orderNo, data => { + if (data['return_code'] === '000000') { + this.orderDetailObject = data['return_data']; + } else { + this.message.error(data['return_msg']); + } + this.orderDetailModalLoading = false; + }); + + } + +} diff --git a/src/app/admin/order-manage/order-manage-routing.module.ts b/src/app/admin/order-manage/order-manage-routing.module.ts index 75eede6..b1fb09d 100644 --- a/src/app/admin/order-manage/order-manage-routing.module.ts +++ b/src/app/admin/order-manage/order-manage-routing.module.ts @@ -14,6 +14,7 @@ import {MobileRechargeOrderListComponent} from './mobile-recharge-order-list/mob import {HltChargeOrderComponent} from './hlt-charge-order/hlt-charge-order.component'; import {GoodsOrderComponent} from './goods-order/goods-order.component'; import {GoodsChildOrderComponent} from './goods-child-order/goods-child-order.component'; +import {ApiMerOrderListComponent} from "./api-mer-order-list/api-mer-order-list.component"; const routes: Routes = [ @@ -31,6 +32,7 @@ const routes: Routes = [ { path: 'hlt-order-list', component: HltChargeOrderComponent}, { path: 'goods-order', component: GoodsOrderComponent}, { path: 'goods-child-order', component: GoodsChildOrderComponent}, + { path: 'api-mer-order', component: ApiMerOrderListComponent}, ]; @NgModule({ diff --git a/src/app/admin/order-manage/order-manage.module.ts b/src/app/admin/order-manage/order-manage.module.ts index f22e652..d01212e 100644 --- a/src/app/admin/order-manage/order-manage.module.ts +++ b/src/app/admin/order-manage/order-manage.module.ts @@ -24,9 +24,10 @@ import { HltChargeOrderComponent } from './hlt-charge-order/hlt-charge-order.com import { GoodsOrderComponent } from './goods-order/goods-order.component'; import {PreviewImageModule} from "../../common/preview-image/preview-image.module"; import { GoodsChildOrderComponent } from './goods-child-order/goods-child-order.component'; +import { ApiMerOrderListComponent } from './api-mer-order-list/api-mer-order-list.component'; @NgModule({ - declarations: [OrderOilListComponent, OrderCouponListComponent, OrderIntegralRechargeComponent, OrderRefundListComponent, KfcOrderListComponent, StarbucksOrderListComponent, MemberChargeOrderListComponent, MobileRechargeOrderListComponent, PreOrderComponent,DicountPackageOrderListComponent, MemberChargeOrderListComponent, DiscountUseConditionListComponent, HltChargeOrderComponent, GoodsOrderComponent, GoodsChildOrderComponent], + declarations: [OrderOilListComponent, OrderCouponListComponent, OrderIntegralRechargeComponent, OrderRefundListComponent, KfcOrderListComponent, StarbucksOrderListComponent, MemberChargeOrderListComponent, MobileRechargeOrderListComponent, PreOrderComponent,DicountPackageOrderListComponent, MemberChargeOrderListComponent, DiscountUseConditionListComponent, HltChargeOrderComponent, GoodsOrderComponent, GoodsChildOrderComponent, ApiMerOrderListComponent], imports: [ CommonModule, OrderManageRoutingModule, diff --git a/src/app/services/Interceptor.service.ts b/src/app/services/Interceptor.service.ts index 957b29e..7ec7ac8 100644 --- a/src/app/services/Interceptor.service.ts +++ b/src/app/services/Interceptor.service.ts @@ -6,7 +6,6 @@ import {catchError, finalize} from 'rxjs/operators'; import {mergeMap} from 'rxjs/operators'; import {Observable} from 'rxjs'; import {NzMessageService} from 'ng-zorro-antd'; -import {Router} from '@angular/router'; import {LocalStorageService} from './local-storage.service'; import {TOKEN} from './local-storage.namespace'; @@ -14,7 +13,6 @@ import {TOKEN} from './local-storage.namespace'; export class InterceptorService implements HttpInterceptor { constructor( private message: NzMessageService, - private router: Router, private storage: LocalStorageService, ) { } diff --git a/src/app/services/order/order-api-mer.service.ts b/src/app/services/order/order-api-mer.service.ts new file mode 100644 index 0000000..7b2862a --- /dev/null +++ b/src/app/services/order/order-api-mer.service.ts @@ -0,0 +1,43 @@ +import { Injectable } from '@angular/core'; +import {CommonsService} from '../commons.service'; +import {environment} from '../../../environments/environment'; +import {HttpClient} from '@angular/common/http'; + +@Injectable({ + providedIn: 'root' +}) +export class OrderApiMerService { + + constructor( + private http: HttpClient, + private common: CommonsService + ) { } + + /** + * @Author Sum1Dream + * @methodName getOrderKfcList + * @Description // 查询肯德基订单 + * @Date 17:20 2022/10/27 + * @Param param + */ + public getOrderList(param: object, callBack) { + this.http.get(environment.orderUrl + 'apiMerOrder/getOrderList?' + this.common.getWhereCondition(param)).subscribe(data => { + callBack(data); + }); + } + + /** + * @Author Sum1Dream + * @methodName getOrderDetail + * @Description // 根据订单号查询订单详情 + * @Date 14:38 2022/10/28 + * @Param orderNo: string, callBack + */ + public getOrderDetail(orderNo: string, callBack) { + this.http.get(environment.orderUrl + 'apiMerOrder/getOrderDetail?orderNo=' + orderNo).subscribe(data => { + callBack(data); + }); + } + + +} diff --git a/src/favicon.ico b/src/favicon.ico deleted file mode 100644 index ba7c40e..0000000 Binary files a/src/favicon.ico and /dev/null differ diff --git a/src/index.html b/src/index.html index 7e90525..2051cb1 100644 --- a/src/index.html +++ b/src/index.html @@ -7,7 +7,7 @@ - +