* 'order' of http://139.159.177.244:3000/yuanye/high-web:
  提交代码

# Conflicts:
#	src/app/app-common.module.ts
#	src/app/pipes/index.ts
pull/1/head
袁野 2 years ago
commit 8651d46381
  1. 5
      src/app/admin/order-manage/order-manage-routing.module.ts
  2. 5
      src/app/admin/order-manage/order-manage.module.ts
  3. 25
      src/app/admin/order-manage/order-oil/order-oil-list/order-oil-list.component.html
  4. 21
      src/app/admin/order-manage/order-oil/order-oil-list/order-oil-list.component.ts
  5. 255
      src/app/admin/order-manage/order-refund-list/order-refund-list.component.html
  6. 6
      src/app/admin/order-manage/order-refund-list/order-refund-list.component.scss
  7. 25
      src/app/admin/order-manage/order-refund-list/order-refund-list.component.spec.ts
  8. 190
      src/app/admin/order-manage/order-refund-list/order-refund-list.component.ts
  9. 156
      src/app/app-common.module.ts
  10. 1
      src/app/pipes/index.ts
  11. 19
      src/app/pipes/order/order-refund-status.pipe.ts
  12. 24
      src/app/services/order/order-manage.service.ts

@ -3,13 +3,14 @@ import { Routes, RouterModule } from '@angular/router';
import {OrderOilListComponent} from './order-oil/order-oil-list/order-oil-list.component';
import {OrderCouponListComponent} from './order-coupon/order-coupon-list/order-coupon-list.component';
import {OrderIntegralRechargeComponent} from './order-integral-recharge/order-integral-recharge.component';
import {KfcOrderListComponent} from './kfc-order/kfc-order-list/kfc-order-list.component';
import {OrderRefundListComponent} from './order-refund-list/order-refund-list.component';
const routes: Routes = [
{ path: 'order-oil-list', component: OrderOilListComponent },
{ path: 'order-coupon-list', component: OrderCouponListComponent },
{ path: 'order-integral-recharge-list', component: OrderIntegralRechargeComponent},
{ path: 'order-integral-recharge-list', component: OrderIntegralRechargeComponent },
{ path: 'order-refund-list', component: OrderRefundListComponent },
{ path: 'order-kfc-list', component: KfcOrderListComponent}
];

