提交代码

pull/1/head
胡锐 2 years ago
parent 99f4cf4cbd
commit 7354d4502a
  1. 186
      src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.html
  2. 6
      src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.scss
  3. 128
      src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.ts
  4. 3
      src/app/admin/order-manage/order-oil/order-oil-list/order-oil-list.component.scss
  5. 10
      src/app/admin/order-manage/order-oil/order-oil-list/order-oil-list.component.ts
  6. 40
      src/app/services/order/order-coupon.service.ts
  7. 29
      src/app/services/order/order-manage.service.ts
  8. 19
      src/app/services/order/order-oil.service.ts

@ -1 +1,185 @@
<p>order-coupon-list works!</p> <!-- 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="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">
<input nz-input formControlName="couponName" />
</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="couponName" />
</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="payType">
<nz-option nzValue="1" nzLabel="支付宝"></nz-option>
<nz-option nzValue="2" nzLabel="微信"></nz-option>
<nz-option nzValue="3" nzLabel="积分抵扣"></nz-option>
<nz-option nzValue="4" nzLabel="汇联通工会卡"></nz-option>
<nz-option nzValue="5" nzLabel="银联"></nz-option>
<nz-option nzValue="6" nzLabel="银联分期"></nz-option>
<nz-option nzValue="7" nzLabel="嗨森逛油卡"></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-select nzAllowClear formControlName="orderStatus">
<nz-option nzValue="1" nzLabel="待支付"></nz-option>
<nz-option nzValue="2" nzLabel="已支付"></nz-option>
<nz-option nzValue="3" nzLabel="已完成"></nz-option>
<nz-option nzValue="4" nzLabel="已退款"></nz-option>
<nz-option nzValue="5" nzLabel="已取消"></nz-option>
</nz-select>
</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">
<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="payTime"></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="finishTime"></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
[nzData]="dataObject.list"
[nzTotal]="dataObject.total"
[nzFrontPagination]="false"
[nzLoading]="tableLoading"
[nzPageIndex]="whereObject.pageNum"
(nzPageIndexChange)="requestData($event)"
[nzScroll]="{ x: '1100px'}">
<thead>
<tr>
<th nzWidth="60px">序号</th>
<th nzWidth="200px">交易单号</th>
<th nzWidth="120px">客户电话</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 nzWidth="140px">支付卡号</th>
<th nzWidth="100px">订单状态</th>
<th nzWidth="180px">创建时间</th>
<th nzWidth="180px">支付时间</th>
<th nzWidth="180px">完成时间</th>
<!-- <th nzWidth="110px" nzRight="0px">操作</th>-->
</tr>
</thead>
<tbody>
<tr *ngFor="let data of basicTable.data;let i = index">
<td>{{i+1}}</td>
<td>{{data.orderNo}}</td>
<td>{{data.memPhone}}</td>
<td>{{data.couponName}}</td>
<td>¥{{data.couponPrice}}</td>
<td>¥{{data.totalPrice}}</td>
<td>¥{{data.deductionPrice}}</td>
<td>¥{{data.payablePrice}}</td>
<td>¥{{data.payGold / 100}}</td>
<td>¥{{data.payPrice}}</td>
<td>{{data.payType}}</td>
<td>{{data.memCardNo}}</td>
<td>{{data.orderStatus}}</td>
<td>{{data.createTime | date : 'yyyy-MM-dd HH:mm:ss'}}</td>
<td>{{data.payTime | date : 'yyyy-MM-dd HH:mm:ss'}}</td>
<td>{{data.finishTime | date : 'yyyy-MM-dd HH:mm:ss'}}</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 ><a>二维码</a></li>
</ul>
</nz-dropdown-menu>
</td>-->
</tr>
</tbody>
</nz-table>
</div>
</nz-spin>

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

