From 47ee086aae498948ed08bc4ca9bfda48d4f0295e Mon Sep 17 00:00:00 2001
From: yuanye <418471657@qq.com>
Date: Mon, 30 Sep 2024 16:21:40 +0800
Subject: [PATCH] 1
---
src/app/app.routes.ts | 5 +
.../settlement/detail/detail.component.html | 81 +++++++++
.../settlement/detail/detail.component.less | 7 +
.../settlement/detail/detail.component.ts | 151 +++++++++++++++++
.../pages/settlement/list/list.component.html | 71 ++++++++
.../pages/settlement/list/list.component.less | 7 +
.../pages/settlement/list/list.component.ts | 157 ++++++++++++++++++
src/app/pages/settlement/settlement.module.ts | 12 ++
src/app/pages/settlement/settlement.routes.ts | 10 ++
.../pages/settlement/sum/sum.component.html | 69 ++++++++
.../pages/settlement/sum/sum.component.less | 7 +
src/app/pages/settlement/sum/sum.component.ts | 153 +++++++++++++++++
.../trade/meituan/meituan-list.component.html | 1 +
.../services/settlement/settlement.service.ts | 63 +++++++
14 files changed, 794 insertions(+)
create mode 100644 src/app/pages/settlement/detail/detail.component.html
create mode 100644 src/app/pages/settlement/detail/detail.component.less
create mode 100644 src/app/pages/settlement/detail/detail.component.ts
create mode 100644 src/app/pages/settlement/list/list.component.html
create mode 100644 src/app/pages/settlement/list/list.component.less
create mode 100644 src/app/pages/settlement/list/list.component.ts
create mode 100644 src/app/pages/settlement/settlement.module.ts
create mode 100644 src/app/pages/settlement/settlement.routes.ts
create mode 100644 src/app/pages/settlement/sum/sum.component.html
create mode 100644 src/app/pages/settlement/sum/sum.component.less
create mode 100644 src/app/pages/settlement/sum/sum.component.ts
create mode 100644 src/app/services/settlement/settlement.service.ts
diff --git a/src/app/app.routes.ts b/src/app/app.routes.ts
index bd87b7f..ec54dd1 100644
--- a/src/app/app.routes.ts
+++ b/src/app/app.routes.ts
@@ -56,6 +56,11 @@ export const routes: Routes = [
loadChildren: () => import('./pages/audit/audit.routes').then(m => m.AUDIT_ROUTES),
canActivate: [InitGuardService]
},
+ {
+ path: 'settlement',
+ loadChildren: () => import('./pages/settlement/settlement.routes').then(m => m.SETTLEMENT_ROUTES),
+ canActivate: [InitGuardService]
+ },
]
},
diff --git a/src/app/pages/settlement/detail/detail.component.html b/src/app/pages/settlement/detail/detail.component.html
new file mode 100644
index 0000000..f896a37
--- /dev/null
+++ b/src/app/pages/settlement/detail/detail.component.html
@@ -0,0 +1,81 @@
+
+
+
+
+
+
+ 商品名称 |
+ 商户名称 |
+ 业务类型 |
+ 登录平台 |
+ 订单号 |
+ 子订单号 |
+ 业务信息 |
+ 支付金额 |
+ 支付方式 |
+ 收货时间 |
+
+
+
+
+ {{data.goodsName}} |
+ {{data.merName}} |
+ {{data.businessType}} |
+ {{data.platform}} |
+ {{data.orderNo}} |
+ {{data.childOrderNo}} |
+ {{data.business}} |
+ ¥{{data.payRealPrice}} |
+ {{data.payType}} |
+ {{data.finishTime}} |
+
+
+
+
diff --git a/src/app/pages/settlement/detail/detail.component.less b/src/app/pages/settlement/detail/detail.component.less
new file mode 100644
index 0000000..1190184
--- /dev/null
+++ b/src/app/pages/settlement/detail/detail.component.less
@@ -0,0 +1,7 @@
+.search-area {
+ margin-top: 20px;
+ margin-bottom: 10px;
+}
+.search-area button {
+ margin-right: 14px;
+}
diff --git a/src/app/pages/settlement/detail/detail.component.ts b/src/app/pages/settlement/detail/detail.component.ts
new file mode 100644
index 0000000..1336ca1
--- /dev/null
+++ b/src/app/pages/settlement/detail/detail.component.ts
@@ -0,0 +1,151 @@
+import { Component } from '@angular/core';
+import {NgForOf, NgIf} from "@angular/common";
+import {NzButtonComponent} from "ng-zorro-antd/button";
+import {NzColDirective, NzRowDirective} from "ng-zorro-antd/grid";
+import {NzDatePickerComponent, NzRangePickerComponent} from "ng-zorro-antd/date-picker";
+import {NzFormControlComponent, NzFormDirective, NzFormItemComponent, NzFormLabelComponent} from "ng-zorro-antd/form";
+import {NzInputDirective} from "ng-zorro-antd/input";
+import {NzOptionComponent, NzSelectComponent} from "ng-zorro-antd/select";
+import {NzRadioButtonDirective, NzRadioComponent, NzRadioGroupComponent} from "ng-zorro-antd/radio";
+import {FormGroup, NonNullableFormBuilder, ReactiveFormsModule} from "@angular/forms";
+import {NzMessageService} from "ng-zorro-antd/message";
+import {orderPayType, platformCode} from "../../../data/goods/goods.namespace";
+import {DATA} from "../../../data/login/localStorage.namespace";
+import {BrowserStorageService} from "../../../utils/localStorage.service";
+import {DateUtils} from "../../../utils/dateUtils.service";
+import {SettlementService} from "../../../services/settlement/settlement.service";
+import {NzTableComponent, NzTableModule} from "ng-zorro-antd/table";
+import {MerService} from "../../../services/merchant/mer.service";
+import {CommunicationService} from "../../../services/common/communication.service";
+
+@Component({
+ selector: 'app-detail',
+ standalone: true,
+ imports: [
+ NgForOf,
+ NzButtonComponent,
+ NzColDirective,
+ NzDatePickerComponent,
+ NzFormControlComponent,
+ NzFormDirective,
+ NzFormItemComponent,
+ NzFormLabelComponent,
+ NzInputDirective,
+ NzOptionComponent,
+ NzRadioButtonDirective,
+ NzTableModule,
+ NzRadioComponent,
+ NzRadioGroupComponent,
+ NzRangePickerComponent,
+ NzRowDirective,
+ NzSelectComponent,
+ ReactiveFormsModule,
+ NgIf,
+ NzTableComponent
+ ],
+ templateUrl: './detail.component.html',
+ styleUrl: './detail.component.less'
+})
+export class DetailComponent {
+ protected readonly orderPayType = orderPayType;
+ protected readonly platformCode = platformCode;
+ // 表单页数
+ tablePageNum = 1;
+ // 表单数据
+ tableData: any = {
+ total: 0,
+ loading: false,
+ list: [],
+ };
+ // 搜索表单
+ searchForm: FormGroup;
+ merData: any;
+ objectType: any;
+ platform = this.storage.get(DATA)['account']['platformCode'];
+ constructor(private fb: NonNullableFormBuilder,
+ private msg: NzMessageService,
+ private merService: MerService,
+ private communicationService: CommunicationService,
+ private settlement: SettlementService,
+ private storage: BrowserStorageService,) {
+ // 初始化搜索框
+ this.searchForm = this.fb.group({
+ platform: [''],
+ merId: [''],
+ finishTimeArray: [[]],
+ finishTimeS: [''],
+ finishTimeE: [''],
+ payType: [''],
+ });
+
+ this.objectType = this.storage.get(DATA)['account']['objectType'];
+ this.getRequest();
+ this.merList();
+ }
+
+ // 查询商户
+ public merList() {
+ let params: any = {
+ pageNum: 1,
+ pageSize: 1000,
+ time: new Date().getTime(),
+ }
+ this.merService.queryList(params, (data: any) => {
+ if (data['return_code'] == '000000') {
+ this.merData = data['return_data']['list'];
+ }
+ });
+ }
+
+ // 查询列表
+ public getRequest(reset: boolean = false) {
+
+ if (this.searchForm.controls['finishTimeArray'].value != null
+ && this.searchForm.controls['finishTimeArray'].value.length > 0) {
+ this.searchForm.controls['finishTimeS'].setValue(DateUtils.getDateHMS(new Date(this.searchForm.controls['finishTimeArray'].value[0]) , 1).getTime());
+ this.searchForm.controls['finishTimeE'].setValue(DateUtils.getDateHMS(new Date(this.searchForm.controls['finishTimeArray'].value[1]) , 2).getTime());
+ } else {
+ this.searchForm.controls['finishTimeS'].setValue(null)
+ this.searchForm.controls['finishTimeE'].setValue(null)
+ }
+
+ if (this.platform != null) {
+ this.searchForm.controls['platform'].setValue(this.platform)
+ }
+
+ this.tableData.loading = true;
+ if (reset) {
+ this.tablePageNum = 1;
+ }
+ this.searchForm.value.time = new Date().getTime();
+
+ this.settlement.settlementDetail(this.searchForm.value , (data: any) => {
+ if (data['return_code'] == '000000') {
+ this.tableData.list = data['return_data'];
+ } else {
+ this.msg.error(data['return_msg']);
+ }
+ this.tableData.loading = false;
+ });
+ }
+
+ // 重制
+ public reset() {
+ this.searchForm.reset();
+ this.getRequest();
+ }
+
+ // 订单导出
+ public getExport() {
+ this.searchForm.value.time = new Date().getTime();
+ this.settlement.exportSettlementDetail(this.searchForm.value , (data: any) => {
+ if (data['return_code'] == '000000') {
+ this.communicationService.sendMessage(data['return_data']);
+ } else {
+ this.msg.error(data['return_msg']);
+ }
+ this.tableData.loading = false;
+ });
+ }
+
+}
diff --git a/src/app/pages/settlement/list/list.component.html b/src/app/pages/settlement/list/list.component.html
new file mode 100644
index 0000000..bb38959
--- /dev/null
+++ b/src/app/pages/settlement/list/list.component.html
@@ -0,0 +1,71 @@
+
+
+
+
+
+
+ 商户名称 |
+ 支付方式 |
+ 业务类型 |
+ 结算日期 |
+ 结算日期 |
+
+
+
+
+ {{data.merName}} |
+ {{data.payType}} |
+ {{data.businessType}} |
+ ¥{{data.payRealPrice}} |
+ {{data.time}} |
+
+
+
+
diff --git a/src/app/pages/settlement/list/list.component.less b/src/app/pages/settlement/list/list.component.less
new file mode 100644
index 0000000..1190184
--- /dev/null
+++ b/src/app/pages/settlement/list/list.component.less
@@ -0,0 +1,7 @@
+.search-area {
+ margin-top: 20px;
+ margin-bottom: 10px;
+}
+.search-area button {
+ margin-right: 14px;
+}
diff --git a/src/app/pages/settlement/list/list.component.ts b/src/app/pages/settlement/list/list.component.ts
new file mode 100644
index 0000000..d678ed6
--- /dev/null
+++ b/src/app/pages/settlement/list/list.component.ts
@@ -0,0 +1,157 @@
+import { Component } from '@angular/core';
+import {NgForOf, NgIf} from "@angular/common";
+import {NzButtonComponent} from "ng-zorro-antd/button";
+import {NzColDirective, NzRowDirective} from "ng-zorro-antd/grid";
+import {NzDatePickerComponent, NzRangePickerComponent} from "ng-zorro-antd/date-picker";
+import {NzFormControlComponent, NzFormDirective, NzFormItemComponent, NzFormLabelComponent} from "ng-zorro-antd/form";
+import {NzOptionComponent, NzSelectComponent} from "ng-zorro-antd/select";
+import {
+ NzTableCellDirective,
+ NzTableComponent, NzTableModule,
+ NzTbodyComponent,
+ NzTheadComponent,
+ NzThMeasureDirective, NzTrDirective
+} from "ng-zorro-antd/table";
+import {FormGroup, NonNullableFormBuilder, ReactiveFormsModule} from "@angular/forms";
+import {DATA} from "../../../data/login/localStorage.namespace";
+import {NzMessageService} from "ng-zorro-antd/message";
+import {MerService} from "../../../services/merchant/mer.service";
+import {CommunicationService} from "../../../services/common/communication.service";
+import {SettlementService} from "../../../services/settlement/settlement.service";
+import {BrowserStorageService} from "../../../utils/localStorage.service";
+import {DateUtils} from "../../../utils/dateUtils.service";
+import {orderPayType, platformCode} from "../../../data/goods/goods.namespace";
+
+@Component({
+ selector: 'app-list',
+ standalone: true,
+ imports: [
+ NgForOf,
+ NgIf,
+ NzButtonComponent,
+ NzColDirective,
+ NzDatePickerComponent,
+ NzFormControlComponent,
+ NzFormDirective,
+ NzFormItemComponent,
+ NzFormLabelComponent,
+ NzOptionComponent,
+ NzRangePickerComponent,
+ NzRowDirective,
+ NzTableModule,
+ NzSelectComponent,
+ NzTableCellDirective,
+ NzTableComponent,
+ NzTbodyComponent,
+ NzThMeasureDirective,
+ NzTheadComponent,
+ NzTrDirective,
+ ReactiveFormsModule
+ ],
+ templateUrl: './list.component.html',
+ styleUrl: './list.component.less'
+})
+export class ListComponent {
+ protected readonly orderPayType = orderPayType;
+ protected readonly platformCode = platformCode;
+ // 表单页数
+ tablePageNum = 1;
+ // 表单数据
+ tableData: any = {
+ total: 0,
+ loading: false,
+ list: [],
+ };
+ // 搜索表单
+ searchForm: FormGroup;
+ merData: any;
+ objectType: any;
+ platform = this.storage.get(DATA)['account']['platformCode'];
+ constructor(private fb: NonNullableFormBuilder,
+ private msg: NzMessageService,
+ private merService: MerService,
+ private communicationService: CommunicationService,
+ private settlement: SettlementService,
+ private storage: BrowserStorageService,) {
+ // 初始化搜索框
+ this.searchForm = this.fb.group({
+ platform: [''],
+ merId: [''],
+ finishTimeArray: [[]],
+ finishTimeS: [''],
+ finishTimeE: [''],
+ payType: [''],
+ });
+
+ this.objectType = this.storage.get(DATA)['account']['objectType'];
+ this.getRequest();
+ this.merList();
+ }
+
+ // 查询商户
+ public merList() {
+ let params: any = {
+ pageNum: 1,
+ pageSize: 1000,
+ time: new Date().getTime(),
+ }
+ this.merService.queryList(params, (data: any) => {
+ if (data['return_code'] == '000000') {
+ this.merData = data['return_data']['list'];
+ }
+ });
+ }
+
+ // 查询列表
+ public getRequest(reset: boolean = false) {
+
+ if (this.searchForm.controls['finishTimeArray'].value != null
+ && this.searchForm.controls['finishTimeArray'].value.length > 0) {
+ this.searchForm.controls['finishTimeS'].setValue(DateUtils.getDateHMS(new Date(this.searchForm.controls['finishTimeArray'].value[0]) , 1).getTime());
+ this.searchForm.controls['finishTimeE'].setValue(DateUtils.getDateHMS(new Date(this.searchForm.controls['finishTimeArray'].value[1]) , 2).getTime());
+ } else {
+ this.searchForm.controls['finishTimeS'].setValue(null)
+ this.searchForm.controls['finishTimeE'].setValue(null)
+ }
+
+ if (this.platform != null) {
+ this.searchForm.controls['platform'].setValue(this.platform)
+ }
+
+ this.tableData.loading = true;
+ if (reset) {
+ this.tablePageNum = 1;
+ }
+ this.searchForm.value.time = new Date().getTime();
+
+ this.settlement.getSettlement(this.searchForm.value , (data: any) => {
+ if (data['return_code'] == '000000') {
+ this.tableData.list = data['return_data'];
+ } else {
+ this.msg.error(data['return_msg']);
+ }
+ this.tableData.loading = false;
+ });
+ }
+
+ // 重制
+ public reset() {
+ this.searchForm.reset();
+ this.getRequest();
+ }
+
+ // 订单导出
+ public getExport() {
+ this.searchForm.value.time = new Date().getTime();
+ this.settlement.exportSettlement(this.searchForm.value , (data: any) => {
+ if (data['return_code'] == '000000') {
+ this.communicationService.sendMessage(data['return_data']);
+ } else {
+ this.msg.error(data['return_msg']);
+ }
+ this.tableData.loading = false;
+ });
+ }
+
+}
+
diff --git a/src/app/pages/settlement/settlement.module.ts b/src/app/pages/settlement/settlement.module.ts
new file mode 100644
index 0000000..4c972cb
--- /dev/null
+++ b/src/app/pages/settlement/settlement.module.ts
@@ -0,0 +1,12 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+
+
+@NgModule({
+ declarations: [],
+ imports: [
+ CommonModule
+ ]
+})
+export class SettlementModule { }
diff --git a/src/app/pages/settlement/settlement.routes.ts b/src/app/pages/settlement/settlement.routes.ts
new file mode 100644
index 0000000..55f7d81
--- /dev/null
+++ b/src/app/pages/settlement/settlement.routes.ts
@@ -0,0 +1,10 @@
+import { Routes } from '@angular/router';
+import {DetailComponent} from "./detail/detail.component";
+import {ListComponent} from "./list/list.component";
+import {SumComponent} from "./sum/sum.component";
+
+export const SETTLEMENT_ROUTES: Routes = [
+ { path: 'detail', component: DetailComponent},
+ { path: 'list', component: ListComponent},
+ { path: 'sum', component: SumComponent},
+];
diff --git a/src/app/pages/settlement/sum/sum.component.html b/src/app/pages/settlement/sum/sum.component.html
new file mode 100644
index 0000000..2ba0285
--- /dev/null
+++ b/src/app/pages/settlement/sum/sum.component.html
@@ -0,0 +1,69 @@
+
+
+
+
+
+
+ 业务类型 |
+ 支付方式 |
+ 支付金额 |
+ 结算日期 |
+
+
+
+
+ {{data.businessType}} |
+ {{data.payType}} |
+ ¥{{data.payRealPrice}} |
+ {{data.time}} |
+
+
+
+
diff --git a/src/app/pages/settlement/sum/sum.component.less b/src/app/pages/settlement/sum/sum.component.less
new file mode 100644
index 0000000..1190184
--- /dev/null
+++ b/src/app/pages/settlement/sum/sum.component.less
@@ -0,0 +1,7 @@
+.search-area {
+ margin-top: 20px;
+ margin-bottom: 10px;
+}
+.search-area button {
+ margin-right: 14px;
+}
diff --git a/src/app/pages/settlement/sum/sum.component.ts b/src/app/pages/settlement/sum/sum.component.ts
new file mode 100644
index 0000000..a3e211c
--- /dev/null
+++ b/src/app/pages/settlement/sum/sum.component.ts
@@ -0,0 +1,153 @@
+import { Component } from '@angular/core';
+import {NgForOf, NgIf} from "@angular/common";
+import {NzButtonComponent} from "ng-zorro-antd/button";
+import {NzColDirective, NzRowDirective} from "ng-zorro-antd/grid";
+import {NzDatePickerComponent, NzRangePickerComponent} from "ng-zorro-antd/date-picker";
+import {NzFormControlComponent, NzFormDirective, NzFormItemComponent, NzFormLabelComponent} from "ng-zorro-antd/form";
+import {NzOptionComponent, NzSelectComponent} from "ng-zorro-antd/select";
+import {
+ NzTableComponent, NzTableModule,
+} from "ng-zorro-antd/table";
+import {FormGroup, NonNullableFormBuilder, ReactiveFormsModule} from "@angular/forms";
+import {DATA} from "../../../data/login/localStorage.namespace";
+import {NzMessageService} from "ng-zorro-antd/message";
+import {MerService} from "../../../services/merchant/mer.service";
+import {CommunicationService} from "../../../services/common/communication.service";
+import {SettlementService} from "../../../services/settlement/settlement.service";
+import {BrowserStorageService} from "../../../utils/localStorage.service";
+import {DateUtils} from "../../../utils/dateUtils.service";
+import {NzInputDirective} from "ng-zorro-antd/input";
+import {orderPayType, platformCode} from "../../../data/goods/goods.namespace";
+import {NzRadioButtonDirective, NzRadioComponent, NzRadioGroupComponent} from "ng-zorro-antd/radio";
+
+@Component({
+ selector: 'app-sum',
+ standalone: true,
+ imports: [
+ NgForOf,
+ NzButtonComponent,
+ NzColDirective,
+ NzDatePickerComponent,
+ NzFormControlComponent,
+ NzFormDirective,
+ NzFormItemComponent,
+ NzFormLabelComponent,
+ NzInputDirective,
+ NzOptionComponent,
+ NzRadioButtonDirective,
+ NzTableModule,
+ NzRadioComponent,
+ NzRadioGroupComponent,
+ NzRangePickerComponent,
+ NzRowDirective,
+ NzSelectComponent,
+ ReactiveFormsModule,
+ NgIf,
+ NzTableComponent
+ ],
+ templateUrl: './sum.component.html',
+ styleUrl: './sum.component.less'
+})
+export class SumComponent {
+ protected readonly orderPayType = orderPayType;
+ protected readonly platformCode = platformCode;
+ // 表单页数
+ tablePageNum = 1;
+ // 表单数据
+ tableData: any = {
+ total: 0,
+ loading: false,
+ list: [],
+ };
+ // 搜索表单
+ searchForm: FormGroup;
+ merData: any;
+ objectType: any;
+ platform = this.storage.get(DATA)['account']['platformCode'];
+ constructor(private fb: NonNullableFormBuilder,
+ private msg: NzMessageService,
+ private merService: MerService,
+ private communicationService: CommunicationService,
+ private settlement: SettlementService,
+ private storage: BrowserStorageService,) {
+ // 初始化搜索框
+ this.searchForm = this.fb.group({
+ platform: [''],
+ merId: [''],
+ finishTimeArray: [[]],
+ finishTimeS: [''],
+ finishTimeE: [''],
+ payType: [''],
+ });
+
+ this.objectType = this.storage.get(DATA)['account']['objectType'];
+ this.getRequest();
+ this.merList();
+ }
+
+ // 查询商户
+ public merList() {
+ let params: any = {
+ pageNum: 1,
+ pageSize: 1000,
+ time: new Date().getTime(),
+ }
+ this.merService.queryList(params, (data: any) => {
+ if (data['return_code'] == '000000') {
+ this.merData = data['return_data']['list'];
+ }
+ });
+ }
+
+ // 查询列表
+ public getRequest(reset: boolean = false) {
+
+ if (this.searchForm.controls['finishTimeArray'].value != null
+ && this.searchForm.controls['finishTimeArray'].value.length > 0) {
+ this.searchForm.controls['finishTimeS'].setValue(DateUtils.getDateHMS(new Date(this.searchForm.controls['finishTimeArray'].value[0]) , 1).getTime());
+ this.searchForm.controls['finishTimeE'].setValue(DateUtils.getDateHMS(new Date(this.searchForm.controls['finishTimeArray'].value[1]) , 2).getTime());
+ } else {
+ this.searchForm.controls['finishTimeS'].setValue(null)
+ this.searchForm.controls['finishTimeE'].setValue(null)
+ }
+
+ if (this.platform != null) {
+ this.searchForm.controls['platform'].setValue(this.platform)
+ }
+
+ this.tableData.loading = true;
+ if (reset) {
+ this.tablePageNum = 1;
+ }
+ this.searchForm.value.time = new Date().getTime();
+
+ this.settlement.getSum(this.searchForm.value , (data: any) => {
+ if (data['return_code'] == '000000') {
+ this.tableData.list = data['return_data'];
+ } else {
+ this.msg.error(data['return_msg']);
+ }
+ this.tableData.loading = false;
+ });
+ }
+
+ // 重制
+ public reset() {
+ this.searchForm.reset();
+ this.getRequest();
+ }
+
+ // 订单导出
+ public getExport() {
+ this.searchForm.value.time = new Date().getTime();
+ this.settlement.exportSettlementSum(this.searchForm.value , (data: any) => {
+ if (data['return_code'] == '000000') {
+ this.communicationService.sendMessage(data['return_data']);
+ } else {
+ this.msg.error(data['return_msg']);
+ }
+ this.tableData.loading = false;
+ });
+ }
+
+}
diff --git a/src/app/pages/trade/meituan/meituan-list.component.html b/src/app/pages/trade/meituan/meituan-list.component.html
index d22eb80..1629713 100644
--- a/src/app/pages/trade/meituan/meituan-list.component.html
+++ b/src/app/pages/trade/meituan/meituan-list.component.html
@@ -134,6 +134,7 @@
详情
+ |
总计 {{ total }} 条
diff --git a/src/app/services/settlement/settlement.service.ts b/src/app/services/settlement/settlement.service.ts
new file mode 100644
index 0000000..6bf766c
--- /dev/null
+++ b/src/app/services/settlement/settlement.service.ts
@@ -0,0 +1,63 @@
+import { Injectable } from '@angular/core';
+import {environment} from "../../../environments/environment";
+import {ObjectData} from "../../utils/objectData.service";
+import {HttpClient} from "@angular/common/http";
+
+@Injectable({
+ providedIn: 'root'
+})
+export class SettlementService {
+
+ constructor(private http: HttpClient) { }
+
+ public settlementDetail(param: object, callBack:any) {
+ this.http.get(environment.orderUrl + 'settlement/settlementDetail?'+ObjectData.objectByString(param)).subscribe(data => {
+ callBack(data);
+ });
+ }
+
+ /**
+ * 订单导出
+ * @param param
+ * @param callBack
+ */
+ public exportSettlementDetail(param: object, callBack:any) {
+ this.http.get(environment.orderUrl + 'settlement/exportSettlementDetail?'+ObjectData.objectByString(param)).subscribe(data => {
+ callBack(data);
+ });
+ }
+
+ public getSettlement(param: object, callBack:any) {
+ this.http.get(environment.orderUrl + 'settlement/getSettlement?'+ObjectData.objectByString(param)).subscribe(data => {
+ callBack(data);
+ });
+ }
+
+ /**
+ * 订单导出
+ * @param param
+ * @param callBack
+ */
+ public exportSettlement(param: object, callBack:any) {
+ this.http.get(environment.orderUrl + 'settlement/exportSettlement?'+ObjectData.objectByString(param)).subscribe(data => {
+ callBack(data);
+ });
+ }
+
+ public getSum(param: object, callBack:any) {
+ this.http.get(environment.orderUrl + 'settlement/getSum?'+ObjectData.objectByString(param)).subscribe(data => {
+ callBack(data);
+ });
+ }
+
+ /**
+ * 订单导出
+ * @param param
+ * @param callBack
+ */
+ public exportSettlementSum(param: object, callBack:any) {
+ this.http.get(environment.orderUrl + 'settlement/exportSettlementSum?'+ObjectData.objectByString(param)).subscribe(data => {
+ callBack(data);
+ });
+ }
+}