@ -9,11 +9,10 @@ import {BreadcrumbModule} from '../../common/breadcrumb/breadcrumb.module';
import {AppCommonModule} from '../../app-common.module';
import { OrderCouponListComponent } from './order-coupon/order-coupon-list/order-coupon-list.component';
import { OrderIntegralRechargeComponent } from './order-integral-recharge/order-integral-recharge.component';
import { KfcOrderListComponent } from './kfc-order/kfc-order-list/kfc-order-list.component';
import { OrderRefundListComponent } from './order-refund-list/order-refund-list.component';
@NgModule({
declarations: [OrderOilListComponent, OrderCouponListComponent, OrderIntegralRechargeComponent, KfcOrderListComponent],
declarations: [OrderOilListComponent, OrderCouponListComponent, OrderIntegralRechargeComponent, OrderRefundListComponent, KfcOrderListComponent],
imports: [
CommonModule,
OrderManageRoutingModule,

@ -275,7 +275,7 @@
<ul nz-menu nzSelectable>
<li (click)="showOrderDetail(data.orderNo)" nz-menu-item>交易详情</li>
<li *ngIf="data.status == 2" (click)="showRefund(data.orderNo)" nz-menu-item>交易退款</li>
<li nz-menu-item>退款记录</li>
<li (click)="showRefundRecord(data.orderNo)" nz-menu-item>退款记录</li>
</ul>
</nz-dropdown-menu>
</td>
@ -422,27 +422,29 @@
</nz-spin>
</nz-modal>
<!--
<nz-modal [(nzVisible)]="orderDetailModal" nzTitle="退款记录" (nzOnCancel)="closeOrderDetail()" [nzFooter]="null"
<nz-modal [(nzVisible)]="refundRecordModal" nzTitle="退款记录" (nzOnCancel)="closeRefundRecord()" [nzFooter]="null"
nzWidth="1000px" [nzBodyStyle]=" { padding: '5px 5px 30px 5px'}">
<nz-table #childOrder [nzData]="orderDetailObject.tradeOrder.highChildOrderList" [nzHideOnSinglePage]="true">
<thead>
<tr>
<th nzWidth="60px">产品单号</th>
<th nzWidth="60px">退款单号</th>
<th nzWidth="60px">产品类型</th>
<th nzWidth="150px">产品名称</th>
<th nzWidth="100px">产品名称</th>
<th nzWidth="80px">产品规格</th>
<th nzWidth="20px">数量</th>
<th nzWidth="20px">单价</th>
<th nzWidth="20px">总价</th>
<th nzWidth="20px">退款数量</th>
<th nzWidth="20px">退款总额</th>
<th nzWidth="20px">退款金额</th>
<th nzWidth="20px">退款积分</th>
<th nzWidth="20px">退款备注</th>
<th nzWidth="20px">退款状态</th>
<th nzWidth="20px">创建时间</th>
<th nzWidth="20px">退款时间</th>
</tr>
</thead>
<tbody>
<tr *ngFor="let data of childOrder.data">
<td>{{ data.goodsType | orderChildGoodsType}}</td>
<td>
{{ data.goodsName }}
<nz-tag *ngIf="data.giveawayType == 1" [nzColor]="'magenta'">赠品</nz-tag>
</td>
<td>{{ data.goodsSpecName }}</td>
<td>{{ data.saleCount }}</td>
<td>{{ data.goodsActualPrice }} 元</td>
@ -451,4 +453,3 @@
</tbody>
</nz-table>
</nz-modal>
-->

@ -39,6 +39,8 @@ export class OrderOilListComponent implements OnInit {
refundModal = false;
refundForm: FormGroup;
refundRecordModal = false;
orderDetailModal = false;
orderDetailModalLoading = false;
orderDetailObject: any = {
@ -379,4 +381,23 @@ export class OrderOilListComponent implements OnInit {
closeRefund() {
this.refundModal = false;
}
/**
* 退
* @param orderNo
*/
showRefundRecord(orderNo: string) {
this.refundModal = true;
}
/**
* 退
* @param orderNo
*/
closeRefundRecord() {
this.refundModal = false;
}
}

@ -0,0 +1,255 @@
<!-- start 面包屑 -->
<app-breadcrumb></app-breadcrumb>
<!-- end 面包屑 -->
<!--条件搜索-->
<nz-spin [nzSpinning]="loadingObject.spinning" nzTip="{{loadingObject.msg}}">
<div class="inner-content">
<form nz-form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)">
<div nz-row>
<div nz-col nzSpan="8">
<nz-form-item>
<nz-form-label [nzSpan]="8">交易单号</nz-form-label>
<nz-form-control [nzSpan]="14">
<input nz-input formControlName="orderNo" />
</nz-form-control>
</nz-form-item>
</div>
<div nz-col nzSpan="8">
<nz-form-item>
<nz-form-label [nzSpan]="8">产品单号</nz-form-label>
<nz-form-control [nzSpan]="14">
<input nz-input formControlName="orderChildNo" />
</nz-form-control>
</nz-form-item>
</div>
<div nz-col nzSpan="8">
<nz-form-item>
<nz-form-label [nzSpan]="8">退款单号</nz-form-label>
<nz-form-control [nzSpan]="14">
<input nz-input formControlName="refundOrderNo" />
</nz-form-control>
</nz-form-item>
</div>
</div>
<div nz-row *ngIf="isCollapse">
<div nz-col nzSpan="8">
<nz-form-item>
<nz-form-label [nzSpan]="8">客户电话</nz-form-label>
<nz-form-control [nzSpan]="14">
<input nz-input formControlName="memPhone" />
</nz-form-control>
</nz-form-item>
</div>
<div nz-col nzSpan="8">
<nz-form-item>
<nz-form-label [nzSpan]="8">产品类型</nz-form-label>
<nz-form-control [nzSpan]="14">
<nz-option *ngFor="let item of orderChildGoodsTypeArray" nzValue="{{item.codeValue}}" nzLabel="{{item.codeName}}"></nz-option>
</nz-form-control>
</nz-form-item>
</div>
<div nz-col nzSpan="8">
<nz-form-item>
<nz-form-label [nzSpan]="8">产品名称</nz-form-label>
<nz-form-control [nzSpan]="14">
<input nz-input formControlName="goodsName" />
</nz-form-control>
</nz-form-item>
</div>
<div nz-col nzSpan="8">
<nz-form-item>
<nz-form-label [nzSpan]="8">退款状态</nz-form-label>
<nz-form-control [nzSpan]="14">
<nz-select nzAllowClear formControlName="status">
<nz-option *ngFor="let item of orderRefundStatusArray" nzValue="{{item.codeValue}}" nzLabel="{{item.codeName}}"></nz-option>
</nz-select>
</nz-form-control>
</nz-form-item>
</div>
<div nz-col nzSpan="8">
<nz-form-item>
<nz-form-label [nzSpan]="8">创建时间</nz-form-label>
<nz-form-control [nzSpan]="14">
<nz-range-picker [nzShowTime]="{ nzFormat: 'yyyy-MM-dd HH:mm:ss' }" formControlName="createTime"></nz-range-picker>
</nz-form-control>
</nz-form-item>
</div>
<div nz-col nzSpan="8">
<nz-form-item>
<nz-form-label [nzSpan]="8">退款时间</nz-form-label>
<nz-form-control [nzSpan]="14">
<nz-range-picker [nzShowTime]="{ nzFormat: 'yyyy-MM-dd HH:mm:ss' }" formControlName="refundTime"></nz-range-picker>
</nz-form-control>
</nz-form-item>
</div>
</div>
<div nz-row>
<div nz-col nzSpan="24" class="search-button">
<button nz-button nzType="primary"><i nz-icon nzType="search" nzTheme="outline"></i>搜索</button>
<button nz-button nzType="default" (click)="resetForm()"><i nz-icon nzType="reload" nzTheme="outline"></i>重置</button>
<a class="collapse" (click)="toggleCollapse()">更多条件<i nz-icon [nzType]="!isCollapse ? 'down' : 'up'"></i></a>
</div>
</div>
</form>
</div>
<div class="inner-content">
<span>共计 {{dataObject.total?dataObject.total:0}} 条数据</span>
<div class="operating-button">
<button nz-button nzType="primary" class="right-btn" (click)="exportExcel()" ><i nz-icon nzType="export" nzTheme="outline"></i>导出Excel</button>
</div>
<!--数组表格 -->
<nz-table #basicTable
nzShowPagination
nzShowSizeChanger
nzBordered
[nzData]="dataObject.list"
[nzTotal]="dataObject.total"
[nzFrontPagination]="false"
[nzLoading]="tableLoading"
[nzPageIndex]="whereObject.pageNum"
(nzPageIndexChange)="requestData($event)"
(nzPageSizeChange)="pageSizeChang($event)"
[nzPageSizeOptions]="[10,20,50,100]"
[nzScroll]="{ x: '1100px'}">
<thead>
<tr>
<th nzWidth="200px">交易单号</th>
<th nzWidth="160px">产品单号</th>
<th nzWidth="120px">客户电话</th>
<th nzWidth="120px">产品类型</th>
<th nzWidth="120px">产品名称</th>
<th nzWidth="200px">退款单号</th>
<th nzWidth="120px">退款数量</th>
<th nzWidth="120px">退款总额</th>
<th nzWidth="120px">退回金额</th>
<th nzWidth="100px">退回积分</th>
<th nzWidth="100px">退款状态</th>
<th nzWidth="180px">创建时间</th>
<th nzWidth="180px">退款时间</th>
<th nzWidth="300px">退款备注</th>
<th nzWidth="110px" nzRight="0px">操作</th>
</tr>
</thead>
<tbody>
<tr *ngFor="let data of basicTable.data;let i = index">
<td>{{data.orderNo}}</td>
<td>{{data.orderChildNo}}</td>
<td>{{data.memPhone}}</td>
<td>{{data.goodsType | orderChildGoodsType}}</td>
<td>{{data.goodsName}}</td>
<td>{{data.refundOrderNo}}</td>
<td>{{data.goodsCount}}</td>
<td>¥{{data.returnTotalPrice}}</td>
<td>¥{{data.refundPrice}}</td>
<td>{{data.refundIntegral}}</td>
<td>{{data.refundStatus | orderRefundStatus}}</td>
<td>{{data.createTime | date : 'yyyy-MM-dd HH:mm:ss'}}</td>
<td>{{data.refundTime | date : 'yyyy-MM-dd HH:mm:ss'}}</td>
<td nzBreakWord>{{data.refundRemark}}</td>
<td nzRight="0px" class="table-td-operation">
<a nz-dropdown [nzDropdownMenu]="menu"> 操作列表 <i nz-icon nzType="down"></i> </a>
<nz-dropdown-menu #menu="nzDropdownMenu">
<ul nz-menu nzSelectable>
<li nz-menu-item (click)="showOrderDetail(data.orderNo)"><a>交易详情</a></li>
</ul>
</nz-dropdown-menu>
</td>
</tr>
</tbody>
</nz-table>
</div>
</nz-spin>
<nz-modal [(nzVisible)]="orderDetailModal" nzTitle="交易详情" (nzOnCancel)="closeOrderDetail()" [nzFooter]="null"
nzWidth="1000px" [nzBodyStyle]=" { padding: '5px 5px 30px 5px'}">
<nz-spin [nzSpinning]="orderDetailModalLoading">
<nz-tabset [nzTabPosition]="'top'" [nzType]="'card'" class="order-oil-tab">
<nz-tab nzTitle="交易信息">
<nz-descriptions nzBordered [nzColumn]="2" [nzSize]="'middle'">
<nz-descriptions-item nzTitle="交易订单号">{{orderDetailObject.orderNo}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="第三方交易号">{{orderDetailObject.paySerialNo!=null?orderDetailObject.paySerialNo:'无'}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="客户手机号">{{orderDetailObject.memPhone}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="交易状态">{{orderDetailObject.orderStatus | orderStatus}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="支付方式">{{orderDetailObject.payType | orderPayType}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="支付卡号" *ngIf="orderDetailObject.payType == 4 || orderDetailObject.payType == 7">
{{orderDetailObject.memCardNo}}
</nz-descriptions-item>
<nz-descriptions-item nzTitle="优惠券">{{orderDetailObject.memDiscountName?orderDetailObject.tradeOrder.memDiscountName:'无'}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="返利">{{orderDetailObject.whetherRebate?'是':'否'}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="备注">{{orderDetailObject.remarks}}</nz-descriptions-item>
</nz-descriptions>
<nz-divider nzText="支付信息"></nz-divider>
<nz-descriptions nzBordered [nzColumn]="3" [nzSize]="'middle'">
<nz-descriptions-item nzTitle="交易总额">{{orderDetailObject.totalPrice}} 元</nz-descriptions-item>
<nz-descriptions-item nzTitle="优惠金额">{{orderDetailObject.deductionPrice}} 元</nz-descriptions-item>
<nz-descriptions-item nzTitle="应付金额">{{orderDetailObject.payablePrice}} 元</nz-descriptions-item>
<nz-descriptions-item nzSpan="2" nzTitle="积分抵扣">{{orderDetailObject.payGold / 100}} 元 </nz-descriptions-item>
<nz-descriptions-item nzTitle="实付金额">
{{orderDetailObject.payRealPrice!=null?orderDetailObject.payRealPrice+' 元':'未支付'}}
</nz-descriptions-item>
</nz-descriptions>
</nz-tab>
<nz-tab nzTitle="交易时间">
<nz-card>
<nz-timeline>
<nz-timeline-item *ngIf="orderDetailObject.createTime != null">
<p>创建时间:{{orderDetailObject.createTime | date : 'yyyy-MM-dd HH:mm:ss'}}</p>
<p>备注:{{orderDetailObject.remarks?orderDetailObject.tradeOrder.remarks:'无'}}</p>
</nz-timeline-item>
<nz-timeline-item *ngIf="orderDetailObject.cancelTime != null">
<p>取消时间:{{orderDetailObject.cancelTime | date : 'yyyy-MM-dd HH:mm:ss'}}</p>
<p>备注:{{orderDetailObject.cancelRemarks?orderDetailObject.cancelRemarks:'无'}}</p>
</nz-timeline-item>
<nz-timeline-item *ngIf="orderDetailObject.payTime != null">支付时间:{{orderDetailObject.payTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item>
<nz-timeline-item *ngIf="orderDetailObject.finishTime != null">完成时间:{{orderDetailObject.finishTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item>
<nz-timeline-item *ngIf="orderDetailObject.refundTime != null">退款时间:{{orderDetailObject.refundTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item>
</nz-timeline>
</nz-card>
</nz-tab>
<nz-tab nzTitle="产品信息">
<nz-table #childOrder [nzData]="orderDetailObject.highChildOrderList" [nzHideOnSinglePage]="true">
<thead>
<tr>
<th nzWidth="60px">产品类型</th>
<th nzWidth="150px">产品名称</th>
<th nzWidth="80px">产品规格</th>
<th nzWidth="20px">数量</th>
<th nzWidth="20px">单价</th>
<th nzWidth="20px">总价</th>
</tr>
</thead>
<tbody>
<tr *ngFor="let data of childOrder.data">
<td>{{ data.goodsType | orderChildGoodsType}}</td>
<td>
{{ data.goodsName }}
<nz-tag *ngIf="data.giveawayType == 1" [nzColor]="'magenta'">赠品</nz-tag>
</td>
<td>{{ data.goodsSpecName }}</td>
<td>{{ data.saleCount }}</td>
<td>{{ data.goodsActualPrice }} 元</td>
<td>{{ data.totalActualPrice }} 元</td>
</tr>
</tbody>
</nz-table>
</nz-tab>
</nz-tabset>
</nz-spin>
</nz-modal>

@ -0,0 +1,6 @@
.collapse {
margin-left: 15px;
}
nz-range-picker {
width: 100%;
}

@ -0,0 +1,25 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { OrderRefundListComponent } from './order-refund-list.component';
describe('OrderRefundListComponent', () => {
let component: OrderRefundListComponent;
let fixture: ComponentFixture<OrderRefundListComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ OrderRefundListComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(OrderRefundListComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

@ -0,0 +1,190 @@
import { Component, OnInit } from '@angular/core';
import {environment} from '../../../../environments/environment';
import {FormBuilder, FormGroup} from '@angular/forms';
import {NzMessageService, NzModalService} from 'ng-zorro-antd';
import {LocalStorageService} from '../../../services/local-storage.service';
import {OrderManageService} from '../../../services/order/order-manage.service';
import {CommonsService} from '../../../services/commons.service';
import {Router} from '@angular/router';
import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace';
@Component({
selector: 'app-order-refund-list',
templateUrl: './order-refund-list.component.html',
styleUrls: ['./order-refund-list.component.scss']
})
export class OrderRefundListComponent implements OnInit {
FILE_URL = environment.imageUrl;
roleType;
adminFlag;
loadingObject = {
spinning: false,
msg: '加载中'
};
dataObject: any = {};
tableLoading = true;
searchForm: FormGroup;
pageNum = 1;
pageSize = 10;
whereObject: any = {};
isCollapse = false;
orderDetailModal = false;
orderDetailModalLoading = false;
orderDetailObject: any = { };
orderChildGoodsTypeArray = [] ;
orderRefundStatusArray = [] ;
constructor(private modal: NzModalService,
private message: NzMessageService,
private store: LocalStorageService,
private orderManageService: OrderManageService,
private commonsService: CommonsService,
private router: Router,
private form: FormBuilder) {
this.roleType = Number(this.store.get(ADMIN_INFO_OBJECT)['secRole'].roleType);
this.adminFlag = Number(this.store.get(ADMIN_INFO_OBJECT)['secUser'].adminFlag);
}
ngOnInit(): void {
this.searchForm = this.form.group({
orderNo: [null],
orderChildNo: [null],
refundOrderNo: [null],
memPhone: [null],
goodsType: [null],
goodsName: [null],
status: [null],
createTime: [null],
});
this.commonsService.getDictionary("ORDER_CHILD_GOODS_TYPE", data => {
this.orderChildGoodsTypeArray = data['return_data'];
});
this.commonsService.getDictionary("ORDER_REFUND_STATUS", data => {
this.orderRefundStatusArray = data['return_data'];
});
this.requestData(1);
}
/**
*
*/
requestData(pageNum) {
this.tableLoading = true;
this.whereObject['pageNum'] = pageNum;
this.whereObject['pageSize'] = this.pageSize;
this.orderManageService.getRefundList(this.whereObject, data => {
if (data['return_code'] === '000000') {
this.dataObject = data['return_data'];
} else {
this.modal.error(data['return_msg']);
}
this.tableLoading = false;
});
}
/**
*
* @param whereObject
*/
search(whereObject: object) {
if (whereObject['createTime'] != null) {
whereObject['createTimeS'] = whereObject['createTime'][0].getTime();
whereObject['createTimeE'] = whereObject['createTime'][1].getTime();
} else {
whereObject['createTimeS'] = null;
whereObject['createTimeE'] = null;
}
if (whereObject['payTime'] != null) {
whereObject['payTimeS'] = whereObject['payTime'][0].getTime();
whereObject['payTimeE'] = whereObject['payTime'][1].getTime();
} else {
whereObject['payTimeS'] = null;
whereObject['payTimeE'] = null;
}
if (whereObject['finishTime'] != null) {
whereObject['finishTimeS'] = whereObject['finishTime'][0].getTime();
whereObject['finishTimeE'] = whereObject['finishTime'][1].getTime();
} else {
whereObject['finishTimeS'] = null;
whereObject['finishTimeE'] = null;
}
this.whereObject = whereObject;
this.requestData(1);
}
/**
*
*/
resetForm(): void {
this.searchForm.reset();
}
/**
*
*/
toggleCollapse(): void {
this.isCollapse = !this.isCollapse;
}
/**
*
*/
showOrderDetail(orderNo: string) {
this.orderDetailModal = true;
this.orderDetailModalLoading = true;
this.orderManageService.getDetailByOrderNo(orderNo, data => {
if (data['return_code'] === '000000') {
this.orderDetailObject = data['return_data'];
} else {
this.modal.error({
nzTitle: '提示',
nzContent: data['return_msg']
});
}
this.orderDetailModalLoading = false;
});
}
/**
*
*/
closeOrderDetail() {
this.orderDetailModal = false;
}
/**
* Excel
*/
exportExcel(): void {
this.loadingObject.spinning = true;
this.loadingObject.msg = '处理中...';
/*
this.orderIntegralRechargeService.exportOrder(this.whereObject, data => {
this.loadingObject.spinning = false;
if (data['return_code'] === '000000') {
window.location.href = this.FILE_URL + data['return_data'];
}
});*/
}
/**
*
* @param pageSize
*/
pageSizeChang(pageSize: number) {
this.pageSize = pageSize;
this.requestData(1)
}
}

@ -0,0 +1,156 @@
import {
FormsModule,
ReactiveFormsModule,
} from '@angular/forms';
import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common';
import {NgZorroAntdModule} from 'ng-zorro-antd';
import {NgxNeditorModule} from '@notadd/ngx-neditor';
// 管道
import {
TimesPipe,
TextareaPipe,
SystemPipe,
CouponStatusPipe,
CouponCodePipe,
AuditTypePipe,
AuditStatusPipe,
PaymodelPipe,
PaytypePipe,
DiscountTypePipe,
OrderCouponStatusPipe,
DiscountStatusPipe,
DisplayAreaPipe,
DiscountCodeStatusPipe,
RechargePricePipe,
RechargeStatusPipe,
ChannelMarkPipe,
TypePipe,
StatusPipe,
RechargePayTypePipe,
RefundSourcePipe,
RefundStatusPipe,
PreOrderStatusPipe,
ButtonPipe,
DiscountPackageStatusPipe,
PriceShowPipe,
ShowTypePipe,
EnergyTypePipe,
CompanyAmountRecordTypePipe,
CompanyAmountRecordSourceTypePipe,
OilCardBindStatusPipe,
OilCardRecordTypePipe,
OilCardRecordSourceTypePipe,
RechargePlatformPipe,
PriceStatusPipe,
GasStaffStatusPipe,
PayStatusPipe,
ChlidRechargeStatusPipe,
SourceTypePipe,
GasClassGroupTaskStatusPipe,
GasOrderStatusPipe,
OrderStatusPipe,
OrderPayTypePipe,
OrderChildGoodsTypePipe,
OrderRefundStatusPipe
} from './pipes';
import {OilCardStatusPipe} from './pipes';
import {OilTypePipe} from './pipes/store/oil-type.pipe';
import {OilPriceTaskStatusPipe} from './pipes/gas-oil-price/oil-price-task-status.pipe';
import {OilPriceTaskExecutionTypePipe} from './pipes/gas-oil-price/oil-price-task-execution-type.pipe';
import {OilPriceTaskPriceTypePipe} from './pipes/gas-oil-price/oil-price-task-price-type.pipe';
import { PlatformPipe } from './pipes/recharge-pipe/platform.pipe';
import { IntegralTypePipe } from './pipes/integral/integral-type.pipe';
import { IntegralProductPipe } from './pipes/integral/integral-product.pipe';
import {OrderOilStatusPipe} from './pipes/order/order-oil-status.pipe';
const PIPES = [
TimesPipe,
TextareaPipe,
SystemPipe,
CouponStatusPipe,
CouponCodePipe,
AuditTypePipe,
AuditStatusPipe,
OrderCouponStatusPipe,
PaymodelPipe,
PaytypePipe,
DiscountTypePipe,
DiscountStatusPipe,
DisplayAreaPipe,
DiscountCodeStatusPipe,
RechargePricePipe,
RechargeStatusPipe,
ChannelMarkPipe,
ChannelMarkPipe,
TypePipe,
StatusPipe,
RechargePayTypePipe,
RefundSourcePipe,
RefundStatusPipe,
PreOrderStatusPipe,
ButtonPipe,
DiscountPackageStatusPipe,
ShowTypePipe,
PriceShowPipe,
EnergyTypePipe,
CompanyAmountRecordTypePipe,
CompanyAmountRecordSourceTypePipe,
OilCardStatusPipe,
OilCardBindStatusPipe,
OilCardRecordTypePipe,
OilCardRecordSourceTypePipe,
GasStaffStatusPipe,
OilTypePipe,
RechargePlatformPipe,
PriceStatusPipe,
OilPriceTaskStatusPipe,
OilPriceTaskExecutionTypePipe,
OilPriceTaskPriceTypePipe,
PayStatusPipe,
ChlidRechargeStatusPipe,
SourceTypePipe,
GasClassGroupTaskStatusPipe,
GasOrderStatusPipe,
PlatformPipe,
OrderOilStatusPipe,
OrderStatusPipe,
OrderPayTypePipe,
OrderChildGoodsTypePipe,
OrderRefundStatusPipe,
];
@NgModule({
imports: [
CommonModule,
FormsModule,
ReactiveFormsModule,
NgZorroAntdModule,
NgxNeditorModule
],
declarations: [
...PIPES,
IntegralTypePipe,
IntegralProductPipe,
],
exports: [
...PIPES,
IntegralTypePipe,
IntegralProductPipe,
],
})
export class AppCommonModule {
static forRoot() {
return {
ngModule: AppCommonModule,
providers: [],
};
}
}

@ -46,3 +46,4 @@ export * from './order/order-status.pipe';
export * from './order/order-pay-type.pipe';
export * from './order/order-child-goods-type.pipe';
export * from './third-product/product-type.pipe';
export * from './order/order-refund-status.pipe';

@ -0,0 +1,19 @@
import { Pipe, PipeTransform } from '@angular/core';
@Pipe({
name: 'orderRefundStatus'
})
export class OrderRefundStatusPipe implements PipeTransform {
transform(value: number): string {
switch (value) {
case 1:
return '退款中';
case 2:
return '退款成功';
case 3:
return '退款失败';
}
}
}

@ -14,6 +14,18 @@ export class OrderManageService {
) {
}
/**
*
*
* @param paramsObject
* @param callBack
*/
public getDetailByOrderNo(orderNo: string, callBack) {
this.http.get(environment.orderUrl + 'getDetailByOrderNo?orderNo='+ orderNo).subscribe(data => {
callBack(data);
});
}
/**
* 退
*
@ -26,4 +38,16 @@ export class OrderManageService {
});
}
/**
* 退
*
* @param paramsObject
* @param callBack
*/
public getRefundList(param: object, callBack) {
this.http.get(environment.orderUrl + 'getRefundList?'+this.common.getWhereCondition(param)).subscribe(data => {
callBack(data);
});
}
}

Loading…
Cancel
Save