@ -1,4 +1,13 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import {NzMessageService, NzModalService} from 'ng-zorro-antd';
import {LocalStorageService} from '../../../../services/local-storage.service';
import {CommonsService} from '../../../../services/commons.service';
import {Router} from '@angular/router';
import {FormBuilder, FormGroup} from '@angular/forms';
import {ADMIN_INFO_OBJECT} from '../../../../services/local-storage.namespace';
import {environment} from '../../../../../environments/environment';
import {OrderManageService} from '../../../../services/order/order-manage.service';
import {OrderCouponService} from '../../../../services/order/order-coupon.service';
@Component({ @Component({
selector: 'app-order-coupon-list', selector: 'app-order-coupon-list',
@ -7,9 +16,126 @@ import { Component, OnInit } from '@angular/core';
}) })
export class OrderCouponListComponent implements OnInit { export class OrderCouponListComponent implements OnInit {
constructor() { } FILE_URL = environment.imageUrl;
roleType;
adminFlag;
loadingObject = {
spinning: false,
msg: '加载中'
};
dataObject: any = {};
tableLoading = true;
searchForm: FormGroup;
pageNum: number;
whereObject: any = {};
isCollapse = false;
positionTypeArray = [];
constructor(private modal: NzModalService,
private message: NzMessageService,
private store: LocalStorageService,
private orderManageService: OrderManageService,
private orderCouponService: OrderCouponService,
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 { ngOnInit(): void {
this.searchForm = this.form.group({
orderNo: [null],
memPhone: [null],
couponName: [null],
payType: [null],
orderStatus: [null],
createTime: [null],
payTime: [null],
finishTime: [null],
});
this.requestData(1);
}
/**
*
*/
requestData(pageNum) {
this.tableLoading = true;
this.whereObject['pageNum'] = pageNum;
this.whereObject['pageSize'] = 10;
this.orderCouponService.getOrderList(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;
}
/**
* Excel
*/
exportExcel(): void {
this.loadingObject.spinning = true;
this.loadingObject.msg = '处理中...';
/*this.orderService.exportOrderCouponExcel(this.whereObject, data => {
this.loadingObject.spinning = false;
if (data['return_code'] === '000000') {
window.location.href = this.FILE_URL + data['return_data'];
}
});*/
}
} }

@ -1,6 +1,9 @@
.collapse { .collapse {
margin-left: 15px; margin-left: 15px;
} }
nz-range-picker {
width: 100%;
}
::ng-deep .order-oil-tab .ant-descriptions-item-label { ::ng-deep .order-oil-tab .ant-descriptions-item-label {
width: 150px; width: 150px;
} }

@ -8,10 +8,11 @@ import {TyAgentService} from '../../../../services/ty-agent.service';
import {TySalesmanService} from '../../../../services/ty-salesman.service'; import {TySalesmanService} from '../../../../services/ty-salesman.service';
import {OrganizationService} from '../../../../services/organization.service'; import {OrganizationService} from '../../../../services/organization.service';
import {ADMIN_INFO_OBJECT} from '../../../../services/local-storage.namespace'; import {ADMIN_INFO_OBJECT} from '../../../../services/local-storage.namespace';
import {OrderManageService} from '../../../../services/order-manage.service';
import {CommonsService} from '../../../../services/commons.service'; import {CommonsService} from '../../../../services/commons.service';
import {CompanyService} from '../../../../services/company.service'; import {CompanyService} from '../../../../services/company.service';
import {MerchantService} from '../../../../services/merchant.service'; import {MerchantService} from '../../../../services/merchant.service';
import {OrderOilService} from '../../../../services/order/order-oil.service';
import {OrderManageService} from '../../../../services/order/order-manage.service';
@Component({ @Component({
selector: 'app-order-oil-list', selector: 'app-order-oil-list',
@ -60,6 +61,7 @@ export class OrderOilListComponent implements OnInit {
private merchantService: MerchantService, private merchantService: MerchantService,
private store: LocalStorageService, private store: LocalStorageService,
private orderManageService: OrderManageService, private orderManageService: OrderManageService,
private orderOilService: OrderOilService,
private tyAgentService: TyAgentService, private tyAgentService: TyAgentService,
private tySalesmanService: TySalesmanService, private tySalesmanService: TySalesmanService,
private organizationService: OrganizationService, private organizationService: OrganizationService,
@ -131,7 +133,7 @@ export class OrderOilListComponent implements OnInit {
this.tableLoading = true; this.tableLoading = true;
this.whereObject['pageNum'] = pageNum; this.whereObject['pageNum'] = pageNum;
this.whereObject['pageSize'] = this.pageSize; this.whereObject['pageSize'] = this.pageSize;
this.orderManageService.getGasOrderList(this.whereObject, data => { this.orderOilService.getGasOrderList(this.whereObject, data => {
if (data['return_code'] === '000000') { if (data['return_code'] === '000000') {
this.dataObject = data['return_data']; this.dataObject = data['return_data'];
} else { } else {
@ -273,7 +275,7 @@ export class OrderOilListComponent implements OnInit {
this.loadingObject.status = true; this.loadingObject.status = true;
this.loadingObject.title = '数据导出中...'; this.loadingObject.title = '数据导出中...';
this.orderManageService.exportGasOrderList(this.whereObject, data => { this.orderOilService.exportGasOrderList(this.whereObject, data => {
if (data['return_code'] === '000000') { if (data['return_code'] === '000000') {
window.location.href = this.FILE_URL + 'temporary/' + data['return_data']; window.location.href = this.FILE_URL + 'temporary/' + data['return_data'];
} else { } else {
@ -293,7 +295,7 @@ export class OrderOilListComponent implements OnInit {
this.orderDetailModal = true; this.orderDetailModal = true;
this.orderDetailModalLoading = true; this.orderDetailModalLoading = true;
this.orderManageService.getGasOrderDetail(orderNo, data => { this.orderOilService.getGasOrderDetail(orderNo, data => {
if (data['return_code'] === '000000') { if (data['return_code'] === '000000') {
this.orderDetailObject = data['return_data']; this.orderDetailObject = data['return_data'];
} else { } else {

@ -0,0 +1,40 @@
import { Injectable } from '@angular/core';
import {HttpClient} from '@angular/common/http';
import {CommonsService} from '../commons.service';
import {environment} from '../../../environments/environment';
@Injectable({
providedIn: 'root'
})
export class OrderCouponService {
constructor(
private http: HttpClient,
private common: CommonsService
) { }
/**
*
*
* @param paramsObject
* @param callBack
*/
public getOrderList(param: object, callBack) {
this.http.get(environment.orderUrl + 'coupon/getOrderList?' + this.common.getWhereCondition(param)).subscribe(data => {
callBack(data);
});
}
/**
*
*
* @param paramsObject
* @param callBack
*/
public getCouponOrderDetail(param: object, callBack) {
this.http.get(environment.orderUrl + 'coupon/getCouponOrderDetail?' + this.common.getWhereCondition(param)).subscribe(data => {
callBack(data);
});
}
}

@ -0,0 +1,29 @@
import { Injectable } from '@angular/core';
import {HttpClient} from '@angular/common/http';
import {CommonsService} from '../commons.service';
import {environment} from '../../../environments/environment';
@Injectable({
providedIn: 'root'
})
export class OrderManageService {
constructor(
private http: HttpClient,
private common: CommonsService
) {
}
/**
* 退
*
* @param paramsObject
* @param callBack
*/
public refundOrder(orderNo: string, remarks: string, callBack) {
this.http.post(environment.orderUrl + 'refundOrder', { orderNo: orderNo, remarks: remarks}).subscribe(data => {
callBack(data);
});
}
}

@ -1,12 +1,12 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import {HttpClient} from '@angular/common/http'; import {HttpClient} from '@angular/common/http';
import {CommonsService} from './commons.service'; import {CommonsService} from '../commons.service';
import {environment} from '../../environments/environment'; import {environment} from '../../../environments/environment';
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root'
}) })
export class OrderManageService { export class OrderOilService {
constructor( constructor(
private http: HttpClient, private http: HttpClient,
@ -14,19 +14,6 @@ export class OrderManageService {
) { ) {
} }
/**
* 退
*
* @param paramsObject
* @param callBack
*/
public refundOrder(orderNo: string, remarks: string, callBack) {
this.http.post(environment.orderUrl + 'refundOrder', { orderNo: orderNo, remarks: remarks}).subscribe(data => {
callBack(data);
});
}
/** /**
* *
* *
Loading…
Cancel
Save