hurui
/
high-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交修改

Browse Source
pull/1/head
袁野 3 years ago
parent 7ee96fa41a
commit f7f3e5a0b4
17 changed files with 1441 additions and 565 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 76
      src/app/admin/cms/cms-content/cms-content.component.ts
  2. 177
      src/app/admin/order/order-c-list/order-c-list.component.html
  3. 4
      src/app/admin/order/order-c-list/order-c-list.component.scss
  4. 186
      src/app/admin/order/order-c-list/order-c-list.component.ts
  5. 177
      src/app/admin/order/order-k-list/order-k-list.component.html
  6. 4
      src/app/admin/order/order-k-list/order-k-list.component.scss
  7. 186
      src/app/admin/order/order-k-list/order-k-list.component.ts
  8. 4
      src/app/admin/order/order-routing.module.ts
  9. 4
      src/app/admin/order/order.module.ts
  10. 28
      src/app/admin/recharge-order/price-list/price-list.component.html
  11. 15
      src/app/admin/recharge-order/price-list/price-list.component.ts
  12. 7
      src/app/app-common.module.ts
  13. 23
      src/app/pipes/channel-mark.pipe.ts
  14. 1
      src/app/pipes/index.ts
  15. 24
      src/app/services/order.service.ts
  16. 10
      src/app/services/recharge.service.ts
  17. 8
      src/environments/environment.ts

76
src/app/admin/cms/cms-content/cms-content.component.ts
Unescape View File

