Merge branch 'master' of http://gitea.dctpay.com/yuanye/puhui-go-web
commit
ebaaf09262
@ -1,6 +1,7 @@ |
|||||||
.search-area { |
.search-area { |
||||||
|
margin-top: 20px; |
||||||
margin-bottom: 10px; |
margin-bottom: 10px; |
||||||
} |
} |
||||||
.search-area button { |
.search-area button { |
||||||
margin-right: 8px; |
margin-right: 14px; |
||||||
} |
} |
||||||
|
@ -0,0 +1,291 @@ |
|||||||
|
<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="logisticsNo" 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> |
||||||
|
<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-select nzSize="large" nzShowSearch nzAllowClear nzPlaceHolder="请选择" formControlName="logisticsStatus"> |
||||||
|
<nz-option *ngFor="let item of logisticsStatus" nzLabel="{{item['name']}}" nzValue="{{item['key']}}"></nz-option> |
||||||
|
</nz-select> |
||||||
|
</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" [hidden]="!isCollapse" *ngIf="objectType == 1"> |
||||||
|
<nz-form-item> |
||||||
|
<nz-form-label>商户</nz-form-label> |
||||||
|
<nz-form-control> |
||||||
|
<nz-select nzSize="large" nzShowSearch nzAllowClear nzPlaceHolder="请选择" formControlName="merId"> |
||||||
|
<nz-option *ngFor="let item of merData" nzLabel="{{item['merName']}}" nzValue="{{item['id']}}"></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-tree-select |
||||||
|
nzPlaceHolder="请选择" |
||||||
|
formControlName="goodsType" |
||||||
|
[nzNodes]="nodes" |
||||||
|
nzShowSearch |
||||||
|
></nz-tree-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> |
||||||
|
<nz-select nzSize="large" nzShowSearch nzAllowClear nzPlaceHolder="请选择" formControlName="goodsBrand"> |
||||||
|
<nz-option *ngFor="let item of nodesBrand" nzLabel="{{item['title']}}" nzValue="{{item['id']}}"></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> |
||||||
|
<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]="24" class="search-area"> |
||||||
|
<button nz-button [nzType]="'primary'" (click)="getRequest()">查询</button> |
||||||
|
<button nz-button (click)="reset()">重置</button> |
||||||
|
<a class="collapse" (click)="isCollapse = !isCollapse"> |
||||||
|
{{isCollapse ? '收起至简洁查询' : '更多查询条件'}} |
||||||
|
<i nz-icon [nzType]="!isCollapse ? 'down' : 'up'"></i> |
||||||
|
</a> |
||||||
|
</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="100px">子订单号</th> |
||||||
|
<th nzWidth="100px">物流单号</th> |
||||||
|
<th nzWidth="60px">创建时间</th> |
||||||
|
<th nzWidth="60px">更新时间</th> |
||||||
|
<th nzRight nzWidth="70px">支付类型</th> |
||||||
|
<th nzRight nzWidth="70px">支付状态</th> |
||||||
|
<th nzRight nzWidth="70px">物流状态</th> |
||||||
|
<th nzRight nzWidth="80px">操作</th> |
||||||
|
</tr> |
||||||
|
</thead> |
||||||
|
<tbody> |
||||||
|
<tr *ngFor="let data of basicTable.data"> |
||||||
|
<td>{{data.goodsName}} - {{data.goodsSpecsName}}</td> |
||||||
|
<td>{{data.merName}}</td> |
||||||
|
<td> |
||||||
|
<img nz-image width="60px" height="60px" nzSrc="{{imageUrl + data.img }}" [nzFallback]="fallbackImg" alt="" /> |
||||||
|
</td> |
||||||
|
<td>{{data.goodsTypeName}}</td> |
||||||
|
<td>{{data.goodsBrandName}}</td> |
||||||
|
<td>{{data.userPhone}}</td> |
||||||
|
<td>{{data.orderNo}}</td> |
||||||
|
<td>{{data.childOrderNo}}</td> |
||||||
|
<td>{{data.logisticsNo}}</td> |
||||||
|
<td>{{ data.createTime | date: 'yyyy-MM-dd HH:mm'}}</td> |
||||||
|
<td>{{ data.updateTime | 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> |
||||||
|
<nz-badge *ngIf="data?.logisticsStatus == null" nzStatus="error" nzText="未发货"></nz-badge> |
||||||
|
<nz-badge *ngIf="data?.logisticsStatus == 'DELIVERING'" nzColor="cyan" nzText="{{data.logisticsStatusDesc}}"></nz-badge> |
||||||
|
<nz-badge *ngIf="data?.logisticsStatus == 'TRANSPORT'" nzColor="lime" nzText="{{data.logisticsStatusDesc}}"></nz-badge> |
||||||
|
<nz-badge *ngIf="data?.logisticsStatus == 'AGENT_SIGN'" nzStatus="success" nzText="{{data.logisticsStatusDesc}}"></nz-badge> |
||||||
|
<nz-badge *ngIf="data?.logisticsStatus == 'SIGN'" nzStatus="success" nzText="{{data.logisticsStatusDesc}}"></nz-badge> |
||||||
|
<nz-badge *ngIf="data?.logisticsStatus == 'ACCEPT'" nzStatus="processing" nzText="{{data.logisticsStatusDesc}}"></nz-badge> |
||||||
|
<nz-badge *ngIf="data?.logisticsStatus == 'FAILED'" nzStatus="error" nzText="{{data.logisticsStatusDesc}}"></nz-badge> |
||||||
|
<nz-badge *ngIf="data?.logisticsStatus == 'WAIT_ACCEPT'" nzStatus="default" nzText="{{data.logisticsStatusDesc}}"></nz-badge> |
||||||
|
</td> |
||||||
|
<td nzRight> |
||||||
|
<a (click)="showDetail(data)">详情</a> |
||||||
|
<nz-divider nzType="vertical"></nz-divider> |
||||||
|
<a nz-dropdown [nzDropdownMenu]="menu"> |
||||||
|
更多 |
||||||
|
<span nz-icon nzType="down"></span> |
||||||
|
</a> |
||||||
|
<nz-dropdown-menu #menu="nzDropdownMenu"> |
||||||
|
<ul nz-menu nzSelectable> |
||||||
|
<li nz-menu-item (click)="getLogisticsNo(data.id)"><a>录入物流编码</a></li> |
||||||
|
<li nz-menu-item *ngIf="data.logisticsNo != null" (click)="showLogisticsNo(data.id)"><a>查看物流</a></li> |
||||||
|
</ul> |
||||||
|
</nz-dropdown-menu> |
||||||
|
</td> |
||||||
|
</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="商品名称">{{orderGoodsData?.goodsName}} - {{orderGoodsData?.goodsSpecsName}}</nz-descriptions-item> |
||||||
|
<nz-descriptions-item nzTitle="用户手机号">{{ orderGoodsData?.userPhone }}</nz-descriptions-item>//. |
||||||
|
0 <nz-descriptions-item nzTitle="商品分类">{{ orderGoodsData?.goodsTypeName }}</nz-descriptions-item> |
||||||
|
<nz-descriptions-item nzTitle="商品品牌">{{ orderGoodsData?.goodsBrandName }}</nz-descriptions-item> |
||||||
|
<nz-descriptions-item nzTitle="商品价格">{{ orderGoodsData?.goodsSpecsOriginalPrice }}</nz-descriptions-item> |
||||||
|
<nz-descriptions-item nzTitle="商品数量">{{ orderGoodsData?.goodsCount }}</nz-descriptions-item> |
||||||
|
<nz-descriptions-item nzTitle="图片" [nzSpan]="3"> |
||||||
|
<nz-image-group> |
||||||
|
<img nz-image width="80px" [nzFallback]="fallbackImg" nzSrc="{{imageUrl + orderGoodsData.img }}" alt="" /> |
||||||
|
</nz-image-group> |
||||||
|
</nz-descriptions-item> |
||||||
|
<nz-descriptions-item nzTitle="物流状态" [nzSpan]="3"> |
||||||
|
<nz-badge *ngIf="orderGoodsData?.logisticsStatus == null" nzStatus="error" nzText="未发货"></nz-badge> |
||||||
|
<nz-badge *ngIf="orderGoodsData?.logisticsStatus == 'DELIVERING'" nzColor="cyan" nzText="{{orderGoodsData.logisticsStatusDesc}}"></nz-badge> |
||||||
|
<nz-badge *ngIf="orderGoodsData?.logisticsStatus == 'TRANSPORT'" nzColor="lime" nzText="{{orderGoodsData.logisticsStatusDesc}}"></nz-badge> |
||||||
|
<nz-badge *ngIf="orderGoodsData?.logisticsStatus == 'AGENT_SIGN'" nzStatus="success" nzText="{{orderGoodsData.logisticsStatusDesc}}"></nz-badge> |
||||||
|
<nz-badge *ngIf="orderGoodsData?.logisticsStatus == 'SIGN'" nzStatus="success" nzText="{{orderGoodsData.logisticsStatusDesc}}"></nz-badge> |
||||||
|
<nz-badge *ngIf="orderGoodsData?.logisticsStatus == 'ACCEPT'" nzStatus="processing" nzText="{{orderGoodsData.logisticsStatusDesc}}"></nz-badge> |
||||||
|
<nz-badge *ngIf="orderGoodsData?.logisticsStatus == 'FAILED'" nzStatus="error" nzText="{{orderGoodsData.logisticsStatusDesc}}"></nz-badge> |
||||||
|
<nz-badge *ngIf="orderGoodsData?.logisticsStatus == 'WAIT_ACCEPT'" nzStatus="default" nzText="{{orderGoodsData.logisticsStatusDesc}}"></nz-badge> |
||||||
|
</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?.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-tab nzTitle="发货信息"> |
||||||
|
<nz-descriptions nzTitle="发货信息" nzBordered> |
||||||
|
<nz-descriptions-item nzTitle="收货人">{{deliveryAddress?.consignee}}</nz-descriptions-item> |
||||||
|
<nz-descriptions-item nzTitle="收货电话">{{ deliveryAddress?.phone }}</nz-descriptions-item> |
||||||
|
<nz-descriptions-item nzTitle="发货信息" [nzSpan]="3">{{ deliveryAddress?.regionName }} -{{deliveryAddress?.consignee}} -{{ deliveryAddress?.phone }} -{{ deliveryAddress?.address }}</nz-descriptions-item> |
||||||
|
|
||||||
|
</nz-descriptions> |
||||||
|
</nz-tab> |
||||||
|
</nz-tabset> |
||||||
|
|
||||||
|
</ng-container> |
||||||
|
</nz-modal> |
||||||
|
|
||||||
|
<nz-modal [(nzVisible)]="isVisible" nzTitle="新增物流单号" (nzOnCancel)="isVisible = false" (nzOnOk)="handleOk()"> |
||||||
|
<ng-container *nzModalContent> |
||||||
|
<div nz-row> |
||||||
|
<div nz-col nzSpan="20"> |
||||||
|
<nz-form-item> |
||||||
|
<nz-form-label [nzSpan]="6">物流单号</nz-form-label> |
||||||
|
<nz-form-control [nzSpan]="16"> |
||||||
|
<input nz-input [(ngModel)]="logisticsNo"/> |
||||||
|
</nz-form-control> |
||||||
|
</nz-form-item> |
||||||
|
</div> |
||||||
|
</div> |
||||||
|
</ng-container> |
||||||
|
</nz-modal> |
||||||
|
|
||||||
|
<nz-modal [(nzVisible)]="orderDetailModalChild" nzTitle="物流详情" (nzOnCancel)="orderDetailModalChild = false" [nzFooter]="null" |
||||||
|
nzWidth="1000px" [nzBodyStyle]=" { padding: '20px 20px 30px 20px'}"> |
||||||
|
<ng-container *nzModalContent> |
||||||
|
<nz-spin [nzSpinning]="orderDetailModalLoading"> |
||||||
|
<nz-timeline [nzReverse]="true" *ngIf="logisticsTraceDetails !== null"> |
||||||
|
<nz-timeline-item *ngFor="let item of logisticsTraceDetails;let i = index" [nzColor]="i===logisticsTraceDetails.length -1?'green':'gray'"> |
||||||
|
<p [ngClass]="{'fontColorBlue': i===logisticsTraceDetails.length -1 }">{{item['desc']}}</p> |
||||||
|
<p [ngClass]="{'fontColorBlue': i===logisticsTraceDetails.length -1 }">{{item.time | date : 'yyyy-MM-dd HH:mm:ss'}}</p> |
||||||
|
</nz-timeline-item> |
||||||
|
</nz-timeline> |
||||||
|
<nz-result *ngIf="logisticsTraceDetails === null" nzStatus="404" nzTitle="404" nzSubTitle="很抱歉暂无物流信息."></nz-result> |
||||||
|
</nz-spin> |
||||||
|
</ng-container> |
||||||
|
</nz-modal> |
@ -0,0 +1,6 @@ |
|||||||
|
.search-area { |
||||||
|
margin-bottom: 10px; |
||||||
|
} |
||||||
|
.search-area button { |
||||||
|
margin-right: 8px; |
||||||
|
} |
@ -0,0 +1,309 @@ |
|||||||
|
import { Component } from '@angular/core'; |
||||||
|
import {FormGroup, FormsModule, NonNullableFormBuilder, ReactiveFormsModule} from "@angular/forms"; |
||||||
|
import {NzMessageService} from "ng-zorro-antd/message"; |
||||||
|
import {NzColDirective, NzRowDirective} from "ng-zorro-antd/grid"; |
||||||
|
import { NzFormDirective, NzFormModule} from "ng-zorro-antd/form"; |
||||||
|
import {NzInputDirective} from "ng-zorro-antd/input"; |
||||||
|
import {NzDatePickerComponent, NzRangePickerComponent} from "ng-zorro-antd/date-picker"; |
||||||
|
import {NzRadioButtonDirective, NzRadioComponent, NzRadioGroupComponent} from "ng-zorro-antd/radio"; |
||||||
|
import {NzCellFixedDirective, NzTableComponent, NzTableModule, NzThMeasureDirective} from "ng-zorro-antd/table"; |
||||||
|
import {NzModalComponent, NzModalContentDirective, NzModalModule} from "ng-zorro-antd/modal"; |
||||||
|
import {DatePipe, NgClass, NgForOf, NgIf, NgOptimizedImage} from "@angular/common"; |
||||||
|
import {NzOptionComponent, NzSelectComponent} from "ng-zorro-antd/select"; |
||||||
|
import {NzButtonComponent} from "ng-zorro-antd/button"; |
||||||
|
import {NzTabSetComponent, NzTabsModule} from "ng-zorro-antd/tabs"; |
||||||
|
import {NzDescriptionsModule} from "ng-zorro-antd/descriptions"; |
||||||
|
import {NzImageDirective, NzImageModule} from "ng-zorro-antd/image"; |
||||||
|
|
||||||
|
import {NzIconDirective} from "ng-zorro-antd/icon"; |
||||||
|
import {NzBadgeComponent} from "ng-zorro-antd/badge"; |
||||||
|
import {fallbackImg, logisticsStatus, orderPayType} from '../../../data/goods/goods.namespace'; |
||||||
|
import {NzDividerComponent} from "ng-zorro-antd/divider"; |
||||||
|
import {NzDropDownADirective, NzDropDownDirective, NzDropdownMenuComponent} from "ng-zorro-antd/dropdown"; |
||||||
|
import {NzMenuDirective, NzMenuItemComponent} from "ng-zorro-antd/menu"; |
||||||
|
import {NzResultComponent} from "ng-zorro-antd/result"; |
||||||
|
import {NzSpinComponent} from "ng-zorro-antd/spin"; |
||||||
|
import {NzTimelineComponent, NzTimelineItemComponent} from "ng-zorro-antd/timeline"; |
||||||
|
import {NzTreeSelectComponent} from "ng-zorro-antd/tree-select"; |
||||||
|
import {environment} from "../../../../environments/environment"; |
||||||
|
import {OrderGoodsService} from "../../../services/trade/order-goods.service"; |
||||||
|
import {GoodsService} from "../../../services/goods/goods.service"; |
||||||
|
import {OrderGoodsData} from "../../../model/order.interface"; |
||||||
|
import {GoodsStatusPipe} from "../../../pipes/goods/goods-status.pipe"; |
||||||
|
import {NzPopconfirmDirective} from "ng-zorro-antd/popconfirm"; |
||||||
|
import {AuditStatusPipe} from "../../../pipes/audit/audit-status.pipe"; |
||||||
|
import {IconService} from "../../../services/common/icon.service"; |
||||||
|
import {PayTypePipe} from "../../../pipes/goods/pay-type.pipe"; |
||||||
|
import {OrderChildStatusPipe} from "../../../pipes/goods/order-child-status.pipe"; |
||||||
|
import {MerService} from "../../../services/merchant/mer.service"; |
||||||
|
import {DATA} from "../../../data/login/localStorage.namespace"; |
||||||
|
import {BrowserStorageService} from "../../../utils/localStorage.service"; |
||||||
|
|
||||||
|
@Component({ |
||||||
|
selector: 'app-goods-logistics-list', |
||||||
|
standalone: true, |
||||||
|
imports: [ |
||||||
|
NzColDirective, |
||||||
|
NzRowDirective, |
||||||
|
NzFormDirective, |
||||||
|
ReactiveFormsModule, |
||||||
|
NzTreeSelectComponent, |
||||||
|
NzInputDirective, |
||||||
|
NzSelectComponent, |
||||||
|
NzOptionComponent, |
||||||
|
NzButtonComponent, |
||||||
|
NzTableComponent, |
||||||
|
NzImageModule, |
||||||
|
NzModalModule, |
||||||
|
NzTableModule, |
||||||
|
NzFormModule, |
||||||
|
NzThMeasureDirective, |
||||||
|
NgForOf, |
||||||
|
NzImageDirective, |
||||||
|
GoodsStatusPipe, |
||||||
|
DatePipe, |
||||||
|
NzDropdownMenuComponent, |
||||||
|
NgIf, |
||||||
|
NzMenuDirective, |
||||||
|
NzDescriptionsModule, |
||||||
|
NzMenuItemComponent, |
||||||
|
NzPopconfirmDirective, |
||||||
|
NzDividerComponent, |
||||||
|
NzDropDownADirective, |
||||||
|
NzDropDownDirective, |
||||||
|
NzTabsModule, |
||||||
|
NzIconDirective, |
||||||
|
NzBadgeComponent, |
||||||
|
AuditStatusPipe, |
||||||
|
NzTabSetComponent, |
||||||
|
FormsModule, |
||||||
|
NzSpinComponent, |
||||||
|
NzTimelineItemComponent, |
||||||
|
NgClass, |
||||||
|
NzResultComponent, |
||||||
|
NzTimelineComponent, |
||||||
|
NzDatePickerComponent, |
||||||
|
NzRadioButtonDirective, |
||||||
|
NzRadioComponent, |
||||||
|
NzRadioGroupComponent, |
||||||
|
NzRangePickerComponent, |
||||||
|
PayTypePipe, |
||||||
|
OrderChildStatusPipe, |
||||||
|
|
||||||
|
], |
||||||
|
templateUrl: './goods-logistics-list.component.html', |
||||||
|
styleUrl: './goods-logistics-list.component.less' |
||||||
|
}) |
||||||
|
export class GoodsLogisticsListComponent { |
||||||
|
// 表单页数
|
||||||
|
tablePageNum = 1; |
||||||
|
// 表单数据
|
||||||
|
tableData: any = { |
||||||
|
total: 0, |
||||||
|
loading: false, |
||||||
|
list: [], |
||||||
|
}; |
||||||
|
// 搜索表单
|
||||||
|
searchForm: FormGroup; |
||||||
|
|
||||||
|
baseUrl = environment.baseUrl; |
||||||
|
imageUrl = environment.imageUrl; |
||||||
|
|
||||||
|
// 商品类型数据
|
||||||
|
nodes = []; |
||||||
|
nodesBrand = []; |
||||||
|
orderGoodsData: any; |
||||||
|
orderDetailModal = false; |
||||||
|
isVisible = false; |
||||||
|
orderDetailModalChild = false; |
||||||
|
orderDetailModalLoading = false; |
||||||
|
logisticsNo: any; |
||||||
|
logisticsTraceDetails: any; |
||||||
|
goodsOrderId: any; |
||||||
|
deliveryAddress: any; |
||||||
|
// 更多查询条件
|
||||||
|
isCollapse = false; |
||||||
|
merData: any; |
||||||
|
objectType: any; |
||||||
|
protected readonly fallbackImg = fallbackImg; |
||||||
|
protected readonly orderPayType = orderPayType; |
||||||
|
protected readonly logisticsStatus = logisticsStatus; |
||||||
|
|
||||||
|
constructor(private fb: NonNullableFormBuilder, |
||||||
|
private msg: NzMessageService, |
||||||
|
private storage: BrowserStorageService, |
||||||
|
private merService: MerService, |
||||||
|
private iconService: IconService, |
||||||
|
private orderGoodsService: OrderGoodsService, |
||||||
|
private goodsService: GoodsService) { |
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
// 初始化搜索框
|
||||||
|
this.searchForm = this.fb.group({ |
||||||
|
logisticsNo: [''], |
||||||
|
orderNo: [''], |
||||||
|
childOrderNo: [''], |
||||||
|
goodsType: [''], |
||||||
|
goodsBrand: [''], |
||||||
|
merId: [''], |
||||||
|
userPhone: [''], |
||||||
|
goodsSpecsName: [''], |
||||||
|
createTimeArray: [[]], |
||||||
|
createTimeSelect: ['1'], |
||||||
|
createTimeS: [''], |
||||||
|
createTimeE: [''], |
||||||
|
goodsName: [''], |
||||||
|
payType: [''], |
||||||
|
status: [''], |
||||||
|
logisticsStatus: [''], |
||||||
|
}); |
||||||
|
this.getRequest(); |
||||||
|
this.getGoodsTypeNode(); |
||||||
|
this.getGoodsBrandNode(); |
||||||
|
this.merList(); |
||||||
|
this.objectType = this.storage.get(DATA)['account']['objectType']; |
||||||
|
} |
||||||
|
|
||||||
|
// 查询商户
|
||||||
|
public merList() { |
||||||
|
let params: any = { |
||||||
|
pageNum: 1, |
||||||
|
pageSize: 1000, |
||||||
|
time: new Date().getTime(), |
||||||
|
} |
||||||
|
this.merService.queryList(params, (data: any) => { |
||||||
|
if (data['return_code'] == '000000') { |
||||||
|
this.merData = data['return_data']['list']; |
||||||
|
} |
||||||
|
}); |
||||||
|
} |
||||||
|
|
||||||
|
|
||||||
|
// 查询列表
|
||||||
|
public getRequest(reset: boolean = false) { |
||||||
|
|
||||||
|
this.searchForm.controls['status'].setValue(2) |
||||||
|
if (this.searchForm.controls['createTimeArray'].value != null |
||||||
|
&& this.searchForm.controls['createTimeArray'].value.length > 0) { |
||||||
|
this.searchForm.controls['createTimeS'].setValue(new Date(this.searchForm.controls['createTimeArray'].value[0]).getTime()); |
||||||
|
this.searchForm.controls['createTimeE'].setValue(new Date(this.searchForm.controls['createTimeArray'].value[1]).getTime()); |
||||||
|
} else { |
||||||
|
this.searchForm.controls['createTimeS'].setValue(null) |
||||||
|
this.searchForm.controls['createTimeE'].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.orderGoodsService.getListGoods(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; |
||||||
|
}); |
||||||
|
} |
||||||
|
|
||||||
|
// 获取商品分类
|
||||||
|
getGoodsTypeNode() { |
||||||
|
this.goodsService.getList({time: new Date().getTime()}, (data: any) => { |
||||||
|
if (data['return_code'] === '000000') { |
||||||
|
this.getNode(data['return_data']); |
||||||
|
} |
||||||
|
}); |
||||||
|
} |
||||||
|
|
||||||
|
// 重制
|
||||||
|
public reset() { |
||||||
|
this.searchForm.reset(); |
||||||
|
this.getRequest(); |
||||||
|
} |
||||||
|
|
||||||
|
// 配置数据
|
||||||
|
getNode(array: any): any { |
||||||
|
array.forEach((item: any) => { |
||||||
|
if (item.children) { |
||||||
|
this.getNode(item.children); |
||||||
|
}else { |
||||||
|
item["isLeaf"] = true; |
||||||
|
} |
||||||
|
item["key"] = item.id; |
||||||
|
|
||||||
|
}); |
||||||
|
this.nodes = array; |
||||||
|
} |
||||||
|
|
||||||
|
// 获取商品品牌
|
||||||
|
getGoodsBrandNode() { |
||||||
|
this.goodsService.getListBrandAll( (data: any) => { |
||||||
|
if (data['return_code'] == '000000') { |
||||||
|
this.nodesBrand = data['return_data']; |
||||||
|
} |
||||||
|
}); |
||||||
|
} |
||||||
|
|
||||||
|
getLogisticsNo(id: number): void { |
||||||
|
this.goodsOrderId = id; |
||||||
|
this.isVisible = true; |
||||||
|
} |
||||||
|
|
||||||
|
showDetail(data: OrderGoodsData): void { |
||||||
|
this.orderGoodsData = data; |
||||||
|
this.findDeliveryAddressById(data.deliveryAddressId); |
||||||
|
this.orderDetailModal = true; |
||||||
|
} |
||||||
|
|
||||||
|
handleOk(): void { |
||||||
|
let params = { |
||||||
|
id: this.goodsOrderId, |
||||||
|
logisticsNo: this.logisticsNo, |
||||||
|
time: new Date().getTime() |
||||||
|
} |
||||||
|
|
||||||
|
this.orderGoodsService.updateLogisticsNo(params , (data: any) => { |
||||||
|
if (data['return_code'] == '000000') { |
||||||
|
this.isVisible = false; |
||||||
|
this.getRequest(false); |
||||||
|
this.msg.success("成功") |
||||||
|
} else { |
||||||
|
this.msg.error(data['return_msg']); |
||||||
|
} |
||||||
|
}); |
||||||
|
} |
||||||
|
|
||||||
|
showLogisticsNo(id: number): void { |
||||||
|
let params = { |
||||||
|
id:id, |
||||||
|
time: new Date().getTime() |
||||||
|
} |
||||||
|
|
||||||
|
this.orderGoodsService.getLogisticsMsg(params , (data: any) => { |
||||||
|
if (data['return_code'] == '000000') { |
||||||
|
this.orderDetailModalChild = true; |
||||||
|
this.getRequest(false); |
||||||
|
this.logisticsTraceDetails = data['return_data']['logisticsTraceDetails']; |
||||||
|
} else { |
||||||
|
this.msg.error(data['return_msg']); |
||||||
|
} |
||||||
|
}); |
||||||
|
} |
||||||
|
|
||||||
|
findDeliveryAddressById(id: number): void { |
||||||
|
this.goodsService.findDeliveryAddressById(id, (data: any) => { |
||||||
|
if (data['return_code'] == '000000') { |
||||||
|
this.deliveryAddress = data['return_data']; |
||||||
|
} else { |
||||||
|
this.msg.error(data['return_msg']); |
||||||
|
} |
||||||
|
}); |
||||||
|
} |
||||||
|
|
||||||
|
|
||||||
|
} |
@ -0,0 +1,202 @@ |
|||||||
|
<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="productName" 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> |
||||||
|
<input nzSize="large" nz-input formControlName="storeName" 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> |
||||||
|
<input nzSize="large" nz-input formControlName="storeAddress" 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> |
||||||
|
<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> |
||||||
|
<input nzSize="large" nz-input formControlName="userPhone" 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-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"> |
||||||
|
<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 orderPayType" nzLabel="{{item['name']}}" nzValue="{{item['key']}}"></nz-option> |
||||||
|
</nz-select> |
||||||
|
</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]="24" class="search-area"> |
||||||
|
<button nz-button [nzType]="'primary'" (click)="getRequest()">查询</button> |
||||||
|
<button nz-button (click)="reset()">重置</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="200px">门店名称</th> |
||||||
|
<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="100px">更新时间</th> |
||||||
|
<th nzRight nzWidth="80px">支付类型</th> |
||||||
|
<th nzRight nzWidth="100px">状态</th> |
||||||
|
<th nzRight nzWidth="70px">操作</th> |
||||||
|
</tr> |
||||||
|
</thead> |
||||||
|
<tbody> |
||||||
|
<tr *ngFor="let data of basicTable.data"> |
||||||
|
<td>{{data.productName}} | {{data.productSpecName}}</td> |
||||||
|
<td>{{data.storeName}}</td> |
||||||
|
<td>{{data.storeAddress}}</td> |
||||||
|
<td>{{data.userPhone}}</td> |
||||||
|
<td>{{data.orderNo}}</td> |
||||||
|
<td>{{data.childOrderNo}}</td> |
||||||
|
<td>{{data.channelOrderNo}}</td> |
||||||
|
<td>¥{{data.productPrice}}</td> |
||||||
|
|
||||||
|
<td>{{ data.createTime | date: 'yyyy-MM-dd HH:mm'}}</td> |
||||||
|
<td>{{ data.updateTime | 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.orderNo)">详情</a> |
||||||
|
</td> |
||||||
|
</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]="orderChild?.productSpecName"></p> |
||||||
|
</nz-descriptions-item> |
||||||
|
<nz-descriptions-item nzTitle="用户手机号">{{ orderGoodsData?.userPhone }}</nz-descriptions-item> |
||||||
|
<nz-descriptions-item nzTitle="订单状态"> |
||||||
|
<nz-badge nzStatus="{{orderChild?.business['status'] | orderStarbucksType }}" nzText="{{ orderChild?.business['status'] | orderStarbucks }}"></nz-badge> |
||||||
|
</nz-descriptions-item> |
||||||
|
<nz-descriptions-item nzTitle="门店名称">{{ orderChild?.business['storeName'] }}</nz-descriptions-item> |
||||||
|
<nz-descriptions-item nzTitle="门店地址">{{ orderChild?.business['storeAddress'] }}</nz-descriptions-item> |
||||||
|
|
||||||
|
</nz-descriptions> |
||||||
|
</nz-tab> |
||||||
|
<nz-tab nzTitle="商品信息"> |
||||||
|
<nz-table #basicTable [nzBordered]="true" [nzData]="orderChild?.business['orderItemList']"> |
||||||
|
<thead> |
||||||
|
<tr> |
||||||
|
<th>产品名称</th> |
||||||
|
<th>产品图片</th> |
||||||
|
<th>规格</th> |
||||||
|
<th>数量</th> |
||||||
|
<th>单价</th> |
||||||
|
<th>总价</th> |
||||||
|
</tr> |
||||||
|
</thead> |
||||||
|
<tbody> |
||||||
|
<tr *ngFor="let data of basicTable.data"> |
||||||
|
<td>{{data.name}}</td> |
||||||
|
<td> |
||||||
|
<img nz-image width="80px" [nzFallback]="fallbackImg" nzSrc="{{data.img }}" alt="" /> |
||||||
|
</td> |
||||||
|
<td>{{data.speList}}</td> |
||||||
|
<td>{{data.num}}</td> |
||||||
|
<td>¥{{data.price}}</td> |
||||||
|
<td>¥{{data.totalPrice}}</td> |
||||||
|
</tr> |
||||||
|
</tbody> |
||||||
|
</nz-table> |
||||||
|
</nz-tab> |
||||||
|
<nz-tab nzTitle="支付信息"> |
||||||
|
<nz-descriptions nzTitle="支付信息" nzBordered> |
||||||
|
<nz-descriptions-item nzTitle="订单号">{{ orderChild?.orderNo }}</nz-descriptions-item> |
||||||
|
<nz-descriptions-item nzTitle="子订单号" [nzSpan]="2">{{ orderChild?.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">¥{{ orderChild?.couponDiscountPrice }}</nz-descriptions-item> |
||||||
|
<nz-descriptions-item nzTitle="积分抵扣优惠金额" [nzSpan]="3">¥{{ orderChild?.integralDiscountPrice/100 }}</nz-descriptions-item> |
||||||
|
<nz-descriptions-item nzTitle="总优惠金额(优惠券优惠金额 + 积分抵扣)" [nzSpan]="3">¥{{ orderChild?.totalDeductionPrice }}</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,9 @@ |
|||||||
|
.search-area { |
||||||
|
margin-bottom: 10px; |
||||||
|
} |
||||||
|
.search-area button { |
||||||
|
margin-right: 8px; |
||||||
|
} |
||||||
|
.fontColor { |
||||||
|
color: red; |
||||||
|
} |
@ -0,0 +1,177 @@ |
|||||||
|
import { Component } from '@angular/core'; |
||||||
|
import {FormGroup, NonNullableFormBuilder, ReactiveFormsModule} from "@angular/forms"; |
||||||
|
import {NzMessageService} from "ng-zorro-antd/message"; |
||||||
|
import {NzColDirective, NzRowDirective} from "ng-zorro-antd/grid"; |
||||||
|
import {NzFormControlComponent, NzFormDirective, NzFormLabelComponent, NzFormModule} from "ng-zorro-antd/form"; |
||||||
|
import {NzInputDirective} from "ng-zorro-antd/input"; |
||||||
|
import {NzDatePickerComponent, NzRangePickerComponent} from "ng-zorro-antd/date-picker"; |
||||||
|
import {NzRadioButtonDirective, NzRadioComponent, NzRadioGroupComponent} from "ng-zorro-antd/radio"; |
||||||
|
import {DatePipe, NgClass, NgForOf, NgIf, NgOptimizedImage} from "@angular/common"; |
||||||
|
import {NzOptionComponent, NzSelectComponent} from "ng-zorro-antd/select"; |
||||||
|
import {NzButtonComponent} from "ng-zorro-antd/button"; |
||||||
|
import {NzCellFixedDirective, NzTableComponent, NzTableModule, NzThMeasureDirective} from "ng-zorro-antd/table"; |
||||||
|
import {NzModalComponent, NzModalContentDirective, NzModalModule} from "ng-zorro-antd/modal"; |
||||||
|
import {NzTabComponent, NzTabSetComponent} from "ng-zorro-antd/tabs"; |
||||||
|
import {NzDescriptionsComponent, NzDescriptionsItemComponent} from "ng-zorro-antd/descriptions"; |
||||||
|
import {NzImageDirective, NzImageGroupComponent, NzImageModule} from "ng-zorro-antd/image"; |
||||||
|
import {OrderStarbucksService} from "../../../services/trade/order-starbucks.service"; |
||||||
|
import {OrderStarbucksPipe} from "../../../pipes/goods/order-starbucks.pipe"; |
||||||
|
import { |
||||||
|
fallbackImg, |
||||||
|
orderGoodsChild, |
||||||
|
orderPayType, |
||||||
|
} from "../../../data/goods/goods.namespace"; |
||||||
|
import {DateUtils} from "../../../utils/dateUtils.service"; |
||||||
|
import {OrderChildStatusPipe} from "../../../pipes/goods/order-child-status.pipe"; |
||||||
|
import {OrderService} from "../../../services/trade/order.service"; |
||||||
|
import {OrderCinemaStatusPipe} from "../../../pipes/goods/order-cinema-status.pipe"; |
||||||
|
import {PayTypePipe} from "../../../pipes/goods/pay-type.pipe"; |
||||||
|
import {NzIconDirective, NzIconService} from "ng-zorro-antd/icon"; |
||||||
|
import {IconService} from "../../../services/common/icon.service"; |
||||||
|
import {NzBadgeComponent} from "ng-zorro-antd/badge"; |
||||||
|
import {OrderStarbucksTypePipe} from "../../../pipes/goods/order-starbucks-type.pipe"; |
||||||
|
|
||||||
|
@Component({ |
||||||
|
selector: 'app-order-starbucks', |
||||||
|
standalone: true, |
||||||
|
imports: [ |
||||||
|
ReactiveFormsModule, |
||||||
|
NzRowDirective, |
||||||
|
NzFormLabelComponent, |
||||||
|
NzFormControlComponent, |
||||||
|
NzColDirective, |
||||||
|
NzInputDirective, |
||||||
|
NzDatePickerComponent, |
||||||
|
NzRadioGroupComponent, |
||||||
|
NzRadioButtonDirective, |
||||||
|
NzTableModule, |
||||||
|
NzModalModule, |
||||||
|
NzFormModule, |
||||||
|
NgForOf, |
||||||
|
NzRadioComponent, |
||||||
|
NzSelectComponent, |
||||||
|
NzButtonComponent, |
||||||
|
NzTableComponent, |
||||||
|
NzThMeasureDirective, |
||||||
|
NzCellFixedDirective, |
||||||
|
NgClass, |
||||||
|
DatePipe, |
||||||
|
NzModalComponent, |
||||||
|
NzTabSetComponent, |
||||||
|
NzDescriptionsComponent, |
||||||
|
NzTabComponent, |
||||||
|
NzDescriptionsItemComponent, |
||||||
|
NzImageGroupComponent, |
||||||
|
NzImageDirective, |
||||||
|
NzFormDirective, |
||||||
|
NzImageModule, |
||||||
|
NzModalContentDirective, |
||||||
|
OrderStarbucksPipe, |
||||||
|
NzOptionComponent, |
||||||
|
NzRangePickerComponent, |
||||||
|
OrderChildStatusPipe, |
||||||
|
NgIf, |
||||||
|
OrderCinemaStatusPipe, |
||||||
|
PayTypePipe, |
||||||
|
NgOptimizedImage, |
||||||
|
NzIconDirective, |
||||||
|
NzBadgeComponent, |
||||||
|
OrderStarbucksTypePipe |
||||||
|
], |
||||||
|
templateUrl: './order-starbucks.component.html', |
||||||
|
styleUrl: './order-starbucks.component.less' |
||||||
|
}) |
||||||
|
export class OrderStarbucksComponent { |
||||||
|
// 表单页数
|
||||||
|
tablePageNum = 1; |
||||||
|
// 表单数据
|
||||||
|
tableData: any = { |
||||||
|
total: 0, |
||||||
|
loading: false, |
||||||
|
list: [], |
||||||
|
}; |
||||||
|
// 搜索表单
|
||||||
|
searchForm: FormGroup; |
||||||
|
orderDetailModal = false; |
||||||
|
orderGoodsData: any; |
||||||
|
orderChild: any; |
||||||
|
|
||||||
|
protected readonly orderGoodsChild = orderGoodsChild; |
||||||
|
protected readonly orderPayType = orderPayType; |
||||||
|
|
||||||
|
constructor(private fb: NonNullableFormBuilder, |
||||||
|
private msg: NzMessageService, |
||||||
|
private iconService: IconService, |
||||||
|
private orderService: OrderService, |
||||||
|
private orderStarbucks: OrderStarbucksService) { |
||||||
|
|
||||||
|
// 初始化搜索框
|
||||||
|
this.searchForm = this.fb.group({ |
||||||
|
orderNo: [''], |
||||||
|
childOrderNo: [''], |
||||||
|
userPhone: [''], |
||||||
|
productName: [''], |
||||||
|
storeName: [''], |
||||||
|
storeAddress: [''], |
||||||
|
createTimeArray: [[]], |
||||||
|
createTimeS: [''], |
||||||
|
createTimeE: [''], |
||||||
|
goodsName: [''], |
||||||
|
payType: [''], |
||||||
|
status: [''], |
||||||
|
}); |
||||||
|
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) |
||||||
|
} |
||||||
|
|
||||||
|
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.orderStarbucks.getListStarbucks(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(); |
||||||
|
} |
||||||
|
|
||||||
|
// 查询详情
|
||||||
|
showDetail(orderNo: string): void { |
||||||
|
this.orderService.queryOrder(orderNo , (data: any) => { |
||||||
|
if (data['return_code'] == '000000') { |
||||||
|
this.orderGoodsData = data['return_data']; |
||||||
|
this.orderChild = this.orderGoodsData['orderChildList'][0] |
||||||
|
} else { |
||||||
|
this.msg.error(data['return_msg']); |
||||||
|
} |
||||||
|
}) |
||||||
|
this.orderDetailModal = true; |
||||||
|
} |
||||||
|
|
||||||
|
|
||||||
|
protected readonly fallbackImg = fallbackImg; |
||||||
|
} |
@ -0,0 +1,16 @@ |
|||||||
|
import { Pipe, PipeTransform } from '@angular/core'; |
||||||
|
|
||||||
|
@Pipe({ |
||||||
|
name: 'dataUtils', |
||||||
|
standalone: true |
||||||
|
}) |
||||||
|
export class DataUtilsPipe implements PipeTransform { |
||||||
|
|
||||||
|
transform(data: any, length: number): any { |
||||||
|
if (data.length == 0) { |
||||||
|
return []; |
||||||
|
} |
||||||
|
return data.slice(0 , length); |
||||||
|
} |
||||||
|
|
||||||
|
} |
@ -0,0 +1,30 @@ |
|||||||
|
import { Pipe, PipeTransform } from '@angular/core'; |
||||||
|
|
||||||
|
@Pipe({ |
||||||
|
name: 'businessType', |
||||||
|
standalone: true |
||||||
|
}) |
||||||
|
export class BusinessTypePipe implements PipeTransform { |
||||||
|
|
||||||
|
transform(value: number): any { |
||||||
|
switch (value) { |
||||||
|
case 1: |
||||||
|
return '实物产品'; |
||||||
|
case 2: |
||||||
|
return '虚拟产品'; |
||||||
|
case 3: |
||||||
|
return '肯德基'; |
||||||
|
case 4: |
||||||
|
return '星巴克'; |
||||||
|
case 5: |
||||||
|
return '支付订单'; |
||||||
|
case 6: |
||||||
|
return '物流上传订单'; |
||||||
|
case 7: |
||||||
|
return '物流下载订单'; |
||||||
|
default: |
||||||
|
return '未知状态' |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
} |
@ -0,0 +1,22 @@ |
|||||||
|
import { Pipe, PipeTransform } from '@angular/core'; |
||||||
|
|
||||||
|
@Pipe({ |
||||||
|
name: 'status', |
||||||
|
standalone: true |
||||||
|
}) |
||||||
|
export class StatusPipe implements PipeTransform { |
||||||
|
|
||||||
|
transform(value: number): any { |
||||||
|
switch (value) { |
||||||
|
case 1: |
||||||
|
return '成功'; |
||||||
|
case 2: |
||||||
|
return '导出中'; |
||||||
|
case 3: |
||||||
|
return '失败'; |
||||||
|
default: |
||||||
|
return '未知状态' |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
} |
@ -0,0 +1,28 @@ |
|||||||
|
import { Pipe, PipeTransform } from '@angular/core'; |
||||||
|
|
||||||
|
@Pipe({ |
||||||
|
name: 'orderChildStatus', |
||||||
|
standalone: true |
||||||
|
}) |
||||||
|
export class OrderChildStatusPipe implements PipeTransform { |
||||||
|
|
||||||
|
transform(value: number): any { |
||||||
|
switch (value) { |
||||||
|
case 1: |
||||||
|
return '待支付'; |
||||||
|
case 2: |
||||||
|
return '已支付'; |
||||||
|
case 3: |
||||||
|
return '已完成'; |
||||||
|
case 4: |
||||||
|
return '已退款'; |
||||||
|
case 5: |
||||||
|
return '已取消'; |
||||||
|
case 6: |
||||||
|
return '退款中'; |
||||||
|
default: |
||||||
|
return '未知状态' |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
} |
@ -0,0 +1,32 @@ |
|||||||
|
import { Pipe, PipeTransform } from '@angular/core'; |
||||||
|
|
||||||
|
@Pipe({ |
||||||
|
name: 'orderStarbucksType', |
||||||
|
standalone: true |
||||||
|
}) |
||||||
|
export class OrderStarbucksTypePipe implements PipeTransform { |
||||||
|
|
||||||
|
transform(value: number): any { |
||||||
|
switch (value) { |
||||||
|
case 0: |
||||||
|
return 'warning'; |
||||||
|
case 5: |
||||||
|
return 'processing'; |
||||||
|
case 10: |
||||||
|
return 'processing'; |
||||||
|
case 15: |
||||||
|
return 'success'; |
||||||
|
case 20: |
||||||
|
return 'processing'; |
||||||
|
case 25: |
||||||
|
return 'success'; |
||||||
|
case -5: |
||||||
|
return 'default'; |
||||||
|
case -10: |
||||||
|
return 'error'; |
||||||
|
default: |
||||||
|
return 'error' |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
} |
@ -0,0 +1,32 @@ |
|||||||
|
import { Pipe, PipeTransform } from '@angular/core'; |
||||||
|
|
||||||
|
@Pipe({ |
||||||
|
name: 'orderStarbucks', |
||||||
|
standalone: true |
||||||
|
}) |
||||||
|
export class OrderStarbucksPipe implements PipeTransform { |
||||||
|
|
||||||
|
|
||||||
|
transform(value: number): any { |
||||||
|
switch (value) { |
||||||
|
case 0: |
||||||
|
return '待付款'; |
||||||
|
case 5: |
||||||
|
return '已支付'; |
||||||
|
case 10: |
||||||
|
return '出单中'; |
||||||
|
case 15: |
||||||
|
return '出单成功'; |
||||||
|
case 20: |
||||||
|
return '配送中'; |
||||||
|
case 25: |
||||||
|
return '配送完成'; |
||||||
|
case -5: |
||||||
|
return '已取消'; |
||||||
|
case -10: |
||||||
|
return '失败'; |
||||||
|
default: |
||||||
|
return '未知状态' |
||||||
|
} |
||||||
|
} |
||||||
|
} |
@ -0,0 +1,25 @@ |
|||||||
|
import { Pipe, PipeTransform } from '@angular/core'; |
||||||
|
import {aliLogo, gzBankLogo, hltLogo, noPayLogo, wxLogo} from "../../data/goods/goods.namespace"; |
||||||
|
|
||||||
|
@Pipe({ |
||||||
|
name: 'payType', |
||||||
|
standalone: true |
||||||
|
}) |
||||||
|
export class PayTypePipe implements PipeTransform { |
||||||
|
|
||||||
|
transform(value: number): any { |
||||||
|
switch (value) { |
||||||
|
case 1: |
||||||
|
return "icon-weixin"; |
||||||
|
case 2: |
||||||
|
return "icon-zhifubao"; |
||||||
|
case 3: |
||||||
|
return "icon-guizhouyinhanglogo"; |
||||||
|
case 4: |
||||||
|
return "icon-work_icon_party-01"; |
||||||
|
default: |
||||||
|
return "icon-daizhifu" |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
} |
@ -1,32 +0,0 @@ |
|||||||
import { Pipe, PipeTransform } from '@angular/core'; |
|
||||||
|
|
||||||
@Pipe({ |
|
||||||
name: 'orderGoodsStatus', |
|
||||||
standalone: true |
|
||||||
}) |
|
||||||
export class OrderGoodsStatusPipe implements PipeTransform { |
|
||||||
|
|
||||||
transform(value: number): any { |
|
||||||
switch (value) { |
|
||||||
case 1: |
|
||||||
return '待发货'; |
|
||||||
case 2: |
|
||||||
return '已发货'; |
|
||||||
case 3: |
|
||||||
return '配送中'; |
|
||||||
case 4: |
|
||||||
return '已送达'; |
|
||||||
case 5: |
|
||||||
return '已取消'; |
|
||||||
case 6: |
|
||||||
return '退货中'; |
|
||||||
case 7: |
|
||||||
return '已退货'; |
|
||||||
case 8: |
|
||||||
return '待支付'; |
|
||||||
default: |
|
||||||
return '未知状态' |
|
||||||
} |
|
||||||
} |
|
||||||
|
|
||||||
} |
|
@ -0,0 +1,17 @@ |
|||||||
|
import { Injectable } from '@angular/core'; |
||||||
|
import {Subject} from "rxjs"; |
||||||
|
|
||||||
|
@Injectable({ |
||||||
|
providedIn: 'root' |
||||||
|
}) |
||||||
|
export class CommunicationService { |
||||||
|
|
||||||
|
private messageSource = new Subject<any>(); |
||||||
|
currentMessage = this.messageSource.asObservable(); |
||||||
|
|
||||||
|
constructor() { } |
||||||
|
|
||||||
|
sendMessage(message: string) { |
||||||
|
this.messageSource.next(message); |
||||||
|
} |
||||||
|
} |
@ -0,0 +1,14 @@ |
|||||||
|
import { Injectable } from '@angular/core'; |
||||||
|
import {NzIconService} from "ng-zorro-antd/icon"; |
||||||
|
|
||||||
|
@Injectable({ |
||||||
|
providedIn: 'root' |
||||||
|
}) |
||||||
|
export class IconService { |
||||||
|
|
||||||
|
constructor(private iconService: NzIconService) { |
||||||
|
this.iconService.fetchFromIconfont({ |
||||||
|
scriptUrl: 'https://at.alicdn.com/t/c/font_4647823_ys5j7ogeas.js' |
||||||
|
}); |
||||||
|
} |
||||||
|
} |
@ -0,0 +1,41 @@ |
|||||||
|
import { Injectable } from '@angular/core'; |
||||||
|
import {HttpClient} from "@angular/common/http"; |
||||||
|
import {environment} from "../../../environments/environment"; |
||||||
|
import {ObjectData} from "../../utils/objectData.service"; |
||||||
|
|
||||||
|
@Injectable({ |
||||||
|
providedIn: 'root' |
||||||
|
}) |
||||||
|
export class FileService { |
||||||
|
|
||||||
|
constructor(private http: HttpClient) { } |
||||||
|
|
||||||
|
/** |
||||||
|
* 查询列表 |
||||||
|
* @param params |
||||||
|
* @param callBack |
||||||
|
*/ |
||||||
|
public getFileRecordsList(params: object, callBack:any) { |
||||||
|
this.http.get(environment.baseUrl + 'file/getFileRecordsList?' + ObjectData.objectByString(params)).subscribe(data => { |
||||||
|
callBack(data); |
||||||
|
}); |
||||||
|
} |
||||||
|
|
||||||
|
/** |
||||||
|
* 查询详情 |
||||||
|
* @param id |
||||||
|
* @param callBack |
||||||
|
*/ |
||||||
|
public findFileRecords(id: number, callBack:any) { |
||||||
|
this.http.get(environment.baseUrl + 'file/findFileRecords?id=' + id + "&time=" + new Date().getTime()).subscribe(data => { |
||||||
|
callBack(data); |
||||||
|
}); |
||||||
|
} |
||||||
|
|
||||||
|
public getDownLoad(id: number, callBack:any) { |
||||||
|
this.http.get(environment.baseUrl + 'file/getDownLoad?id=' + id + "&time=" + new Date().getTime()).subscribe(data => { |
||||||
|
callBack(data); |
||||||
|
}); |
||||||
|
} |
||||||
|
|
||||||
|
} |
@ -0,0 +1,24 @@ |
|||||||
|
import { Injectable } from '@angular/core'; |
||||||
|
import {HttpClient} from "@angular/common/http"; |
||||||
|
import {environment} from "../../../environments/environment"; |
||||||
|
import {ObjectData} from "../../utils/objectData.service"; |
||||||
|
|
||||||
|
@Injectable({ |
||||||
|
providedIn: 'root' |
||||||
|
}) |
||||||
|
export class OrderStarbucksService { |
||||||
|
|
||||||
|
constructor(private http: HttpClient) { } |
||||||
|
|
||||||
|
/** |
||||||
|
* 查询订单列表 |
||||||
|
* @param param |
||||||
|
* @param callBack |
||||||
|
*/ |
||||||
|
public getListStarbucks(param: object, callBack:any) { |
||||||
|
this.http.get(environment.orderUrl + 'orderStarbucks/getListStarbucks?'+ObjectData.objectByString(param)).subscribe(data => { |
||||||
|
callBack(data); |
||||||
|
}); |
||||||
|
} |
||||||
|
|
||||||
|
} |
@ -0,0 +1,23 @@ |
|||||||
|
import { Injectable } from '@angular/core'; |
||||||
|
import {HttpClient} from "@angular/common/http"; |
||||||
|
import {environment} from "../../../environments/environment"; |
||||||
|
import {ObjectData} from "../../utils/objectData.service"; |
||||||
|
|
||||||
|
@Injectable({ |
||||||
|
providedIn: 'root' |
||||||
|
}) |
||||||
|
export class OrderService { |
||||||
|
|
||||||
|
constructor(private http: HttpClient) { } |
||||||
|
|
||||||
|
/** |
||||||
|
* 查询订单 |
||||||
|
* @param orderNo |
||||||
|
* @param callBack |
||||||
|
*/ |
||||||
|
public queryOrder(orderNo: string, callBack:any) { |
||||||
|
this.http.get(environment.orderUrl + 'queryOrder?orderNo='+ orderNo).subscribe(data => { |
||||||
|
callBack(data); |
||||||
|
}); |
||||||
|
} |
||||||
|
} |
Loading…
Reference in new issue