diff --git a/angular.json b/angular.json
index 0a5bfcf..cc4e66b 100644
--- a/angular.json
+++ b/angular.json
@@ -97,6 +97,34 @@
"maximumError": "10kb"
}
]
+ },
+ "cz": {
+ "fileReplacements": [
+ {
+ "replace": "src/environments/environment.ts",
+ "with": "src/environments/environment.cz.ts"
+ }
+ ],
+ "optimization": true,
+ "outputHashing": "all",
+ "sourceMap": false,
+ "extractCss": true,
+ "namedChunks": false,
+ "extractLicenses": true,
+ "vendorChunk": false,
+ "buildOptimizer": true,
+ "budgets": [
+ {
+ "type": "initial",
+ "maximumWarning": "4mb",
+ "maximumError": "5mb"
+ },
+ {
+ "type": "anyComponentStyle",
+ "maximumWarning": "6kb",
+ "maximumError": "10kb"
+ }
+ ]
}
}
},
@@ -108,9 +136,6 @@
"configurations": {
"production": {
"browserTarget": "high-web:build:production"
- },
- "test": {
- "browserTarget": "high-web:build:production"
}
}
},
diff --git a/src/app/admin/order/order-c-list/order-c-list.component.html b/src/app/admin/order/order-c-list/order-c-list.component.html
new file mode 100644
index 0000000..c0bb131
--- /dev/null
+++ b/src/app/admin/order/order-c-list/order-c-list.component.html
@@ -0,0 +1,177 @@
+
+
+
+
+
+
+
+
+
+ 共计 {{total}} 条数据
+
+
+
+
+
+
+ | 编号 |
+ 商品名称 |
+ 订单来源 |
+ 订单类型 |
+ 订单号 |
+ 支付流水号 |
+ 客户名称 |
+ 客户电话 |
+ 支付模式 |
+ 支付方式 |
+ 支付金额 |
+ 生成时间 |
+ 支付时间 |
+ 取消时间 |
+ 状态 |
+
+
+
+
+
+ | {{i+1}} |
+ {{data.goodsName}} |
+ {{data.giveawayType}} |
+ {{data.goodsType}} |
+ {{data.orderNo}} |
+ {{data.paySerialNo}} |
+ {{data.memName == null ? '暂无': data.memName}} |
+ {{data.memPhone == null ? '暂无': data.memPhone}} |
+ {{data.payModel}} |
+ {{data.payType}} |
+ {{data.payPrice}} |
+ {{data.createTime | date: 'yyyy-MM-dd HH:mm:ss'}} |
+ {{data.payTime | date: 'yyyy-MM-dd HH:mm:ss'}} |
+ {{data.cancelTime | date: 'yyyy-MM-dd HH:mm:ss'}} |
+ {{data.orderStatus}} |
+
+
+
+
+
+
+
+
+
+
+
+ 退款理由
+
+
+
+
+
+
diff --git a/src/app/admin/order/order-c-list/order-c-list.component.scss b/src/app/admin/order/order-c-list/order-c-list.component.scss
new file mode 100644
index 0000000..8bee3fb
--- /dev/null
+++ b/src/app/admin/order/order-c-list/order-c-list.component.scss
@@ -0,0 +1,4 @@
+.head_img {
+ height: 60px;
+ width: 60px;
+}
diff --git a/src/app/admin/order/order-c-list/order-c-list.component.ts b/src/app/admin/order/order-c-list/order-c-list.component.ts
new file mode 100644
index 0000000..aab9e26
--- /dev/null
+++ b/src/app/admin/order/order-c-list/order-c-list.component.ts
@@ -0,0 +1,187 @@
+import { Component, OnInit } from '@angular/core';
+import {environment} from '../../../../environments/environment';
+import {OrderService} from '../../../services/order.service';
+import {IconService} from '../../../services/icon.service';
+
+import {CompanyService} from '../../../services/company.service';
+import {MerchantService} from '../../../services/merchant.service';
+import {CommonsService} from '../../../services/commons.service';
+import {FormBuilder, FormGroup} from '@angular/forms';
+import {NzMessageService} from 'ng-zorro-antd';
+import {Router} from '@angular/router';
+
+@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;
+ }
+
+}
diff --git a/src/app/admin/order/order-k-list/order-k-list.component.html b/src/app/admin/order/order-k-list/order-k-list.component.html
new file mode 100644
index 0000000..1f9d1b3
--- /dev/null
+++ b/src/app/admin/order/order-k-list/order-k-list.component.html
@@ -0,0 +1,177 @@
+
+
+
+
+
+
+
+
+
+ 共计 {{total}} 条数据
+
+
+
+
+
+
+ | 编号 |
+ 商品名称 |
+ 订单来源 |
+ 订单类型 |
+ 订单号 |
+ 支付流水号 |
+ 客户名称 |
+ 客户电话 |
+ 支付模式 |
+ 支付方式 |
+ 支付金额 |
+ 生成时间 |
+ 支付时间 |
+ 取消时间 |
+ 状态 |
+
+
+
+
+
+ | {{i+1}} |
+ {{data.goodsName}} |
+ {{data.giveawayType}} |
+ {{data.goodsType}} |
+ {{data.orderNo}} |
+ {{data.paySerialNo}} |
+ {{data.memName == null ? '暂无': data.memName}} |
+ {{data.memPhone == null ? '暂无': data.memPhone}} |
+ {{data.payModel}} |
+ {{data.payType}} |
+ {{data.payPrice}} |
+ {{data.createTime | date: 'yyyy-MM-dd HH:mm:ss'}} |
+ {{data.payTime | date: 'yyyy-MM-dd HH:mm:ss'}} |
+ {{data.cancelTime | date: 'yyyy-MM-dd HH:mm:ss'}} |
+ {{data.orderStatus}} |
+
+
+
+
+
+
+
+
+
+
+
+ 退款理由
+
+
+
+
+
+
diff --git a/src/app/admin/order/order-k-list/order-k-list.component.scss b/src/app/admin/order/order-k-list/order-k-list.component.scss
new file mode 100644
index 0000000..8bee3fb
--- /dev/null
+++ b/src/app/admin/order/order-k-list/order-k-list.component.scss
@@ -0,0 +1,4 @@
+.head_img {
+ height: 60px;
+ width: 60px;
+}
diff --git a/src/app/admin/order/order-k-list/order-k-list.component.ts b/src/app/admin/order/order-k-list/order-k-list.component.ts
new file mode 100644
index 0000000..eeb0cd3
--- /dev/null
+++ b/src/app/admin/order/order-k-list/order-k-list.component.ts
@@ -0,0 +1,186 @@
+import { Component, OnInit } from '@angular/core';
+import {environment} from '../../../../environments/environment';
+import {OrderService} from '../../../services/order.service';
+import {IconService} from '../../../services/icon.service';
+import {CompanyService} from '../../../services/company.service';
+import {MerchantService} from '../../../services/merchant.service';
+import {CommonsService} from '../../../services/commons.service';
+import {FormBuilder, FormGroup} from '@angular/forms';
+import {NzMessageService} from 'ng-zorro-antd';
+import {Router} from '@angular/router';
+
+@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;
+ }
+
+}
diff --git a/src/app/admin/order/order-routing.module.ts b/src/app/admin/order/order-routing.module.ts
index a6cebcb..ad3e432 100644
--- a/src/app/admin/order/order-routing.module.ts
+++ b/src/app/admin/order/order-routing.module.ts
@@ -5,6 +5,8 @@ import {OrderDetailComponent} from './order-detail/order-detail.component';
import {OrderCouponsComponent} from './order-coupons/order-coupons.component';
import {OrderCouponComponent} from './order-coupon/order-coupon.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 = [
@@ -13,6 +15,8 @@ const routes: Routes = [
{ path: 'order-detail', component: OrderDetailComponent },
{ path: 'order-coupons', component: OrderCouponsComponent },
{ path: 'order-coupon', component: OrderCouponComponent },
+ { path: 'order-c-list', component: OrderCListComponent },
+ { path: 'order-k-list', component: OrderKListComponent },
];
@NgModule({
diff --git a/src/app/admin/order/order.module.ts b/src/app/admin/order/order.module.ts
index 706b9fe..c8e15f0 100644
--- a/src/app/admin/order/order.module.ts
+++ b/src/app/admin/order/order.module.ts
@@ -13,10 +13,12 @@ import { OrderDetailComponent } from './order-detail/order-detail.component';
import { OrderCouponsComponent } from './order-coupons/order-coupons.component';
import { OrderCouponComponent } from './order-coupon/order-coupon.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({
- declarations: [OrderListComponent, OrderDetailComponent, OrderCouponsComponent, OrderCouponComponent , OrderTListComponent],
+ declarations: [OrderListComponent, OrderDetailComponent, OrderCouponsComponent, OrderCouponComponent , OrderTListComponent, OrderKListComponent , OrderCListComponent],
imports: [
CommonModule,
OrderRoutingModule,
diff --git a/src/app/admin/recharge-order/price-list/price-list.component.html b/src/app/admin/recharge-order/price-list/price-list.component.html
index f3f5ba6..ae70d10 100644
--- a/src/app/admin/recharge-order/price-list/price-list.component.html
+++ b/src/app/admin/recharge-order/price-list/price-list.component.html
@@ -37,8 +37,8 @@
共计 {{total}} 条数据
-
+
+
编号 |
金额类型 |
+ 供货商编号 |
+ 商品ID |
充值金额 |
支付金额 |
创建时间 |
@@ -66,6 +68,8 @@
| {{i + 1}} |
{{data.type | rechargePrice}} |
+ {{data.channel}} |
+ {{data.goodsId}} |
{{data.price}} |
{{data.realPrice}} |
{{data.createTime | date: 'yyyy-MM-dd HH:mm'}} |
@@ -89,18 +93,68 @@
+
+ 供货商编号
+
+
+
+
+
+ 商品ID
+
+
+
+
充值金额
-
+
+
+
+
+
+
+ 折扣比例
+
+
+
+
支付金额
-
+
+
+
+
+
+
+
+ | 供货商编号 |
+ 商品ID |
+ 渠道商标识符 |
+ 折扣比例 |
+ 商品名称 |
+ 渠道商名称 |
+ 状态 |
+
+
+
+
+ | {{data.channel}} |
+ {{data.goodsId}} |
+ {{data.channelMark | channelMark}} |
+ {{data.discountRatio}}% |
+ {{data.goodsName}} |
+ {{data.memberName}} |
+ {{data.state == 1 ? '上架' : '下架'}} |
+
+
+
+
diff --git a/src/app/admin/recharge-order/price-list/price-list.component.ts b/src/app/admin/recharge-order/price-list/price-list.component.ts
index 9f82506..7d6f173 100644
--- a/src/app/admin/recharge-order/price-list/price-list.component.ts
+++ b/src/app/admin/recharge-order/price-list/price-list.component.ts
@@ -27,6 +27,10 @@ export class PriceListComponent implements OnInit {
isVisible = false;
id: number;
edit = false;
+
+ isVisibleGoods = false;
+ realPrice = 0;
+ goodsArray;
constructor(
private form: FormBuilder,
private recharge: RechargeService,
@@ -50,9 +54,13 @@ export class PriceListComponent implements OnInit {
this.validateForm = this.form.group({
type: [null, [Validators.required]],
price: [null, [Validators.required]],
- realPrice: [null, [Validators.required]],
+ realPrice: [{value: null, disabled: true}, [Validators.required]],
+ goodsId: [null, [Validators.required]],
+ discount: [null, [Validators.required]],
+ channel: [null, [Validators.required]],
});
+
this.getRequest(true, this.searchForm.value);
}
@@ -92,6 +100,7 @@ export class PriceListComponent implements OnInit {
} else {
this.validateForm.reset();
this.isVisible = true;
+ this.edit = false;
}
}
@@ -115,6 +124,7 @@ export class PriceListComponent implements OnInit {
return;
}
}
+ this.validateForm.value.realPrice = this.realPrice;
if (this.edit) {
this.validateForm.value['id'] = this.id;
this.recharge.updatePrice(this.validateForm.value, data => {
@@ -144,6 +154,9 @@ export class PriceListComponent implements OnInit {
this.isVisible = false;
}
+ handleCancelGoods(): void {
+ this.isVisibleGoods = false;
+ }
public getForbiddenUser(id): void {
this.common.showConfirm('是否删除', item => {
@@ -160,4 +173,16 @@ export class PriceListComponent implements OnInit {
});
}
+ public getMemberGoods(): void {
+ this.isVisibleGoods = true;
+ this.recharge.getMemberGoods(data => {
+ console.log(data);
+ this.goodsArray = data['return_data']['data'];
+ });
+ }
+
+ public getPrice(): void {
+ this.realPrice = this.validateForm.value.price * this.validateForm.value.discount / 100;
+ }
+
}
diff --git a/src/app/app-common.module.ts b/src/app/app-common.module.ts
index dc6e8a2..74d2699 100644
--- a/src/app/app-common.module.ts
+++ b/src/app/app-common.module.ts
@@ -25,7 +25,8 @@ import {
DisplayAreaPipe,
DiscountCodeStatusPipe,
RechargePricePipe,
- RechargeStatusPipe
+ RechargeStatusPipe,
+ ChannelMarkPipe
} from './pipes';
@@ -45,7 +46,8 @@ const PIPES = [
DisplayAreaPipe,
DiscountCodeStatusPipe,
RechargePricePipe,
- RechargeStatusPipe
+ RechargeStatusPipe,
+ ChannelMarkPipe
];
@@ -59,6 +61,7 @@ const PIPES = [
],
declarations: [
...PIPES,
+ ChannelMarkPipe,
],
exports: [
diff --git a/src/app/pipes/channel-mark.pipe.ts b/src/app/pipes/channel-mark.pipe.ts
new file mode 100644
index 0000000..da8d2aa
--- /dev/null
+++ b/src/app/pipes/channel-mark.pipe.ts
@@ -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 '电信';
+ }
+ }
+
+}
diff --git a/src/app/pipes/index.ts b/src/app/pipes/index.ts
index 65bdb7a..d740f98 100644
--- a/src/app/pipes/index.ts
+++ b/src/app/pipes/index.ts
@@ -14,3 +14,4 @@ export * from './display-area.pipe';
export * from './discount-code-status.pipe';
export * from './recharge-price.pipe';
export * from './recharge-status.pipe';
+export * from './channel-mark.pipe';
diff --git a/src/app/services/order.service.ts b/src/app/services/order.service.ts
index e4a000e..b5d022d 100644
--- a/src/app/services/order.service.ts
+++ b/src/app/services/order.service.ts
@@ -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);
+ });
+ }
+
/**
* 查询订单列表
*
diff --git a/src/app/services/recharge.service.ts b/src/app/services/recharge.service.ts
index b387a9f..6ff82a2 100644
--- a/src/app/services/recharge.service.ts
+++ b/src/app/services/recharge.service.ts
@@ -196,6 +196,16 @@ export class RechargeService {
});
}
+ /**
+ * 获取渠道商获取关联商品
+ *
+ * @param callBack 回调
+ */
+ public getMemberGoods(callBack) {
+ this.http.get(environment.baseUrl + 'telApi/getMemberGoods').subscribe(data => {
+ callBack(data);
+ });
+ }
}
diff --git a/src/environments/environment.cz.ts b/src/environments/environment.cz.ts
new file mode 100644
index 0000000..7c99483
--- /dev/null
+++ b/src/environments/environment.cz.ts
@@ -0,0 +1,19 @@
+// This file can be replaced during build by using the `fileReplacements` array.
+// `ng build --prod` replaces `environment.ts` with `environment.prod.ts`.
+// The list of file replacements can be found in `angular.json`.
+
+export const environment = {
+ production: false,
+ baseUrl: 'https://cz.cqzhongkahui.com/brest/', // 测试环境服务器地址(请求数据地址)
+ imageUrl: 'https://cz.cqzhongkahui.com/filesystem/',
+ key: 'https://hsgcs.dctpay.com/phone-recharge-H5/index.html?codeValue=',
+};
+
+/*
+ * For easier debugging in development mode, you can import the following file
+ * to ignore zone related error stack frames such as `zone.run`, `zoneDelegate.invokeTask`.
+ *
+ * This import should be commented out in production mode because it will have a negative impact
+ * on performance if an error is thrown.
+ */
+// import 'zone.js/dist/zone-error'; // Included with Angular CLI.