@ -1,4 +1,4 @@
import { Component, OnInit } from '@angular/core'; import {Component, OnInit} from '@angular/core';
import {FormBuilder, FormGroup, Validators} from '@angular/forms'; import {FormBuilder, FormGroup, Validators} from '@angular/forms';
import {HttpClient, HttpEvent, HttpEventType, HttpRequest, HttpResponse} from '@angular/common/http'; import {HttpClient, HttpEvent, HttpEventType, HttpRequest, HttpResponse} from '@angular/common/http';
import {NzMessageService, NzModalService, UploadXHRArgs} from 'ng-zorro-antd'; import {NzMessageService, NzModalService, UploadXHRArgs} from 'ng-zorro-antd';
@ -52,8 +52,10 @@ export class CmsContentComponent implements OnInit {
// 附件返回地址 // 附件返回地址
patchPath = ''; patchPath = '';
// 允许上传的文件类型 // 允许上传的文件类型
annexForm: FormGroup; /** 定义附件表单 **/ annexForm: FormGroup;
isVisible = false; /** 是否弹出添加 **/ /** 定义附件表单 **/
isVisible = false;
/** 是否弹出添加 **/
fileList = []; fileList = [];
// 上传的后缀名 // 上传的后缀名
suffix = ''; suffix = '';
@ -150,30 +152,35 @@ export class CmsContentComponent implements OnInit {
BTN_cmscontent_delete = 0; BTN_cmscontent_delete = 0;
BTN_cmscontent_patch = 0; BTN_cmscontent_patch = 0;
BTN_cmscontent_up_down = 0; BTN_cmscontent_up_down = 0;
constructor( constructor(
private fb: FormBuilder, private fb: FormBuilder,
private http: HttpClient, // http请求 private http: HttpClient, // http请求
private message: NzMessageService, // 信息提示 private message: NzMessageService, // 信息提示
private router: Router, private router: Router,
private modalService: NzModalService, // 对话框 private modalService: NzModalService, // 对话框
private store: LocalStorageService , // 请求缓存 private store: LocalStorageService, // 请求缓存
) { ) {
this.WEB_SERVE_URL = environment.imageUrl; this.WEB_SERVE_URL = environment.baseUrl;
this.searchCompanyId = this.store.get(ADMIN_INFO_OBJECT)['secUser']['companyId']; this.searchCompanyId = this.store.get(ADMIN_INFO_OBJECT)['secUser']['companyId'];
} }
ngOnInit() { ngOnInit() {
/** 循环查询 按钮权限 **/ /** 循环查询 按钮权限 **/
for (let i = 0; i < this.store.get(ADMIN_INFO_OBJECT)['buttonList'] .length; i++) { for (let i = 0; i < this.store.get(ADMIN_INFO_OBJECT)['buttonList'].length; i++) {
if (this.store.get(ADMIN_INFO_OBJECT)['buttonList'][i].permissionCode === 'BTN_cmscontent_add' ) { if (this.store.get(ADMIN_INFO_OBJECT)['buttonList'][i].permissionCode === 'BTN_cmscontent_add') {
this.BTN_cmscontent_add = 1; this.BTN_cmscontent_add = 1;
}if (this.store.get(ADMIN_INFO_OBJECT)['buttonList'][i].permissionCode === 'BTN_cmscontent_edit' ) { }
if (this.store.get(ADMIN_INFO_OBJECT)['buttonList'][i].permissionCode === 'BTN_cmscontent_edit') {
this.BTN_cmscontent_edit = 1; this.BTN_cmscontent_edit = 1;
}if (this.store.get(ADMIN_INFO_OBJECT)['buttonList'][i].permissionCode === 'BTN_cmscontent_delete' ) { }
if (this.store.get(ADMIN_INFO_OBJECT)['buttonList'][i].permissionCode === 'BTN_cmscontent_delete') {
this.BTN_cmscontent_delete = 1; this.BTN_cmscontent_delete = 1;
}if (this.store.get(ADMIN_INFO_OBJECT)['buttonList'][i].permissionCode === 'BTN_cmscontent_patch' ) { }
if (this.store.get(ADMIN_INFO_OBJECT)['buttonList'][i].permissionCode === 'BTN_cmscontent_patch') {
this.BTN_cmscontent_patch = 1; this.BTN_cmscontent_patch = 1;
}if (this.store.get(ADMIN_INFO_OBJECT)['buttonList'][i].permissionCode === 'BTN_cmscontent_up_down' ) { }
if (this.store.get(ADMIN_INFO_OBJECT)['buttonList'][i].permissionCode === 'BTN_cmscontent_up_down') {
this.BTN_cmscontent_up_down = 1; this.BTN_cmscontent_up_down = 1;
} }
} }
@ -204,6 +211,7 @@ export class CmsContentComponent implements OnInit {
this.findCategoryTree(roleType); this.findCategoryTree(roleType);
this.getRequest(); this.getRequest();
} }
// 重置搜索 // 重置搜索
resetSearch() { resetSearch() {
// 搜索内容标题 // 搜索内容标题
@ -213,6 +221,7 @@ export class CmsContentComponent implements OnInit {
// 分类搜索 // 分类搜索
this.searchCategoryId = ''; this.searchCategoryId = '';
} }
// 请求列表 // 请求列表
getRequest(reset: boolean = false) { getRequest(reset: boolean = false) {
this.showPatch = 0; this.showPatch = 0;
@ -237,12 +246,14 @@ export class CmsContentComponent implements OnInit {
} }
}); });
} }
// 搜索 // 搜索
getSearch() { getSearch() {
this.getRequest(); this.getRequest();
} }
// 查询分类树 // 查询分类树
findCategoryTree (roleType) { findCategoryTree(roleType) {
this.http.get(this.WEB_SERVE_URL + '/cmsCategory/getOwnCategoryTree?roleType=' + roleType).subscribe(data => { this.http.get(this.WEB_SERVE_URL + '/cmsCategory/getOwnCategoryTree?roleType=' + roleType).subscribe(data => {
if (data['return_code'] === '000000') { if (data['return_code'] === '000000') {
this.nodes = data['return_data']; this.nodes = data['return_data'];
@ -256,11 +267,13 @@ export class CmsContentComponent implements OnInit {
} }
}); });
} }
// 递归分类树 // 递归分类树
generateComment (data) { generateComment(data) {
for (const i in data) { for (const i in data) {
if (data[i].nodes == null) { if (data[i].nodes == null) {
const item = { /** 重新赋值 **/ const item = {
/** 重新赋值 **/
isLeaf: true, isLeaf: true,
title: data[i].text, title: data[i].text,
key: data[i].id, key: data[i].id,
@ -268,7 +281,8 @@ export class CmsContentComponent implements OnInit {
}; };
data[i] = item; data[i] = item;
} else { } else {
const item = { /** 重新赋值 **/ const item = {
/** 重新赋值 **/
isLeaf: false, isLeaf: false,
title: data[i].text, title: data[i].text,
key: data[i].id, key: data[i].id,
@ -281,6 +295,7 @@ export class CmsContentComponent implements OnInit {
this.nodes = data; this.nodes = data;
console.log(this.nodes); console.log(this.nodes);
} }
// 跳转添加 // 跳转添加
getAdd() { getAdd() {
this.router.navigate(['/admin/cms/cmscontentadd'], { this.router.navigate(['/admin/cms/cmscontentadd'], {
@ -289,6 +304,7 @@ export class CmsContentComponent implements OnInit {
} }
}); });
} }
// 跳转修改 // 跳转修改
getEdit(id) { getEdit(id) {
this.router.navigate(['/admin/cms/cmscontentedit'], { this.router.navigate(['/admin/cms/cmscontentedit'], {
@ -297,6 +313,7 @@ export class CmsContentComponent implements OnInit {
} }
}); });
} }
// 跳转详情 // 跳转详情
getContentView(id) { getContentView(id) {
this.router.navigate(['/admin/cms/cmscontentview'], { this.router.navigate(['/admin/cms/cmscontentview'], {
@ -305,6 +322,7 @@ export class CmsContentComponent implements OnInit {
} }
}); });
} }
// 对话框删除 // 对话框删除
showDeleteConfirmDelete(id): void { showDeleteConfirmDelete(id): void {
this.modalService.confirm({ this.modalService.confirm({
@ -314,16 +332,19 @@ export class CmsContentComponent implements OnInit {
nzCancelText: '否', nzCancelText: '否',
}); });
} }
// 删除内容 // 删除内容
deleteContent(id) { deleteContent(id) {
if (id === undefined) { if (id === undefined) {
return; return;
}if (id === null) { }
if (id === null) {
return; return;
}if (id === '') { }
if (id === '') {
return; return;
} }
this.http.get(this.WEB_SERVE_URL + '/cmsContent/delContent?id=' + id).subscribe( data => { this.http.get(this.WEB_SERVE_URL + '/cmsContent/delContent?id=' + id).subscribe(data => {
if (data['return_code'] === '000000') { if (data['return_code'] === '000000') {
this.message.create('success', `删除成功！`); this.message.create('success', `删除成功！`);
this.getRequest(); this.getRequest();
@ -332,10 +353,11 @@ export class CmsContentComponent implements OnInit {
} }
}); });
} }
// 查询附件列表 // 查询附件列表
findPatchByContent(id) { findPatchByContent(id) {
this.contentSelect = id; this.contentSelect = id;
this.http.get(this.WEB_SERVE_URL + '/cmsContent/getListPatches?pageNum=1&pageSize=100&contentId=' + id).subscribe( data => { this.http.get(this.WEB_SERVE_URL + '/cmsContent/getListPatches?pageNum=1&pageSize=100&contentId=' + id).subscribe(data => {
if (data['return_code'] === '000000') { if (data['return_code'] === '000000') {
this.showPatch = 1; this.showPatch = 1;
this.patchList = data['return_data'].list; this.patchList = data['return_data'].list;
@ -345,10 +367,12 @@ export class CmsContentComponent implements OnInit {
} }
}); });
} }
// 弹出添加附件 // 弹出添加附件
addPatch() { addPatch() {
this.isVisible = true; this.isVisible = true;
} }
// 删除附件确认 // 删除附件确认
showDeletePatch(id) { showDeletePatch(id) {
this.modalService.confirm({ this.modalService.confirm({
@ -358,12 +382,13 @@ export class CmsContentComponent implements OnInit {
nzCancelText: '否', nzCancelText: '否',
}); });
} }
// 删除附件 // 删除附件
deletePatch(id) { deletePatch(id) {
if (id === undefined || id === null || id === '') { if (id === undefined || id === null || id === '') {
return; return;
} }
this.http.get(this.WEB_SERVE_URL + '/cmsPatch/delPatch?id=' + id).subscribe( data => { this.http.get(this.WEB_SERVE_URL + '/cmsPatch/delPatch?id=' + id).subscribe(data => {
if (data['return_code'] === '000000') { if (data['return_code'] === '000000') {
this.message.create('success', `删除成功！`); this.message.create('success', `删除成功！`);
this.findPatchByContent(this.contentSelect); this.findPatchByContent(this.contentSelect);
@ -372,6 +397,7 @@ export class CmsContentComponent implements OnInit {
} }
}); });
} }
// 取消按钮 // 取消按钮
handleCancel(): void { handleCancel(): void {
this.isVisible = false; this.isVisible = false;
@ -379,6 +405,7 @@ export class CmsContentComponent implements OnInit {
this.fileList = []; this.fileList = [];
/** 隐藏弹框 **/ /** 隐藏弹框 **/
} }
// 附件类型选择 // 附件类型选择
getChange(event) { getChange(event) {
if (event != null) { if (event != null) {
@ -386,6 +413,7 @@ export class CmsContentComponent implements OnInit {
console.log(event); console.log(event);
} }
} }
// 附件上传设置 // 附件上传设置
customReq = (item: UploadXHRArgs) => { customReq = (item: UploadXHRArgs) => {
this.patchPath = ''; // 置空路径 this.patchPath = ''; // 置空路径
@ -418,6 +446,7 @@ export class CmsContentComponent implements OnInit {
} }
); );
} }
/** 清空 **/ /** 清空 **/
emptyForm(e: MouseEvent): void { emptyForm(e: MouseEvent): void {
e.preventDefault(); e.preventDefault();
@ -427,6 +456,7 @@ export class CmsContentComponent implements OnInit {
this.annexForm.controls[key].updateValueAndValidity(); this.annexForm.controls[key].updateValueAndValidity();
} }
} }
// 附件弹窗确定添加按钮 // 附件弹窗确定添加按钮
handlePatchOk(value: any): void { handlePatchOk(value: any): void {
// 校验类型选择与必填 // 校验类型选择与必填
@ -495,6 +525,7 @@ export class CmsContentComponent implements OnInit {
this.message.create('error', `未知错误！`); this.message.create('error', `未知错误！`);
}); });
} }
// 弹出发布附件 // 弹出发布附件
addPush(id, categoryId) { addPush(id, categoryId) {
this.findModuleByCategory(categoryId); this.findModuleByCategory(categoryId);
@ -502,6 +533,7 @@ export class CmsContentComponent implements OnInit {
// document.getElementById('resetPush').click(); // document.getElementById('resetPush').click();
this.isPublish = true; this.isPublish = true;
} }
// 取消发布 // 取消发布
handleCancelPush(): void { handleCancelPush(): void {
this.isPublish = false; this.isPublish = false;
@ -509,6 +541,7 @@ export class CmsContentComponent implements OnInit {
this.pushId = ''; this.pushId = '';
/** 隐藏弹框 **/ /** 隐藏弹框 **/
} }
// 附件弹窗确定添加按钮 // 附件弹窗确定添加按钮
handlePushOk(value: any): void { handlePushOk(value: any): void {
console.log('发布'); console.log('发布');
@ -545,6 +578,7 @@ export class CmsContentComponent implements OnInit {
this.message.create('error', `未知错误！`); this.message.create('error', `未知错误！`);
}); });
} }
/** 清空模板 **/ /** 清空模板 **/
emptyPushForm(e: MouseEvent): void { emptyPushForm(e: MouseEvent): void {
e.preventDefault(); e.preventDefault();
@ -554,6 +588,7 @@ export class CmsContentComponent implements OnInit {
this.pushForm.controls[key].updateValueAndValidity(); this.pushForm.controls[key].updateValueAndValidity();
} }
} }
// 根据内容分类查询可使用的模板列表 // 根据内容分类查询可使用的模板列表
findModuleByCategory(categoryId) { findModuleByCategory(categoryId) {
this.http.get(this.WEB_SERVE_URL + '/cmsCategoryModule/getModuleByCategoryId?categoryId=' + categoryId).subscribe(data => { this.http.get(this.WEB_SERVE_URL + '/cmsCategoryModule/getModuleByCategoryId?categoryId=' + categoryId).subscribe(data => {
@ -574,6 +609,7 @@ export class CmsContentComponent implements OnInit {
nzCancelText: '否', nzCancelText: '否',
}); });
} }
// 下线 // 下线
DownContent(id) { DownContent(id) {
// 定义附件数据 // 定义附件数据

177
src/app/admin/order/order-c-list/order-c-list.component.html
Unescape View File

@ -0,0 +1,177 @@
<!-- start 面包屑 -->
<app-breadcrumb></app-breadcrumb>
<!-- end 面包屑 -->
<!--条件搜索-->
<div class="inner-content">
<form nz-form [formGroup]="searchForm" (ngSubmit)="getRequest(true , searchForm.value)">
<div nz-row>
<!-- <div nz-col nzSpan="8">-->
<!-- <nz-form-item>-->
<!-- <nz-form-label [nzSpan]="6">区域名称</nz-form-label>-->
<!-- <nz-form-control [nzSpan]="16">-->
<!-- <nz-select nzShowSearch nzAllowClear [formControlName]="'companyId'" (ngModelChange)="getMerchantListByCompany($event)">-->
<!-- <nz-option *ngFor="let item of companyData" nzValue="{{item.id}}" nzLabel="{{item.name}}"></nz-option>-->
<!-- </nz-select>-->
<!-- </nz-form-control>-->
<!-- </nz-form-item>-->
<!-- </div>-->
<!-- <div nz-col nzSpan="8">-->
<!-- <nz-form-item>-->
<!-- <nz-form-label [nzSpan]="6">商户名称</nz-form-label>-->
<!-- <nz-form-control [nzSpan]="16">-->
<!-- <nz-select nzShowSearch nzAllowClear [formControlName]="'merchantId'">-->
<!-- <nz-option *ngFor="let item of merchantData" nzValue="{{item.id}}" nzLabel="{{item.merchantName}}"></nz-option>-->
<!-- </nz-select>-->
<!-- </nz-form-control>-->
<!-- </nz-form-item>-->
<!-- </div>-->
<div nz-col nzSpan="8">
<nz-form-item>
<nz-form-label [nzSpan]="6">订单号</nz-form-label>
<nz-form-control [nzSpan]="16">
<input nz-input formControlName="orderNo"/>
</nz-form-control>
</nz-form-item>
</div>
<div nz-col nzSpan="8">
<nz-form-item>
<nz-form-label [nzSpan]="6">订单流水号</nz-form-label>
<nz-form-control [nzSpan]="16">
<input nz-input formControlName="paySerialNo"/>
</nz-form-control>
</nz-form-item>
</div>
<div nz-col nzSpan="8">
<nz-form-item>
<nz-form-label [nzSpan]="6">支付模式</nz-form-label>
<nz-form-control [nzSpan]="16">
<nz-select nzShowSearch nzAllowClear formControlName="payModel" nzPlaceHolder="请选择支付模式">
<nz-option nzLabel="金币支付" nzValue="1"></nz-option>
<nz-option nzLabel="第三方支付" nzValue="2"></nz-option>
<nz-option nzLabel="混合支付" nzValue="3"></nz-option>
</nz-select>
</nz-form-control>
</nz-form-item>
</div>
<div nz-col nzSpan="8">
<nz-form-item>
<nz-form-label [nzSpan]="6">支付方式</nz-form-label>
<nz-form-control [nzSpan]="16">
<nz-select nzShowSearch nzAllowClear formControlName="payType" nzPlaceHolder="请选择支付模式">
<nz-option nzLabel="支付宝" nzValue="1"></nz-option>
<nz-option nzLabel="微信" nzValue="2"></nz-option>
<nz-option nzLabel="金币" nzValue="3"></nz-option>
</nz-select>
</nz-form-control>
</nz-form-item>
</div>
<div nz-col nzSpan="8">
<nz-form-item>
<nz-form-label [nzSpan]="6">状态</nz-form-label>
<nz-form-control [nzSpan]="16">
<nz-select nzShowSearch nzAllowClear nzPlaceHolder="请选择订单状态" formControlName="orderStatus">
<nz-option nzLabel="待支付" nzValue="1"></nz-option>
<nz-option nzLabel="已支付" nzValue="2"></nz-option>
<nz-option nzLabel="已完成" nzValue="3"></nz-option>
<nz-option nzLabel="已退款" nzValue="4"></nz-option>
<nz-option nzLabel="已取消" nzValue="5"></nz-option>
<nz-option nzLabel="退款中" nzValue="6"></nz-option>
<nz-option nzLabel="退款失败" nzValue="7"></nz-option>
</nz-select>
</nz-form-control>
</nz-form-item>
</div>
<div nz-col nzSpan="8">
<nz-form-item>
<nz-form-label [nzSpan]="6">时间区间</nz-form-label>
<nz-form-control [nzSpan]="16">
<nz-range-picker [nzShowTime]="{ nzFormat: 'HH:mm' }" formControlName="payTime"></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>
</div>
</div>
</form>
</div>
<div class="inner-content">
<span>共计 {{total}} 条数据</span>
<!-- <div class="operating-button">-->
<!-- <button nz-button nzType="primary" class="right-btn" (click)="downloadTemplate(searchForm.value)" ><i nz-icon nzType="download" nzTheme="outline"></i>导出订单</button>-->
<!-- </div>-->
<nz-table
class="table"
#ajaxTable
nzShowSizeChanger
[nzFrontPagination]="false"
[nzData]="requestData"
[nzLoading]="loading"
[nzTotal]="total"
[(nzPageIndex)]="pageNum"
[(nzPageSize)]="pageSize"
[nzScroll]="{ x: '1200px' }"
(nzPageIndexChange)="getRequest(false , searchForm.value)"
(nzPageSizeChange)="getRequest(false , searchForm.value)">
<thead nzSingleSort>
<tr>
<th nzWidth="50px">编号</th>
<th nzWidth="180px">商品名称</th>
<th nzWidth="180px">订单来源</th>
<th nzWidth="180px">订单类型</th>
<th nzWidth="180px">订单号</th>
<th nzWidth="180px">支付流水号</th>
<th nzWidth="120px">客户名称</th>
<th nzWidth="130px">客户电话</th>
<th nzWidth="110px">支付模式</th>
<th nzWidth="100px">支付方式</th>
<th nzWidth="100px">支付金额</th>
<th nzWidth="140px">生成时间</th>
<th nzWidth="140px">支付时间</th>
<th nzWidth="140px">取消时间</th>
<th nzRight nzWidth="100px">状态</th>
<!-- <th nzWidth="80px" nzRight>操作</th>-->
</tr>
</thead>
<tbody>
<tr *ngFor="let data of ajaxTable.data; let i = index">
<td>{{i+1}}</td>
<td>{{data.goodsName}}</td>
<td>{{data.giveawayType}}</td>
<td>{{data.goodsType}}</td>
<td>{{data.orderNo}}</td>
<td>{{data.paySerialNo}}</td>
<td>{{data.memName == null ? '暂无': data.memName}}</td>
<td>{{data.memPhone == null ? '暂无': data.memPhone}}</td>
<td>{{data.payModel}}</td>
<td>{{data.payType}}</td>
<td>{{data.payPrice}}</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.cancelTime | date: 'yyyy-MM-dd HH:mm:ss'}}</td>
<td nzRight>{{data.orderStatus}}</td>
<!-- <td nzRight class="table-td-operation">-->
<!-- &lt;!&ndash; <a *ngIf="data.status !== 101" (click)="getDetail(data.id)">订单详情</a>&ndash;&gt;-->
<!--&lt;!&ndash; <a *ngIf="data.orderStatusId == 2 && data.goodsTypeId == 3" (click)="showModal(data.orderId)">申请退款</a>&ndash;&gt;-->
<!-- </td>-->
</tbody>
</nz-table>
</div>
<nz-modal [(nzVisible)]="isVisible" nzTitle="退款理由" (nzOnCancel)="handleCancel()" (nzOnOk)="handleOk()">
<nz-form-item>
<nz-form-label>退款理由</nz-form-label>
<nz-form-control>
<textarea [(ngModel)]="refundContent" nz-input rows="2" placeholder="请输入退款理由"></textarea>
</nz-form-control>
</nz-form-item>
</nz-modal>

4
src/app/admin/order/order-c-list/order-c-list.component.scss
Unescape View File

@ -0,0 +1,4 @@
.head_img {
height: 60px;
width: 60px;
}

186
src/app/admin/order/order-c-list/order-c-list.component.ts
Unescape View File

@ -0,0 +1,186 @@
import { Component, OnInit } from '@angular/core';
import {environment} from '../../../../environments/environment';
import {FormBuilder, FormGroup} from '_@angular_forms@9.0.7@@angular/forms';
import {OrderService} from '../../../services/order.service';
import {IconService} from '../../../services/icon.service';
import {NzMessageService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
import {Router} from '_@angular_router@9.0.7@@angular/router';
import {CompanyService} from '../../../services/company.service';
import {MerchantService} from '../../../services/merchant.service';
import {CommonsService} from '../../../services/commons.service';
@Component({
selector: 'app-order-c-list',
templateUrl: './order-c-list.component.html',
styleUrls: ['./order-c-list.component.scss']
})
export class OrderCListComponent implements OnInit {
WEB_SERVE_URL = environment.baseUrl;
FILE_URL = environment.imageUrl;
searchForm: FormGroup; // 搜索框
requestData = []; // 列表数据
companyData = []; // 列表数据
merchantData = []; // 列表数据
total: number; // 页码
pageNum = 1; // 页码
pageSize = 10; // 条码
loading = true;
id: number; // 订单ID
isVisible = false;
refundContent: string;
constructor(
private form: FormBuilder,
private order: OrderService,
private iconService: IconService,
private message: NzMessageService,
private router: Router,
private company: CompanyService,
private merchant: MerchantService,
private common: CommonsService
) {
}
ngOnInit(): void {
this.init();
const whereObject = {};
whereObject['pageNum'] = 1;
whereObject['pageSize'] = 10000;
this.company.selectCompanyList(whereObject, data => {
if (data['return_code'] === '000000') {
this.companyData = data['return_data'].list;
} else {
this.message.error(data['return_msg']);
}
});
this.getMerchantListByCompany(this.searchForm.value.companyId);
}
public init(): void {
this.searchForm = this.form.group({
companyId: [null],
merchantId: [null],
orderNo: [null],
paySerialNo: [null],
payModel: [null],
payType: [null],
orderStatus: [null],
payTime: [null]
});
this.getRequest(true, this.searchForm.value);
}
// 查询列表
public getRequest(reset: boolean = false, whereObject: object) {
if (whereObject['payTime'] != null && whereObject['payTime'].length !== 0) {
whereObject['payTimeS'] = whereObject['payTime'][0].getTime();
whereObject['payTimeE'] = whereObject['payTime'][1].getTime();
}
this.loading = false;
if (reset) {
this.pageNum = 1;
}
whereObject['pageNum'] = this.pageNum;
whereObject['pageSize'] = this.pageSize;
this.order.getKfcOrderList(whereObject, data => {
if (data['return_code'] === '000000') {
this.requestData = data['return_data'].list;
this.total = data['return_data'].total;
} else {
this.message.error(data['return_msg']);
}
});
}
// 查询商户
public getMerchantListByCompany(companyId: number): void {
this.merchant.getMerchantListByCompany(companyId, data => {
if (data['return_code'] === '000000') {
if (data['return_code'] === '000000') {
this.merchantData = data['return_data'];
} else {
this.message.error(data['return_msg']);
}
} else {
this.message.error(data['return_msg']);
}
});
}
// 重置
public resetForm(): void {
this.searchForm.reset();
}
// 查看详情
public getDetail(id: number): void {
this.router.navigate(['/admin/order/order-detail'], {
queryParams: {
merchantId: id
}
}).then(r => console.log(r));
}
// 下载模板
downloadTemplate(whereObject) {
if (whereObject['payTime'] != null && whereObject['payTime'].length !== 0) {
whereObject['payTimeS'] = whereObject['payTime'][0].getTime();
whereObject['payTimeE'] = whereObject['payTime'][1].getTime();
}
this.order.exportGoodsOrderList(whereObject, data => {
if (data['return_code'] === '000000') {
window.location.href = this.FILE_URL + data['return_data'];
} else {
this.message.error(data['return_msg']);
}
});
}
provinceChange(e) {
console.log(e);
}
// 退款
public orderToRefund(id): void {
}
showModal(id): void {
console.log(id);
this.id = id;
this.isVisible = true;
}
handleOk(): void {
if (this.refundContent == null || this.refundContent.length === 0) {
this.message.error('请输入退款原因');
return;
}
this.common.showConfirm('确认订单是否退款', item => {
if (item) {
const params = {
orderId: this.id ,
refundContent: this.refundContent
};
this.order.refuelingOrderRefund(params, data => {
if (data['return_code'] === '000000') {
this.getRequest(false, this.searchForm.value);
this.isVisible = false;
this.message.success('申请退款中');
} else {
this.message.error(data['return_msg']);
}
});
}
});
}
handleCancel(): void {
this.isVisible = false;
}
}

177
src/app/admin/order/order-k-list/order-k-list.component.html
Unescape View File

@ -0,0 +1,177 @@
<!-- start 面包屑 -->
<app-breadcrumb></app-breadcrumb>
<!-- end 面包屑 -->
<!--条件搜索-->
<div class="inner-content">
<form nz-form [formGroup]="searchForm" (ngSubmit)="getRequest(true , searchForm.value)">
<div nz-row>
<!-- <div nz-col nzSpan="8">-->
<!-- <nz-form-item>-->
<!-- <nz-form-label [nzSpan]="6">区域名称</nz-form-label>-->
<!-- <nz-form-control [nzSpan]="16">-->
<!-- <nz-select nzShowSearch nzAllowClear [formControlName]="'companyId'" (ngModelChange)="getMerchantListByCompany($event)">-->
<!-- <nz-option *ngFor="let item of companyData" nzValue="{{item.id}}" nzLabel="{{item.name}}"></nz-option>-->
<!-- </nz-select>-->
<!-- </nz-form-control>-->
<!-- </nz-form-item>-->
<!-- </div>-->
<!-- <div nz-col nzSpan="8">-->
<!-- <nz-form-item>-->
<!-- <nz-form-label [nzSpan]="6">商户名称</nz-form-label>-->
<!-- <nz-form-control [nzSpan]="16">-->
<!-- <nz-select nzShowSearch nzAllowClear [formControlName]="'merchantId'">-->
<!-- <nz-option *ngFor="let item of merchantData" nzValue="{{item.id}}" nzLabel="{{item.merchantName}}"></nz-option>-->
<!-- </nz-select>-->
<!-- </nz-form-control>-->
<!-- </nz-form-item>-->
<!-- </div>-->
<div nz-col nzSpan="8">
<nz-form-item>
<nz-form-label [nzSpan]="6">订单号</nz-form-label>
<nz-form-control [nzSpan]="16">
<input nz-input formControlName="orderNo"/>
</nz-form-control>
</nz-form-item>
</div>
<div nz-col nzSpan="8">
<nz-form-item>
<nz-form-label [nzSpan]="6">订单流水号</nz-form-label>
<nz-form-control [nzSpan]="16">
<input nz-input formControlName="paySerialNo"/>
</nz-form-control>
</nz-form-item>
</div>
<div nz-col nzSpan="8">
<nz-form-item>
<nz-form-label [nzSpan]="6">支付模式</nz-form-label>
<nz-form-control [nzSpan]="16">
<nz-select nzShowSearch nzAllowClear formControlName="payModel" nzPlaceHolder="请选择支付模式">
<nz-option nzLabel="金币支付" nzValue="1"></nz-option>
<nz-option nzLabel="第三方支付" nzValue="2"></nz-option>
<nz-option nzLabel="混合支付" nzValue="3"></nz-option>
</nz-select>
</nz-form-control>
</nz-form-item>
</div>
<div nz-col nzSpan="8">
<nz-form-item>
<nz-form-label [nzSpan]="6">支付方式</nz-form-label>
<nz-form-control [nzSpan]="16">
<nz-select nzShowSearch nzAllowClear formControlName="payType" nzPlaceHolder="请选择支付模式">
<nz-option nzLabel="支付宝" nzValue="1"></nz-option>
<nz-option nzLabel="微信" nzValue="2"></nz-option>
<nz-option nzLabel="金币" nzValue="3"></nz-option>
</nz-select>
</nz-form-control>
</nz-form-item>
</div>
<div nz-col nzSpan="8">
<nz-form-item>
<nz-form-label [nzSpan]="6">状态</nz-form-label>
<nz-form-control [nzSpan]="16">
<nz-select nzShowSearch nzAllowClear nzPlaceHolder="请选择订单状态" formControlName="orderStatus">
<nz-option nzLabel="待支付" nzValue="1"></nz-option>
<nz-option nzLabel="已支付" nzValue="2"></nz-option>
<nz-option nzLabel="已完成" nzValue="3"></nz-option>
<nz-option nzLabel="已退款" nzValue="4"></nz-option>
<nz-option nzLabel="已取消" nzValue="5"></nz-option>
<nz-option nzLabel="退款中" nzValue="6"></nz-option>
<nz-option nzLabel="退款失败" nzValue="7"></nz-option>
</nz-select>
</nz-form-control>
</nz-form-item>
</div>
<div nz-col nzSpan="8">
<nz-form-item>
<nz-form-label [nzSpan]="6">时间区间</nz-form-label>
<nz-form-control [nzSpan]="16">
<nz-range-picker [nzShowTime]="{ nzFormat: 'HH:mm' }" formControlName="payTime"></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>
</div>
</div>
</form>
</div>
<div class="inner-content">
<span>共计 {{total}} 条数据</span>
<!-- <div class="operating-button">-->
<!-- <button nz-button nzType="primary" class="right-btn" (click)="downloadTemplate(searchForm.value)" ><i nz-icon nzType="download" nzTheme="outline"></i>导出订单</button>-->
<!-- </div>-->
<nz-table
class="table"
#ajaxTable
nzShowSizeChanger
[nzFrontPagination]="false"
[nzData]="requestData"
[nzLoading]="loading"
[nzTotal]="total"
[(nzPageIndex)]="pageNum"
[(nzPageSize)]="pageSize"
[nzScroll]="{ x: '1200px' }"
(nzPageIndexChange)="getRequest(false , searchForm.value)"
(nzPageSizeChange)="getRequest(false , searchForm.value)">
<thead nzSingleSort>
<tr>
<th nzWidth="50px">编号</th>
<th nzWidth="180px">商品名称</th>
<th nzWidth="180px">订单来源</th>
<th nzWidth="180px">订单类型</th>
<th nzWidth="180px">订单号</th>
<th nzWidth="180px">支付流水号</th>
<th nzWidth="120px">客户名称</th>
<th nzWidth="130px">客户电话</th>
<th nzWidth="110px">支付模式</th>
<th nzWidth="100px">支付方式</th>
<th nzWidth="100px">支付金额</th>
<th nzWidth="140px">生成时间</th>
<th nzWidth="140px">支付时间</th>
<th nzWidth="140px">取消时间</th>
<th nzRight nzWidth="100px">状态</th>
<!-- <th nzWidth="80px" nzRight>操作</th>-->
</tr>
</thead>
<tbody>
<tr *ngFor="let data of ajaxTable.data; let i = index">
<td>{{i+1}}</td>
<td>{{data.goodsName}}</td>
<td>{{data.giveawayType}}</td>
<td>{{data.goodsType}}</td>
<td>{{data.orderNo}}</td>
<td>{{data.paySerialNo}}</td>
<td>{{data.memName == null ? '暂无': data.memName}}</td>
<td>{{data.memPhone == null ? '暂无': data.memPhone}}</td>
<td>{{data.payModel}}</td>
<td>{{data.payType}}</td>
<td>{{data.payPrice}}</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.cancelTime | date: 'yyyy-MM-dd HH:mm:ss'}}</td>
<td nzRight>{{data.orderStatus}}</td>
<!-- <td nzRight class="table-td-operation">-->
<!-- &lt;!&ndash; <a *ngIf="data.status !== 101" (click)="getDetail(data.id)">订单详情</a>&ndash;&gt;-->
<!--&lt;!&ndash; <a *ngIf="data.orderStatusId == 2 && data.goodsTypeId == 3" (click)="showModal(data.orderId)">申请退款</a>&ndash;&gt;-->
<!-- </td>-->
</tbody>
</nz-table>
</div>
<nz-modal [(nzVisible)]="isVisible" nzTitle="退款理由" (nzOnCancel)="handleCancel()" (nzOnOk)="handleOk()">
<nz-form-item>
<nz-form-label>退款理由</nz-form-label>
<nz-form-control>
<textarea [(ngModel)]="refundContent" nz-input rows="2" placeholder="请输入退款理由"></textarea>
</nz-form-control>
</nz-form-item>
</nz-modal>

4
src/app/admin/order/order-k-list/order-k-list.component.scss
Unescape View File

@ -0,0 +1,4 @@
.head_img {
height: 60px;
width: 60px;
}

186
src/app/admin/order/order-k-list/order-k-list.component.ts
Unescape View File

@ -0,0 +1,186 @@
import { Component, OnInit } from '@angular/core';
import {environment} from '../../../../environments/environment';
import {FormBuilder, FormGroup} from '_@angular_forms@9.0.7@@angular/forms';
import {OrderService} from '../../../services/order.service';
import {IconService} from '../../../services/icon.service';
import {NzMessageService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
import {Router} from '_@angular_router@9.0.7@@angular/router';
import {CompanyService} from '../../../services/company.service';
import {MerchantService} from '../../../services/merchant.service';
import {CommonsService} from '../../../services/commons.service';
@Component({
selector: 'app-order-k-list',
templateUrl: './order-k-list.component.html',
styleUrls: ['./order-k-list.component.scss']
})
export class OrderKListComponent implements OnInit {
WEB_SERVE_URL = environment.baseUrl;
FILE_URL = environment.imageUrl;
searchForm: FormGroup; // 搜索框
requestData = []; // 列表数据
companyData = []; // 列表数据
merchantData = []; // 列表数据
total: number; // 页码
pageNum = 1; // 页码
pageSize = 10; // 条码
loading = true;
id: number; // 订单ID
isVisible = false;
refundContent: string;
constructor(
private form: FormBuilder,
private order: OrderService,
private iconService: IconService,
private message: NzMessageService,
private router: Router,
private company: CompanyService,
private merchant: MerchantService,
private common: CommonsService
) {
}
ngOnInit(): void {
this.init();
const whereObject = {};
whereObject['pageNum'] = 1;
whereObject['pageSize'] = 10000;
this.company.selectCompanyList(whereObject, data => {
if (data['return_code'] === '000000') {
this.companyData = data['return_data'].list;
} else {
this.message.error(data['return_msg']);
}
});
this.getMerchantListByCompany(this.searchForm.value.companyId);
}
public init(): void {
this.searchForm = this.form.group({
companyId: [null],
merchantId: [null],
orderNo: [null],
paySerialNo: [null],
payModel: [null],
payType: [null],
orderStatus: [null],
payTime: [null]
});
this.getRequest(true, this.searchForm.value);
}
// 查询列表
public getRequest(reset: boolean = false, whereObject: object) {
if (whereObject['payTime'] != null && whereObject['payTime'].length !== 0) {
whereObject['payTimeS'] = whereObject['payTime'][0].getTime();
whereObject['payTimeE'] = whereObject['payTime'][1].getTime();
}
this.loading = false;
if (reset) {
this.pageNum = 1;
}
whereObject['pageNum'] = this.pageNum;
whereObject['pageSize'] = this.pageSize;
this.order.getCinemaOrderList(whereObject, data => {
if (data['return_code'] === '000000') {
this.requestData = data['return_data'].list;
this.total = data['return_data'].total;
} else {
this.message.error(data['return_msg']);
}
});
}
// 查询商户
public getMerchantListByCompany(companyId: number): void {
this.merchant.getMerchantListByCompany(companyId, data => {
if (data['return_code'] === '000000') {
if (data['return_code'] === '000000') {
this.merchantData = data['return_data'];
} else {
this.message.error(data['return_msg']);
}
} else {
this.message.error(data['return_msg']);
}
});
}
// 重置
public resetForm(): void {
this.searchForm.reset();
}
// 查看详情
public getDetail(id: number): void {
this.router.navigate(['/admin/order/order-detail'], {
queryParams: {
merchantId: id
}
}).then(r => console.log(r));
}
// 下载模板
downloadTemplate(whereObject) {
if (whereObject['payTime'] != null && whereObject['payTime'].length !== 0) {
whereObject['payTimeS'] = whereObject['payTime'][0].getTime();
whereObject['payTimeE'] = whereObject['payTime'][1].getTime();
}
this.order.exportGoodsOrderList(whereObject, data => {
if (data['return_code'] === '000000') {
window.location.href = this.FILE_URL + data['return_data'];
} else {
this.message.error(data['return_msg']);
}
});
}
provinceChange(e) {
console.log(e);
}
// 退款
public orderToRefund(id): void {
}
showModal(id): void {
console.log(id);
this.id = id;
this.isVisible = true;
}
handleOk(): void {
if (this.refundContent == null || this.refundContent.length === 0) {
this.message.error('请输入退款原因');
return;
}
this.common.showConfirm('确认订单是否退款', item => {
if (item) {
const params = {
orderId: this.id ,
refundContent: this.refundContent
};
this.order.refuelingOrderRefund(params, data => {
if (data['return_code'] === '000000') {
this.getRequest(false, this.searchForm.value);
this.isVisible = false;
this.message.success('申请退款中');
} else {
this.message.error(data['return_msg']);
}
});
}
});
}
handleCancel(): void {
this.isVisible = false;
}
}

4
src/app/admin/order/order-routing.module.ts
Unescape View File

@ -5,6 +5,8 @@ import {OrderDetailComponent} from './order-detail/order-detail.component';
import {OrderCouponsComponent} from './order-coupons/order-coupons.component'; import {OrderCouponsComponent} from './order-coupons/order-coupons.component';
import {OrderCouponComponent} from './order-coupon/order-coupon.component'; import {OrderCouponComponent} from './order-coupon/order-coupon.component';
import {OrderTListComponent} from './order-Tlist/order-Tlist.component'; import {OrderTListComponent} from './order-Tlist/order-Tlist.component';
import {OrderCListComponent} from './order-c-list/order-c-list.component';
import {OrderKListComponent} from './order-k-list/order-k-list.component';
const routes: Routes = [ const routes: Routes = [
@ -13,6 +15,8 @@ const routes: Routes = [
{ path: 'order-detail', component: OrderDetailComponent }, { path: 'order-detail', component: OrderDetailComponent },
{ path: 'order-coupons', component: OrderCouponsComponent }, { path: 'order-coupons', component: OrderCouponsComponent },
{ path: 'order-coupon', component: OrderCouponComponent }, { path: 'order-coupon', component: OrderCouponComponent },
{ path: 'order-c-list', component: OrderCListComponent },
{ path: 'order-k-list', component: OrderKListComponent },
]; ];
@NgModule({ @NgModule({

4
src/app/admin/order/order.module.ts
Unescape View File

@ -13,10 +13,12 @@ import { OrderDetailComponent } from './order-detail/order-detail.component';
import { OrderCouponsComponent } from './order-coupons/order-coupons.component'; import { OrderCouponsComponent } from './order-coupons/order-coupons.component';
import { OrderCouponComponent } from './order-coupon/order-coupon.component'; import { OrderCouponComponent } from './order-coupon/order-coupon.component';
import {OrderTListComponent} from './order-Tlist/order-Tlist.component'; import {OrderTListComponent} from './order-Tlist/order-Tlist.component';
import { OrderKListComponent } from './order-k-list/order-k-list.component';
import {OrderCListComponent} from './order-c-list/order-c-list.component';
@NgModule({ @NgModule({
declarations: [OrderListComponent, OrderDetailComponent, OrderCouponsComponent, OrderCouponComponent , OrderTListComponent], declarations: [OrderListComponent, OrderDetailComponent, OrderCouponsComponent, OrderCouponComponent , OrderTListComponent, OrderKListComponent , OrderCListComponent],
imports: [ imports: [
CommonModule, CommonModule,
OrderRoutingModule, OrderRoutingModule,

28
src/app/admin/recharge-order/price-list/price-list.component.html
Unescape View File

@ -37,8 +37,8 @@
<div class="inner-content"> <div class="inner-content">
<span>共计 {{total}} 条数据</span> <span>共计 {{total}} 条数据</span>
<div class="operating-button"> <div class="operating-button">
<button nz-button nzType="primary" class="right-btn" (click)="getEdit()"><i nz-icon nzType="plus" nzTheme="outline"></i>添加 <button nz-button nzType="primary" class="right-btn" (click)="getMemberGoods()">获取关联商品</button>
</button> <button nz-button nzType="primary" class="right-btn" (click)="getEdit()"><i nz-icon nzType="plus" nzTheme="outline"></i>添加</button>
</div> </div>
<nz-table <nz-table
class="table" class="table"
@ -104,3 +104,27 @@
</form> </form>
</nz-modal> </nz-modal>
<nz-modal [(nzVisible)]="isVisibleGoods" nzWidth="900" nzTitle="渠道商获取关联商品" (nzOnCancel)="handleCancelGoods()" (nzOnOk)="handleCancelGoods()">
<nz-table #basicTable [nzData]="goodsArray">
<thead>
<tr>
<th>商品ID</th>
<th>渠道商标识符</th>
<th>折扣比例</th>
<th>商品名称</th>
<th>渠道商名称</th>
<th>状态</th>
</tr>
</thead>
<tbody>
<tr *ngFor="let data of basicTable.data">
<td>{{data.goodsId}}</td>
<td>{{data.channelMark | channelMark}}</td>
<td>{{data.discountRatio}}%</td>
<td>{{data.goodsName}}</td>
<td>{{data.memberName}}</td>
<td>{{data.state == 1 ? '上架' : '下架'}}</td>
</tr>
</tbody>
</nz-table>
</nz-modal>

15
src/app/admin/recharge-order/price-list/price-list.component.ts
Unescape View File

@ -27,6 +27,10 @@ export class PriceListComponent implements OnInit {
isVisible = false; isVisible = false;
id: number; id: number;
edit = false; edit = false;
isVisibleGoods = false;
goodsArray;
constructor( constructor(
private form: FormBuilder, private form: FormBuilder,
private recharge: RechargeService, private recharge: RechargeService,
@ -92,6 +96,7 @@ export class PriceListComponent implements OnInit {
} else { } else {
this.validateForm.reset(); this.validateForm.reset();
this.isVisible = true; this.isVisible = true;
this.edit = false;
} }
} }
@ -144,6 +149,9 @@ export class PriceListComponent implements OnInit {
this.isVisible = false; this.isVisible = false;
} }
handleCancelGoods(): void {
this.isVisibleGoods = false;
}
public getForbiddenUser(id): void { public getForbiddenUser(id): void {
this.common.showConfirm('是否删除', item => { this.common.showConfirm('是否删除', item => {
@ -160,4 +168,11 @@ export class PriceListComponent implements OnInit {
}); });
} }
public getMemberGoods(): void {
this.isVisibleGoods = true;
this.recharge.getMemberGoods(data => {
this.goodsArray = data['return_data']['data'];
});
}
} }

7
src/app/app-common.module.ts
Unescape View File

@ -25,7 +25,8 @@ import {
DisplayAreaPipe, DisplayAreaPipe,
DiscountCodeStatusPipe, DiscountCodeStatusPipe,
RechargePricePipe, RechargePricePipe,
RechargeStatusPipe RechargeStatusPipe,
ChannelMarkPipe
} from './pipes'; } from './pipes';
@ -45,7 +46,8 @@ const PIPES = [
DisplayAreaPipe, DisplayAreaPipe,
DiscountCodeStatusPipe, DiscountCodeStatusPipe,
RechargePricePipe, RechargePricePipe,
RechargeStatusPipe RechargeStatusPipe,
ChannelMarkPipe
]; ];
@ -59,6 +61,7 @@ const PIPES = [
], ],
declarations: [ declarations: [
...PIPES, ...PIPES,
ChannelMarkPipe,
], ],
exports: [ exports: [

23
src/app/pipes/channel-mark.pipe.ts
Unescape View File

@ -0,0 +1,23 @@
import { Pipe, PipeTransform } from '@angular/core';
@Pipe({
name: 'channelMark'
})
export class ChannelMarkPipe implements PipeTransform {
transform(value: number): string {
switch (value) {
case 1:
return '中石油';
case 2:
return '中石化';
case 3:
return '移动';
case 4:
return '联通';
case 5:
return '电信';
}
}
}

1
src/app/pipes/index.ts
Unescape View File

@ -14,3 +14,4 @@ export * from './display-area.pipe';
export * from './discount-code-status.pipe'; export * from './discount-code-status.pipe';
export * from './recharge-price.pipe'; export * from './recharge-price.pipe';
export * from './recharge-status.pipe'; export * from './recharge-status.pipe';
export * from './channel-mark.pipe';

24
src/app/services/order.service.ts
Unescape View File

@ -37,6 +37,30 @@ export class OrderService {
}); });
} }
/**
* 查询KFC订单列表
*
* @param paramsObject 对象
* @param callBack 回调
*/
public getKfcOrderList(paramsObject: object, callBack) {
this.http.get(environment.baseUrl + 'highOrder/getKfcOrderList?' + this.common.getWhereCondition(paramsObject)).subscribe(data => {
callBack(data);
});
}
/**
* 查询dianying订单列表
*
* @param paramsObject 对象
* @param callBack 回调
*/
public getCinemaOrderList(paramsObject: object, callBack) {
this.http.get(environment.baseUrl + 'highOrder/getCinemaOrderList?' + this.common.getWhereCondition(paramsObject)).subscribe(data => {
callBack(data);
});
}
/** /**
* 查询订单列表 * 查询订单列表
* *

10
src/app/services/recharge.service.ts
Unescape View File

@ -196,6 +196,16 @@ export class RechargeService {
}); });
} }
/**
* 获取渠道商获取关联商品
*
* @param callBack 回调
*/
public getMemberGoods(callBack) {
this.http.get(environment.baseUrl + 'telApi/getMemberGoods').subscribe(data => {
callBack(data);
});
}
} }

8
src/environments/environment.ts
Unescape View File

@ -4,10 +4,10 @@
export const environment = { export const environment = {
production: false, production: false,
// baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址) baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址)
// imageUrl: 'http://localhost:9302/filesystem/', imageUrl: 'http://localhost:9302/filesystem/',
baseUrl: 'https://hsgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址) // baseUrl: 'https://hsgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
imageUrl: 'https://hsgcs.dctpay.com/filesystem/', // imageUrl: 'https://hsgcs.dctpay.com/filesystem/',
key: 'https://hsgcs.dctpay.com/phone-recharge-H5/index.html?codeValue=', key: 'https://hsgcs.dctpay.com/phone-recharge-H5/index.html?codeValue=',
}; };

Write Preview
Loading…
Cancel
Save