master
parent
2f4b216e88
commit
689a40f1d3
@ -0,0 +1,181 @@ |
|||||||
|
<form nz-form [formGroup]="searchForm" class="search_form" [nzLayout]="'vertical'"> |
||||||
|
<div nz-row [nzGutter]="24"> |
||||||
|
|
||||||
|
<div nz-col [nzSpan]="6"> |
||||||
|
<nz-form-item> |
||||||
|
<nz-form-label>订单号</nz-form-label> |
||||||
|
<nz-form-control> |
||||||
|
<input nzSize="large" nz-input formControlName="orderNo" placeholder="请输入" /> |
||||||
|
</nz-form-control> |
||||||
|
</nz-form-item> |
||||||
|
</div> |
||||||
|
<div nz-col [nzSpan]="6"> |
||||||
|
<nz-form-item> |
||||||
|
<nz-form-label>完成时间</nz-form-label> |
||||||
|
<nz-form-control> |
||||||
|
<nz-range-picker nzSize="large" formControlName="finishTimeArray" [nzFormat]="'yyyy/MM/dd'"></nz-range-picker> |
||||||
|
</nz-form-control> |
||||||
|
</nz-form-item> |
||||||
|
</div> |
||||||
|
<div nz-col [nzSpan]="6"> |
||||||
|
<nz-form-item> |
||||||
|
<nz-form-label>创建时间</nz-form-label> |
||||||
|
<nz-form-control> |
||||||
|
<nz-range-picker nzSize="large" formControlName="createTimeArray" [nzFormat]="'yyyy/MM/dd'"></nz-range-picker> |
||||||
|
</nz-form-control> |
||||||
|
</nz-form-item> |
||||||
|
</div> |
||||||
|
<div nz-col [nzSpan]="6"> |
||||||
|
<nz-form-item> |
||||||
|
<nz-form-label>支付状态</nz-form-label> |
||||||
|
<nz-form-control> |
||||||
|
<nz-select nzSize="large" nzShowSearch nzAllowClear nzPlaceHolder="请选择" formControlName="status"> |
||||||
|
<nz-option *ngFor="let item of orderGoodsChild" nzLabel="{{item['name']}}" nzValue="{{item['key']}}"></nz-option> |
||||||
|
</nz-select> |
||||||
|
</nz-form-control> |
||||||
|
</nz-form-item> |
||||||
|
</div> |
||||||
|
|
||||||
|
<div nz-col [nzSpan]="6" [hidden]="!isCollapse"> |
||||||
|
<nz-form-item> |
||||||
|
<nz-form-label>商品名称</nz-form-label> |
||||||
|
<nz-form-control> |
||||||
|
<input nzSize="large" nz-input formControlName="goodsName" placeholder="请输入" /> |
||||||
|
</nz-form-control> |
||||||
|
</nz-form-item> |
||||||
|
</div> |
||||||
|
|
||||||
|
<div nz-col [nzSpan]="6" [hidden]="!isCollapse"> |
||||||
|
<nz-form-item> |
||||||
|
<nz-form-label>子订单号</nz-form-label> |
||||||
|
<nz-form-control> |
||||||
|
<input nzSize="large" nz-input formControlName="childOrderNo" placeholder="请输入" /> |
||||||
|
</nz-form-control> |
||||||
|
</nz-form-item> |
||||||
|
</div> |
||||||
|
<div nz-col [nzSpan]="6" [hidden]="!isCollapse"> |
||||||
|
<nz-form-item> |
||||||
|
<nz-form-label>用户手机号</nz-form-label> |
||||||
|
<nz-form-control> |
||||||
|
<input nzSize="large" nz-input formControlName="userPhone" placeholder="请输入" /> |
||||||
|
</nz-form-control> |
||||||
|
</nz-form-item> |
||||||
|
</div> |
||||||
|
<div nz-col [nzSpan]="6" [hidden]="!isCollapse"> |
||||||
|
<nz-form-item> |
||||||
|
<nz-form-label>支付类型</nz-form-label> |
||||||
|
<nz-form-control> |
||||||
|
<nz-select nzSize="large" nzShowSearch nzAllowClear nzPlaceHolder="请选择" formControlName="payType"> |
||||||
|
<nz-option *ngFor="let item of orderPayType" nzLabel="{{item['name']}}" nzValue="{{item['key']}}"></nz-option> |
||||||
|
</nz-select> |
||||||
|
</nz-form-control> |
||||||
|
</nz-form-item> |
||||||
|
</div> |
||||||
|
|
||||||
|
<div nz-col [nzSpan]="6" > |
||||||
|
<a class="collapse" (click)="isCollapse = !isCollapse"> |
||||||
|
{{isCollapse ? '收起至简洁查询' : '更多查询条件'}} |
||||||
|
<i nz-icon [nzType]="!isCollapse ? 'down' : 'up'"></i> |
||||||
|
</a> |
||||||
|
</div> |
||||||
|
|
||||||
|
<div nz-col [nzSpan]="24" class="search-area"> |
||||||
|
<button nz-button [nzType]="'primary'" (click)="getRequest()">查询</button> |
||||||
|
<button nz-button (click)="reset()">重置</button> |
||||||
|
<!-- <button nz-button [nzType]="'primary'" (click)="getExport()">导出交易明细</button>--> |
||||||
|
</div> |
||||||
|
</div> |
||||||
|
</form> |
||||||
|
|
||||||
|
<nz-table #basicTable |
||||||
|
[nzScroll]="{ x: '1980px' }" |
||||||
|
[nzBordered]="true" |
||||||
|
[nzFrontPagination]="false" |
||||||
|
[nzShowQuickJumper]="true" |
||||||
|
[nzShowTotal]="totalTemplate" |
||||||
|
[(nzPageIndex)]="tablePageNum" |
||||||
|
(nzPageIndexChange)="getRequest(false)" |
||||||
|
[nzTotal]="tableData.total" |
||||||
|
[nzData]="tableData.list" > |
||||||
|
<thead> |
||||||
|
<tr> |
||||||
|
<th nzWidth="200px">商品名称</th> |
||||||
|
<th nzWidth="100px">用户手机号</th> |
||||||
|
<th nzWidth="100px">订单号</th> |
||||||
|
<th nzWidth="100px">子订单号</th> |
||||||
|
<th nzWidth="100px">商品价格</th> |
||||||
|
<th nzWidth="100px">服务费</th> |
||||||
|
<th nzWidth="100px">支付金额</th> |
||||||
|
<th nzWidth="70px">创建时间</th> |
||||||
|
<th nzWidth="70px">更新时间</th> |
||||||
|
<th nzWidth="70px">完成时间</th> |
||||||
|
<th nzRight nzWidth="70px">支付类型</th> |
||||||
|
<th nzRight nzWidth="70px">支付状态</th> |
||||||
|
<th nzRight nzWidth="90px">操作</th> |
||||||
|
</tr> |
||||||
|
</thead> |
||||||
|
<tbody> |
||||||
|
<tr *ngFor="let data of basicTable.data"> |
||||||
|
<td>{{data.goodsName}}</td> |
||||||
|
<td>{{data.userPhone}}</td> |
||||||
|
<td>{{data.orderNo}}</td> |
||||||
|
<td>{{data.childOrderNo}}</td> |
||||||
|
<td>¥{{data.tradeAmount}}</td> |
||||||
|
<td>¥{{data.servicePrice}}</td> |
||||||
|
<td>¥{{data.payRealPrice}}</td> |
||||||
|
<td>{{ data.createTime | date: 'yyyy-MM-dd HH:mm'}}</td> |
||||||
|
<td>{{ data.updateTime | date: 'yyyy-MM-dd HH:mm'}}</td> |
||||||
|
<td>{{ data.finishTime | date: 'yyyy-MM-dd HH:mm'}}</td> |
||||||
|
<td nzRight> |
||||||
|
<span style="font-size: 30px;" nz-icon [nzIconfont]="data.payType | payType"></span> |
||||||
|
</td> |
||||||
|
<td nzRight> |
||||||
|
{{data.status | orderChildStatus}} |
||||||
|
</td> |
||||||
|
<td nzRight> |
||||||
|
<a (click)="showDetail(data)">详情</a> |
||||||
|
</tr> |
||||||
|
</tbody> |
||||||
|
<ng-template #totalTemplate let-total>总计 {{ total }} 条</ng-template> |
||||||
|
|
||||||
|
<nz-modal [nzWidth]="1400" [(nzVisible)]="orderDetailModal" nzTitle="订单详情" (nzOnCancel)="orderDetailModal = false" (nzOnOk)="orderDetailModal = false"> |
||||||
|
<ng-container *nzModalContent> |
||||||
|
|
||||||
|
<nz-tabset nzType="card"> |
||||||
|
<nz-tab nzTitle="订单信息"> |
||||||
|
<nz-descriptions nzTitle="订单信息" nzBordered> |
||||||
|
<nz-descriptions-item nzTitle="商品名称"> |
||||||
|
<p [innerHTML]="orderGoodsData.goodsName"></p> |
||||||
|
</nz-descriptions-item> |
||||||
|
<nz-descriptions-item nzTitle="用户手机号">{{ orderGoodsData?.userPhone }}</nz-descriptions-item>//. |
||||||
|
<nz-descriptions-item nzTitle="订单状态">{{ orderGoodsData?.status | orderChildStatus }}</nz-descriptions-item>//. |
||||||
|
</nz-descriptions> |
||||||
|
</nz-tab> |
||||||
|
<nz-tab nzTitle="支付信息"> |
||||||
|
<nz-descriptions nzTitle="支付信息" nzBordered> |
||||||
|
<nz-descriptions-item nzTitle="订单号">{{ orderGoodsData?.orderNo }}</nz-descriptions-item> |
||||||
|
<nz-descriptions-item nzTitle="子订单号" [nzSpan]="2">{{ orderGoodsData?.childOrderNo }}</nz-descriptions-item> |
||||||
|
<nz-descriptions-item nzTitle="支付流水号" [nzSpan]="3">{{ orderGoodsData?.paySerialNo }}</nz-descriptions-item> |
||||||
|
<nz-descriptions-item nzTitle="商品总金额" [nzSpan]="3">{{ orderGoodsData?.totalPrice }}</nz-descriptions-item> |
||||||
|
<nz-descriptions-item nzTitle="优惠券优惠金额" [nzSpan]="3">{{ orderGoodsData?.couponDiscountPrice }}</nz-descriptions-item> |
||||||
|
<nz-descriptions-item nzTitle="积分抵扣优惠金额" [nzSpan]="3">{{ orderGoodsData?.integralDiscountPrice }}</nz-descriptions-item> |
||||||
|
<nz-descriptions-item nzTitle="总优惠金额（优惠券优惠金额 + 积分抵扣）" [nzSpan]="3">{{ orderGoodsData?.totalDeductionPrice }}</nz-descriptions-item> |
||||||
|
<nz-descriptions-item nzTitle="商品金额" [nzSpan]="3">{{ orderGoodsData?.tradeAmount }}</nz-descriptions-item> |
||||||
|
<nz-descriptions-item nzTitle="商品服务费" [nzSpan]="3">{{ orderGoodsData?.servicePrice }}</nz-descriptions-item> |
||||||
|
<nz-descriptions-item nzTitle="实付金额" [nzSpan]="3">{{ orderGoodsData?.payRealPrice }}</nz-descriptions-item> |
||||||
|
</nz-descriptions> |
||||||
|
</nz-tab> |
||||||
|
<nz-tab nzTitle="订单时间"> |
||||||
|
<nz-descriptions nzTitle="订单时间" nzBordered> |
||||||
|
<nz-descriptions-item *ngIf="orderGoodsData?.createTime != null" nzTitle="创建时间">{{ orderGoodsData?.createTime | date: 'yyyy-MM-dd HH:mm' }}</nz-descriptions-item> |
||||||
|
<nz-descriptions-item *ngIf="orderGoodsData?.payTime != null" nzTitle="支付时间">{{ orderGoodsData?.payTime | date: 'yyyy-MM-dd HH:mm' }}</nz-descriptions-item> |
||||||
|
<nz-descriptions-item *ngIf="orderGoodsData?.cancelTime != null" nzTitle="取消时间">{{ orderGoodsData?.cancelTime | date: 'yyyy-MM-dd HH:mm' }}</nz-descriptions-item> |
||||||
|
<nz-descriptions-item *ngIf="orderGoodsData?.refundTime != null" nzTitle="退款时间">{{ orderGoodsData?.refundTime | date: 'yyyy-MM-dd HH:mm' }}</nz-descriptions-item> |
||||||
|
<nz-descriptions-item *ngIf="orderGoodsData?.finishTime != null" nzTitle="完成时间">{{ orderGoodsData?.finishTime | date: 'yyyy-MM-dd HH:mm' }}</nz-descriptions-item> |
||||||
|
<nz-descriptions-item *ngIf="orderGoodsData?.updateTime != null" nzTitle="更新时间">{{ orderGoodsData?.updateTime | date: 'yyyy-MM-dd HH:mm' }}</nz-descriptions-item> |
||||||
|
</nz-descriptions> |
||||||
|
</nz-tab> |
||||||
|
</nz-tabset> |
||||||
|
|
||||||
|
</ng-container> |
||||||
|
</nz-modal> |
||||||
@ -0,0 +1,207 @@ |
|||||||
|
|
||||||
|
import { |
||||||
|
fallbackImg, |
||||||
|
logisticsStatus, |
||||||
|
orderCinemaStatus, |
||||||
|
orderGoodsChild, |
||||||
|
orderPayType |
||||||
|
} from '../../../data/goods/goods.namespace'; |
||||||
|
import {NzTabSetComponent, NzTabsModule} from "ng-zorro-antd/tabs"; |
||||||
|
import {NzColDirective, NzRowDirective} from "ng-zorro-antd/grid"; |
||||||
|
import {NzFormDirective, NzFormModule} from "ng-zorro-antd/form"; |
||||||
|
import {FormGroup, FormsModule, NonNullableFormBuilder, ReactiveFormsModule} from "@angular/forms"; |
||||||
|
import {NzTreeSelectComponent} from "ng-zorro-antd/tree-select"; |
||||||
|
import {NzInputDirective} from "ng-zorro-antd/input"; |
||||||
|
import {NzOptionComponent, NzSelectComponent} from "ng-zorro-antd/select"; |
||||||
|
import {NzButtonComponent} from "ng-zorro-antd/button"; |
||||||
|
import {NzTableComponent, NzTableModule, NzThMeasureDirective} from "ng-zorro-antd/table"; |
||||||
|
import {NzImageDirective, NzImageModule} from "ng-zorro-antd/image"; |
||||||
|
import {NzModalModule} from "ng-zorro-antd/modal"; |
||||||
|
import {DatePipe, NgClass, NgForOf, NgIf} from "@angular/common"; |
||||||
|
import {NzDropDownADirective, NzDropDownDirective, NzDropdownMenuComponent} from "ng-zorro-antd/dropdown"; |
||||||
|
import {NzMenuDirective, NzMenuItemComponent} from "ng-zorro-antd/menu"; |
||||||
|
import {NzDescriptionsModule} from "ng-zorro-antd/descriptions"; |
||||||
|
import {NzPopconfirmDirective} from "ng-zorro-antd/popconfirm"; |
||||||
|
import {NzDividerComponent} from "ng-zorro-antd/divider"; |
||||||
|
import {NzIconDirective} from "ng-zorro-antd/icon"; |
||||||
|
import {NzBadgeComponent} from "ng-zorro-antd/badge"; |
||||||
|
import {NzSpinComponent} from "ng-zorro-antd/spin"; |
||||||
|
import {NzTimelineComponent, NzTimelineItemComponent} from "ng-zorro-antd/timeline"; |
||||||
|
import {NzResultComponent} from "ng-zorro-antd/result"; |
||||||
|
import {NzDatePickerComponent, NzRangePickerComponent} from "ng-zorro-antd/date-picker"; |
||||||
|
import {NzRadioButtonDirective, NzRadioComponent, NzRadioGroupComponent} from "ng-zorro-antd/radio"; |
||||||
|
import {Component} from "@angular/core"; |
||||||
|
import {PayTypePipe} from "../../../pipes/goods/pay-type.pipe"; |
||||||
|
import {OrderChildStatusPipe} from "../../../pipes/goods/order-child-status.pipe"; |
||||||
|
import {NzMessageService} from "ng-zorro-antd/message"; |
||||||
|
import {BrowserStorageService} from "../../../utils/localStorage.service"; |
||||||
|
import {MerService} from "../../../services/merchant/mer.service"; |
||||||
|
import {IconService} from "../../../services/common/icon.service"; |
||||||
|
import {MeituanService} from "../../../services/trade/meituan.service"; |
||||||
|
import {DateUtils} from "../../../utils/dateUtils.service"; |
||||||
|
import {CommunicationService} from "../../../services/common/communication.service"; |
||||||
|
import {OrderCinemaStatusPipe} from "../../../pipes/goods/order-cinema-status.pipe"; |
||||||
|
import {OrderGoodsData} from "../../../model/order.interface"; |
||||||
|
@Component({ |
||||||
|
selector: 'app-meituan-list', |
||||||
|
standalone: true, |
||||||
|
imports: [ |
||||||
|
NzColDirective, |
||||||
|
NzRowDirective, |
||||||
|
NzFormDirective, |
||||||
|
ReactiveFormsModule, |
||||||
|
NzTreeSelectComponent, |
||||||
|
NzInputDirective, |
||||||
|
NzSelectComponent, |
||||||
|
NzOptionComponent, |
||||||
|
NzButtonComponent, |
||||||
|
NzTableComponent, |
||||||
|
NzImageModule, |
||||||
|
NzModalModule, |
||||||
|
NzTableModule, |
||||||
|
NzFormModule, |
||||||
|
NzThMeasureDirective, |
||||||
|
NgForOf, |
||||||
|
NzImageDirective, |
||||||
|
DatePipe, |
||||||
|
NzDropdownMenuComponent, |
||||||
|
NgIf, |
||||||
|
NzMenuDirective, |
||||||
|
NzDescriptionsModule, |
||||||
|
NzMenuItemComponent, |
||||||
|
NzPopconfirmDirective, |
||||||
|
NzDividerComponent, |
||||||
|
NzDropDownADirective, |
||||||
|
NzDropDownDirective, |
||||||
|
NzTabsModule, |
||||||
|
NzIconDirective, |
||||||
|
NzBadgeComponent, |
||||||
|
NzTabSetComponent, |
||||||
|
FormsModule, |
||||||
|
NzSpinComponent, |
||||||
|
NzTimelineItemComponent, |
||||||
|
NgClass, |
||||||
|
NzResultComponent, |
||||||
|
NzTimelineComponent, |
||||||
|
NzDatePickerComponent, |
||||||
|
NzRadioButtonDirective, |
||||||
|
NzRadioComponent, |
||||||
|
NzRadioGroupComponent, |
||||||
|
NzRangePickerComponent, |
||||||
|
PayTypePipe, |
||||||
|
OrderChildStatusPipe, |
||||||
|
OrderCinemaStatusPipe, |
||||||
|
], |
||||||
|
templateUrl: './meituan-list.component.html', |
||||||
|
styleUrl: './meituan-list.component.less' |
||||||
|
}) |
||||||
|
export class MeituanListComponent { |
||||||
|
// 表单页数
|
||||||
|
tablePageNum = 1; |
||||||
|
// 表单数据
|
||||||
|
tableData: any = { |
||||||
|
total: 0, |
||||||
|
loading: false, |
||||||
|
list: [], |
||||||
|
}; |
||||||
|
// 搜索表单
|
||||||
|
searchForm: FormGroup; |
||||||
|
orderDetailModal = false; |
||||||
|
// 更多查询条件
|
||||||
|
isCollapse = false; |
||||||
|
orderGoodsData: any; |
||||||
|
|
||||||
|
protected readonly orderGoodsChild = orderGoodsChild; |
||||||
|
protected readonly orderPayType = orderPayType; |
||||||
|
|
||||||
|
constructor(private fb: NonNullableFormBuilder, |
||||||
|
private msg: NzMessageService, |
||||||
|
private iconService: IconService, |
||||||
|
private communicationService: CommunicationService, |
||||||
|
private meiTuanService: MeituanService,) { |
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
// 初始化搜索框
|
||||||
|
this.searchForm = this.fb.group({ |
||||||
|
orderNo: [''], |
||||||
|
childOrderNo: [''], |
||||||
|
userPhone: [''], |
||||||
|
createTimeArray: [[]], |
||||||
|
finishTimeArray: [[]], |
||||||
|
createTimeS: [''], |
||||||
|
createTimeE: [''], |
||||||
|
finishTimeS: [''], |
||||||
|
finishTimeE: [''], |
||||||
|
goodsName: [''], |
||||||
|
status: [''], |
||||||
|
payType: [''], |
||||||
|
}); |
||||||
|
this.getRequest(); |
||||||
|
} |
||||||
|
|
||||||
|
|
||||||
|
// 查询列表
|
||||||
|
public getRequest(reset: boolean = false) { |
||||||
|
|
||||||
|
if (this.searchForm.controls['createTimeArray'].value != null |
||||||
|
&& this.searchForm.controls['createTimeArray'].value.length > 0) { |
||||||
|
this.searchForm.controls['createTimeS'].setValue(DateUtils.getDateHMS(new Date(this.searchForm.controls['createTimeArray'].value[0]) , 1).getTime()); |
||||||
|
this.searchForm.controls['createTimeE'].setValue(DateUtils.getDateHMS(new Date(this.searchForm.controls['createTimeArray'].value[1]) , 2).getTime()); |
||||||
|
} else { |
||||||
|
this.searchForm.controls['createTimeS'].setValue(null) |
||||||
|
this.searchForm.controls['createTimeE'].setValue(null) |
||||||
|
} |
||||||
|
if (this.searchForm.controls['finishTimeArray'].value != null |
||||||
|
&& this.searchForm.controls['finishTimeArray'].value.length > 0) { |
||||||
|
this.searchForm.controls['finishTimeS'].setValue(DateUtils.getDateHMS(new Date(this.searchForm.controls['finishTimeArray'].value[0]) , 1).getTime()); |
||||||
|
this.searchForm.controls['finishTimeE'].setValue(DateUtils.getDateHMS(new Date(this.searchForm.controls['finishTimeArray'].value[1]) , 2).getTime()); |
||||||
|
} else { |
||||||
|
this.searchForm.controls['finishTimeS'].setValue(null) |
||||||
|
this.searchForm.controls['finishTimeE'].setValue(null) |
||||||
|
} |
||||||
|
|
||||||
|
this.tableData.loading = true; |
||||||
|
if (reset) { |
||||||
|
this.tablePageNum = 1; |
||||||
|
} |
||||||
|
this.searchForm.value.pageNum = this.tablePageNum; |
||||||
|
this.searchForm.value.pageSize = 10; |
||||||
|
this.searchForm.value.time = new Date().getTime(); |
||||||
|
|
||||||
|
this.meiTuanService.getListMeiTuan(this.searchForm.value , (data: any) => { |
||||||
|
if (data['return_code'] == '000000') { |
||||||
|
this.tableData = data['return_data']; |
||||||
|
} else { |
||||||
|
this.msg.error(data['return_msg']); |
||||||
|
} |
||||||
|
this.tableData.loading = false; |
||||||
|
}); |
||||||
|
} |
||||||
|
|
||||||
|
// 重制
|
||||||
|
public reset() { |
||||||
|
this.searchForm.reset(); |
||||||
|
this.getRequest(); |
||||||
|
} |
||||||
|
|
||||||
|
|
||||||
|
// 订单导出
|
||||||
|
public getExport() { |
||||||
|
this.searchForm.value.time = new Date().getTime(); |
||||||
|
this.meiTuanService.exportMeiTuanOrder(this.searchForm.value , (data: any) => { |
||||||
|
if (data['return_code'] == '000000') { |
||||||
|
this.communicationService.sendMessage(data['return_data']); |
||||||
|
} else { |
||||||
|
this.msg.error(data['return_msg']); |
||||||
|
} |
||||||
|
this.tableData.loading = false; |
||||||
|
}); |
||||||
|
} |
||||||
|
|
||||||
|
showDetail(data: OrderGoodsData): void { |
||||||
|
this.orderGoodsData = data; |
||||||
|
this.orderDetailModal = true; |
||||||
|
} |
||||||
|
} |
||||||
Loading…
Reference in new issue