@@ -134,8 +177,21 @@
| {{ data.createTime | date: 'yyyy-MM-dd HH:mm'}} |
{{ data.updateTime | date: 'yyyy-MM-dd HH:mm'}} |
- {{data.status | orderGoodsStatus}}
- {{data.logisticsStatusDesc}}
+
+ |
+
+ {{data.status | orderChildStatus}}
+ |
+
+
+
+
+
+
+
+
+
+
|
详情
@@ -146,8 +202,7 @@
|
@@ -173,18 +228,15 @@
-
- {{orderGoodsData.status | orderGoodsStatus}}
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -210,13 +262,11 @@
{{ orderGoodsData?.updateTime | date: 'yyyy-MM-dd HH:mm' }}
-
-
+
+
{{deliveryAddress?.consignee}}
{{ deliveryAddress?.phone }}
- {{ deliveryAddress?.regionName }}
- {{ deliveryAddress?.address }}
- {{deliveryAddress?.consignee}} -{{ deliveryAddress?.phone }} -{{ deliveryAddress?.address }}
+ {{ deliveryAddress?.regionName }} -{{deliveryAddress?.consignee}} -{{ deliveryAddress?.phone }} -{{ deliveryAddress?.address }}
@@ -225,20 +275,6 @@
-
-
-
-
-
diff --git a/src/app/pages/trade/goods-list/goods-list.component.less b/src/app/pages/trade/goods-list/goods-list.component.less
index 4056a86..1190184 100644
--- a/src/app/pages/trade/goods-list/goods-list.component.less
+++ b/src/app/pages/trade/goods-list/goods-list.component.less
@@ -1,6 +1,7 @@
.search-area {
+ margin-top: 20px;
margin-bottom: 10px;
}
.search-area button {
- margin-right: 8px;
+ margin-right: 14px;
}
diff --git a/src/app/pages/trade/goods-list/goods-list.component.ts b/src/app/pages/trade/goods-list/goods-list.component.ts
index 5471a43..98a3537 100644
--- a/src/app/pages/trade/goods-list/goods-list.component.ts
+++ b/src/app/pages/trade/goods-list/goods-list.component.ts
@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import {Component, Output} from '@angular/core';
import {DatePipe, NgClass, NgForOf, NgIf} from "@angular/common";
import {FormGroup, FormsModule, NonNullableFormBuilder, ReactiveFormsModule} from "@angular/forms";
import {NzButtonComponent} from "ng-zorro-antd/button";
@@ -18,11 +18,10 @@ import {NzTreeSelectComponent} from "ng-zorro-antd/tree-select";
import {environment} from "../../../../environments/environment";
import {NzMessageService} from "ng-zorro-antd/message";
import {GoodsService} from "../../../services/goods/goods.service";
-import {fallbackImg, orderGoodsStatus} from '../../../data/goods/goods.namespace';
+import {fallbackImg, logisticsStatus, orderGoodsChild, orderPayType} from '../../../data/goods/goods.namespace';
import {GoodsStatusPipe} from "../../../pipes/goods/goods-status.pipe";
import {NzModalModule} from "ng-zorro-antd/modal";
import {OrderGoodsService} from "../../../services/trade/order-goods.service";
-import {OrderGoodsStatusPipe} from "../../../pipes/order/order-goods-status.pipe";
import {NzDropDownADirective, NzDropDownDirective, NzDropdownMenuComponent} from "ng-zorro-antd/dropdown";
import {NzMenuDirective, NzMenuItemComponent} from "ng-zorro-antd/menu";
import {NzPopconfirmDirective} from "ng-zorro-antd/popconfirm";
@@ -39,6 +38,15 @@ import {NzResultComponent} from "ng-zorro-antd/result";
import {DateSelectType, DateUtils} from "../../../utils/dateUtils.service";
import {NzDatePickerComponent, NzRangePickerComponent} from "ng-zorro-antd/date-picker";
import {NzRadioButtonDirective, NzRadioComponent, NzRadioGroupComponent} from "ng-zorro-antd/radio";
+import {PayTypePipe} from "../../../pipes/goods/pay-type.pipe";
+import {IconService} from "../../../services/common/icon.service";
+import {OrderChildStatusPipe} from "../../../pipes/goods/order-child-status.pipe";
+import {DATA} from "../../../data/login/localStorage.namespace";
+import {BrowserStorageService} from "../../../utils/localStorage.service";
+import {MerService} from "../../../services/merchant/mer.service";
+import EventEmitter from "node:events";
+import {Subject} from "rxjs";
+import {CommunicationService} from "../../../services/common/communication.service";
@Component({
selector: 'app-goods-list',
@@ -63,7 +71,6 @@ import {NzRadioButtonDirective, NzRadioComponent, NzRadioGroupComponent} from "n
NzImageDirective,
GoodsStatusPipe,
DatePipe,
- OrderGoodsStatusPipe,
NzDropdownMenuComponent,
NgIf,
NzMenuDirective,
@@ -89,6 +96,8 @@ import {NzRadioButtonDirective, NzRadioComponent, NzRadioGroupComponent} from "n
NzRadioComponent,
NzRadioGroupComponent,
NzRangePickerComponent,
+ PayTypePipe,
+ OrderChildStatusPipe,
],
templateUrl: './goods-list.component.html',
@@ -121,26 +130,37 @@ export class GoodsListComponent {
logisticsTraceDetails: any;
goodsOrderId: any;
deliveryAddress: any;
- // 时间类型选择
- dateTypeSelect = DateSelectType;
// 更多查询条件
isCollapse = false;
+ merData: any;
+ objectType: any;
protected readonly fallbackImg = fallbackImg;
- protected readonly orderGoodsStatus = orderGoodsStatus;
+ protected readonly logisticsStatus = logisticsStatus;
+ protected readonly orderGoodsChild = orderGoodsChild;
+ protected readonly orderPayType = orderPayType;
constructor(private fb: NonNullableFormBuilder,
private msg: NzMessageService,
+ private storage: BrowserStorageService,
+ private communicationService: CommunicationService,
+ private merService: MerService,
+ private iconService: IconService,
private orderGoodsService: OrderGoodsService,
private goodsService: GoodsService) {
+
+
// 初始化搜索框
this.searchForm = this.fb.group({
logisticsNo: [''],
orderNo: [''],
+ childOrderNo: [''],
+ logisticsStatus: [''],
goodsType: [''],
goodsBrand: [''],
+ merId: [''],
userPhone: [''],
goodsSpecsName: [''],
createTimeArray: [[]],
@@ -148,15 +168,28 @@ export class GoodsListComponent {
createTimeS: [''],
createTimeE: [''],
goodsName: [''],
- payType: [''],
status: [''],
+ payType: [''],
});
-
- this.createTimeInit();
this.getRequest();
this.getGoodsTypeNode();
this.getGoodsBrandNode();
+ this.merList();
+ this.objectType = this.storage.get(DATA)['account']['objectType'];
+ }
+ // 查询商户
+ 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'];
+ }
+ });
}
// 查询列表
@@ -164,8 +197,8 @@ export class GoodsListComponent {
if (this.searchForm.controls['createTimeArray'].value != null
&& this.searchForm.controls['createTimeArray'].value.length > 0) {
- this.searchForm.controls['createTimeS'].setValue(new Date(this.searchForm.controls['createTimeArray'].value[0]).getTime());
- this.searchForm.controls['createTimeE'].setValue(new Date(this.searchForm.controls['createTimeArray'].value[1]).getTime());
+ this.searchForm.controls['createTimeS'].setValue(DateUtils.getDateHMS(new Date(this.searchForm.controls['createTimeArray'].value[0]) , 1).getTime());
+ this.searchForm.controls['createTimeE'].setValue(DateUtils.getDateHMS(new Date(this.searchForm.controls['createTimeArray'].value[1]) , 2).getTime());
} else {
this.searchForm.controls['createTimeS'].setValue(null)
this.searchForm.controls['createTimeE'].setValue(null)
@@ -189,6 +222,12 @@ export class GoodsListComponent {
});
}
+ // 重制
+ public reset() {
+ this.searchForm.reset();
+ this.getRequest();
+ }
+
// 获取商品分类
getGoodsTypeNode() {
this.goodsService.getList({time: new Date().getTime()}, (data: any) => {
@@ -198,17 +237,6 @@ export class GoodsListComponent {
});
}
- /**
- * 创建时间初始化
- */
- createTimeInit() {
- let createTimeSelect = this.searchForm.controls['createTimeSelect'].value;
- if (createTimeSelect != null) {
- let timeObj = DateUtils.getDate(new Date(), Number(createTimeSelect));
- this.searchForm.controls['createTimeArray'].setValue([timeObj.timeS, timeObj.timeE]);
- }
- }
-
// 配置数据
getNode(array: any): any {
array.forEach((item: any) => {
@@ -232,35 +260,12 @@ export class GoodsListComponent {
});
}
- getLogisticsNo(id: number): void {
- this.getRequest(false);
- this.goodsOrderId = id;
- this.isVisible = true;
- }
-
showDetail(data: OrderGoodsData): void {
this.orderGoodsData = data;
this.findDeliveryAddressById(data.deliveryAddressId);
this.orderDetailModal = true;
}
- handleOk(): void {
- let params = {
- id: this.goodsOrderId,
- logisticsNo: this.logisticsNo,
- time: new Date().getTime()
- }
-
- this.orderGoodsService.updateLogisticsNo(params , (data: any) => {
- if (data['return_code'] == '000000') {
- this.isVisible = false;
-
- this.msg.success("成功")
- } else {
- this.msg.error(data['return_msg']);
- }
- });
- }
showLogisticsNo(id: number): void {
let params = {
@@ -289,5 +294,18 @@ export class GoodsListComponent {
});
}
+ // 订单导出
+ public getExport() {
+ this.searchForm.value.time = new Date().getTime();
+ this.orderGoodsService.exportGoodsOrder(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/goods-logistics-list/goods-logistics-list.component.html b/src/app/pages/trade/goods-logistics-list/goods-logistics-list.component.html
new file mode 100644
index 0000000..3bbef23
--- /dev/null
+++ b/src/app/pages/trade/goods-logistics-list/goods-logistics-list.component.html
@@ -0,0 +1,291 @@
+
+
+
+
+
+ | 商品名称 |
+ 商户名称 |
+ 商品图片 |
+ 商品分类 |
+ 商品品牌 |
+ 用户手机号 |
+ 订单号 |
+ 子订单号 |
+ 物流单号 |
+ 创建时间 |
+ 更新时间 |
+ 支付类型 |
+ 支付状态 |
+ 物流状态 |
+ 操作 |
+
+
+
+
+ | {{data.goodsName}} - {{data.goodsSpecsName}} |
+ {{data.merName}} |
+
+ ![]()
+ |
+ {{data.goodsTypeName}} |
+ {{data.goodsBrandName}} |
+ {{data.userPhone}} |
+ {{data.orderNo}} |
+ {{data.childOrderNo}} |
+ {{data.logisticsNo}} |
+ {{ data.createTime | date: 'yyyy-MM-dd HH:mm'}} |
+ {{ data.updateTime | date: 'yyyy-MM-dd HH:mm'}} |
+
+
+ |
+
+ {{data.status | orderChildStatus}}
+ |
+
+
+
+
+
+
+
+
+
+ |
+
+ 详情
+
+
+ 更多
+
+
+
+
+
+ |
+
+
+ 总计 {{ total }} 条
+
+
+
+
+
+
+
+ {{orderGoodsData?.goodsName}} - {{orderGoodsData?.goodsSpecsName}}
+ {{ orderGoodsData?.userPhone }}//.
+ 0 {{ orderGoodsData?.goodsTypeName }}
+ {{ orderGoodsData?.goodsBrandName }}
+ {{ orderGoodsData?.goodsSpecsOriginalPrice }}
+ {{ orderGoodsData?.goodsCount }}
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ orderGoodsData?.orderNo }}
+ {{ orderGoodsData?.childOrderNo }}
+ {{ orderGoodsData?.paySerialNo }}
+ {{ orderGoodsData?.totalPrice }}
+ {{ orderGoodsData?.couponDiscountPrice }}
+ {{ orderGoodsData?.integralDiscountPrice }}
+ {{ orderGoodsData?.totalDeductionPrice }}
+ {{ orderGoodsData?.payRealPrice }}
+
+
+
+
+ {{ orderGoodsData?.createTime | date: 'yyyy-MM-dd HH:mm' }}
+ {{ orderGoodsData?.payTime | date: 'yyyy-MM-dd HH:mm' }}
+ {{ orderGoodsData?.cancelTime | date: 'yyyy-MM-dd HH:mm' }}
+ {{ orderGoodsData?.refundTime | date: 'yyyy-MM-dd HH:mm' }}
+ {{ orderGoodsData?.finishTime | date: 'yyyy-MM-dd HH:mm' }}
+ {{ orderGoodsData?.updateTime | date: 'yyyy-MM-dd HH:mm' }}
+
+
+
+
+ {{deliveryAddress?.consignee}}
+ {{ deliveryAddress?.phone }}
+ {{ deliveryAddress?.regionName }} -{{deliveryAddress?.consignee}} -{{ deliveryAddress?.phone }} -{{ deliveryAddress?.address }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item['desc']}}
+ {{item.time | date : 'yyyy-MM-dd HH:mm:ss'}}
+
+
+
+
+
+
diff --git a/src/app/pages/trade/goods-logistics-list/goods-logistics-list.component.less b/src/app/pages/trade/goods-logistics-list/goods-logistics-list.component.less
new file mode 100644
index 0000000..4056a86
--- /dev/null
+++ b/src/app/pages/trade/goods-logistics-list/goods-logistics-list.component.less
@@ -0,0 +1,6 @@
+.search-area {
+ margin-bottom: 10px;
+}
+.search-area button {
+ margin-right: 8px;
+}
diff --git a/src/app/pages/trade/goods-logistics-list/goods-logistics-list.component.ts b/src/app/pages/trade/goods-logistics-list/goods-logistics-list.component.ts
new file mode 100644
index 0000000..730395b
--- /dev/null
+++ b/src/app/pages/trade/goods-logistics-list/goods-logistics-list.component.ts
@@ -0,0 +1,309 @@
+import { Component } from '@angular/core';
+import {FormGroup, FormsModule, NonNullableFormBuilder, ReactiveFormsModule} from "@angular/forms";
+import {NzMessageService} from "ng-zorro-antd/message";
+import {NzColDirective, NzRowDirective} from "ng-zorro-antd/grid";
+import { NzFormDirective, NzFormModule} from "ng-zorro-antd/form";
+import {NzInputDirective} from "ng-zorro-antd/input";
+import {NzDatePickerComponent, NzRangePickerComponent} from "ng-zorro-antd/date-picker";
+import {NzRadioButtonDirective, NzRadioComponent, NzRadioGroupComponent} from "ng-zorro-antd/radio";
+import {NzCellFixedDirective, NzTableComponent, NzTableModule, NzThMeasureDirective} from "ng-zorro-antd/table";
+import {NzModalComponent, NzModalContentDirective, NzModalModule} from "ng-zorro-antd/modal";
+import {DatePipe, NgClass, NgForOf, NgIf, NgOptimizedImage} from "@angular/common";
+import {NzOptionComponent, NzSelectComponent} from "ng-zorro-antd/select";
+import {NzButtonComponent} from "ng-zorro-antd/button";
+import {NzTabSetComponent, NzTabsModule} from "ng-zorro-antd/tabs";
+import {NzDescriptionsModule} from "ng-zorro-antd/descriptions";
+import {NzImageDirective, NzImageModule} from "ng-zorro-antd/image";
+
+import {NzIconDirective} from "ng-zorro-antd/icon";
+import {NzBadgeComponent} from "ng-zorro-antd/badge";
+import {fallbackImg, logisticsStatus, orderPayType} from '../../../data/goods/goods.namespace';
+import {NzDividerComponent} from "ng-zorro-antd/divider";
+import {NzDropDownADirective, NzDropDownDirective, NzDropdownMenuComponent} from "ng-zorro-antd/dropdown";
+import {NzMenuDirective, NzMenuItemComponent} from "ng-zorro-antd/menu";
+import {NzResultComponent} from "ng-zorro-antd/result";
+import {NzSpinComponent} from "ng-zorro-antd/spin";
+import {NzTimelineComponent, NzTimelineItemComponent} from "ng-zorro-antd/timeline";
+import {NzTreeSelectComponent} from "ng-zorro-antd/tree-select";
+import {environment} from "../../../../environments/environment";
+import {OrderGoodsService} from "../../../services/trade/order-goods.service";
+import {GoodsService} from "../../../services/goods/goods.service";
+import {OrderGoodsData} from "../../../model/order.interface";
+import {GoodsStatusPipe} from "../../../pipes/goods/goods-status.pipe";
+import {NzPopconfirmDirective} from "ng-zorro-antd/popconfirm";
+import {AuditStatusPipe} from "../../../pipes/audit/audit-status.pipe";
+import {IconService} from "../../../services/common/icon.service";
+import {PayTypePipe} from "../../../pipes/goods/pay-type.pipe";
+import {OrderChildStatusPipe} from "../../../pipes/goods/order-child-status.pipe";
+import {MerService} from "../../../services/merchant/mer.service";
+import {DATA} from "../../../data/login/localStorage.namespace";
+import {BrowserStorageService} from "../../../utils/localStorage.service";
+
+@Component({
+ selector: 'app-goods-logistics-list',
+ standalone: true,
+ imports: [
+ NzColDirective,
+ NzRowDirective,
+ NzFormDirective,
+ ReactiveFormsModule,
+ NzTreeSelectComponent,
+ NzInputDirective,
+ NzSelectComponent,
+ NzOptionComponent,
+ NzButtonComponent,
+ NzTableComponent,
+ NzImageModule,
+ NzModalModule,
+ NzTableModule,
+ NzFormModule,
+ NzThMeasureDirective,
+ NgForOf,
+ NzImageDirective,
+ GoodsStatusPipe,
+ DatePipe,
+ NzDropdownMenuComponent,
+ NgIf,
+ NzMenuDirective,
+ NzDescriptionsModule,
+ NzMenuItemComponent,
+ NzPopconfirmDirective,
+ NzDividerComponent,
+ NzDropDownADirective,
+ NzDropDownDirective,
+ NzTabsModule,
+ NzIconDirective,
+ NzBadgeComponent,
+ AuditStatusPipe,
+ NzTabSetComponent,
+ FormsModule,
+ NzSpinComponent,
+ NzTimelineItemComponent,
+ NgClass,
+ NzResultComponent,
+ NzTimelineComponent,
+ NzDatePickerComponent,
+ NzRadioButtonDirective,
+ NzRadioComponent,
+ NzRadioGroupComponent,
+ NzRangePickerComponent,
+ PayTypePipe,
+ OrderChildStatusPipe,
+
+ ],
+ templateUrl: './goods-logistics-list.component.html',
+ styleUrl: './goods-logistics-list.component.less'
+})
+export class GoodsLogisticsListComponent {
+ // 表单页数
+ tablePageNum = 1;
+ // 表单数据
+ tableData: any = {
+ total: 0,
+ loading: false,
+ list: [],
+ };
+ // 搜索表单
+ searchForm: FormGroup;
+
+ baseUrl = environment.baseUrl;
+ imageUrl = environment.imageUrl;
+
+ // 商品类型数据
+ nodes = [];
+ nodesBrand = [];
+ orderGoodsData: any;
+ orderDetailModal = false;
+ isVisible = false;
+ orderDetailModalChild = false;
+ orderDetailModalLoading = false;
+ logisticsNo: any;
+ logisticsTraceDetails: any;
+ goodsOrderId: any;
+ deliveryAddress: any;
+ // 更多查询条件
+ isCollapse = false;
+ merData: any;
+ objectType: any;
+ protected readonly fallbackImg = fallbackImg;
+ protected readonly orderPayType = orderPayType;
+ protected readonly logisticsStatus = logisticsStatus;
+
+ constructor(private fb: NonNullableFormBuilder,
+ private msg: NzMessageService,
+ private storage: BrowserStorageService,
+ private merService: MerService,
+ private iconService: IconService,
+ private orderGoodsService: OrderGoodsService,
+ private goodsService: GoodsService) {
+
+
+
+ // 初始化搜索框
+ this.searchForm = this.fb.group({
+ logisticsNo: [''],
+ orderNo: [''],
+ childOrderNo: [''],
+ goodsType: [''],
+ goodsBrand: [''],
+ merId: [''],
+ userPhone: [''],
+ goodsSpecsName: [''],
+ createTimeArray: [[]],
+ createTimeSelect: ['1'],
+ createTimeS: [''],
+ createTimeE: [''],
+ goodsName: [''],
+ payType: [''],
+ status: [''],
+ logisticsStatus: [''],
+ });
+ this.getRequest();
+ this.getGoodsTypeNode();
+ this.getGoodsBrandNode();
+ this.merList();
+ this.objectType = this.storage.get(DATA)['account']['objectType'];
+ }
+
+ // 查询商户
+ 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) {
+
+ this.searchForm.controls['status'].setValue(2)
+ if (this.searchForm.controls['createTimeArray'].value != null
+ && this.searchForm.controls['createTimeArray'].value.length > 0) {
+ this.searchForm.controls['createTimeS'].setValue(new Date(this.searchForm.controls['createTimeArray'].value[0]).getTime());
+ this.searchForm.controls['createTimeE'].setValue(new Date(this.searchForm.controls['createTimeArray'].value[1]).getTime());
+ } else {
+ this.searchForm.controls['createTimeS'].setValue(null)
+ this.searchForm.controls['createTimeE'].setValue(null)
+ }
+
+ this.tableData.loading = true;
+ if (reset) {
+ this.tablePageNum = 1;
+ }
+ this.searchForm.value.pageNum = this.tablePageNum;
+ this.searchForm.value.pageSize = 10;
+ this.searchForm.value.time = new Date().getTime();
+
+ this.orderGoodsService.getListGoods(this.searchForm.value , (data: any) => {
+ if (data['return_code'] == '000000') {
+ this.tableData = data['return_data'];
+ } else {
+ this.msg.error(data['return_msg']);
+ }
+ this.tableData.loading = false;
+ });
+ }
+
+ // 获取商品分类
+ getGoodsTypeNode() {
+ this.goodsService.getList({time: new Date().getTime()}, (data: any) => {
+ if (data['return_code'] === '000000') {
+ this.getNode(data['return_data']);
+ }
+ });
+ }
+
+ // 重制
+ public reset() {
+ this.searchForm.reset();
+ this.getRequest();
+ }
+
+ // 配置数据
+ getNode(array: any): any {
+ array.forEach((item: any) => {
+ if (item.children) {
+ this.getNode(item.children);
+ }else {
+ item["isLeaf"] = true;
+ }
+ item["key"] = item.id;
+
+ });
+ this.nodes = array;
+ }
+
+ // 获取商品品牌
+ getGoodsBrandNode() {
+ this.goodsService.getListBrandAll( (data: any) => {
+ if (data['return_code'] == '000000') {
+ this.nodesBrand = data['return_data'];
+ }
+ });
+ }
+
+ getLogisticsNo(id: number): void {
+ this.goodsOrderId = id;
+ this.isVisible = true;
+ }
+
+ showDetail(data: OrderGoodsData): void {
+ this.orderGoodsData = data;
+ this.findDeliveryAddressById(data.deliveryAddressId);
+ this.orderDetailModal = true;
+ }
+
+ handleOk(): void {
+ let params = {
+ id: this.goodsOrderId,
+ logisticsNo: this.logisticsNo,
+ time: new Date().getTime()
+ }
+
+ this.orderGoodsService.updateLogisticsNo(params , (data: any) => {
+ if (data['return_code'] == '000000') {
+ this.isVisible = false;
+ this.getRequest(false);
+ this.msg.success("成功")
+ } else {
+ this.msg.error(data['return_msg']);
+ }
+ });
+ }
+
+ showLogisticsNo(id: number): void {
+ let params = {
+ id:id,
+ time: new Date().getTime()
+ }
+
+ this.orderGoodsService.getLogisticsMsg(params , (data: any) => {
+ if (data['return_code'] == '000000') {
+ this.orderDetailModalChild = true;
+ this.getRequest(false);
+ this.logisticsTraceDetails = data['return_data']['logisticsTraceDetails'];
+ } else {
+ this.msg.error(data['return_msg']);
+ }
+ });
+ }
+
+ findDeliveryAddressById(id: number): void {
+ this.goodsService.findDeliveryAddressById(id, (data: any) => {
+ if (data['return_code'] == '000000') {
+ this.deliveryAddress = data['return_data'];
+ } else {
+ this.msg.error(data['return_msg']);
+ }
+ });
+ }
+
+
+}
diff --git a/src/app/pages/trade/order-cinema/order-cinema.component.ts b/src/app/pages/trade/order-cinema/order-cinema.component.ts
index 4aba796..fcbb2d2 100644
--- a/src/app/pages/trade/order-cinema/order-cinema.component.ts
+++ b/src/app/pages/trade/order-cinema/order-cinema.component.ts
@@ -15,7 +15,6 @@ import {NzImageDirective, NzImageModule} from "ng-zorro-antd/image";
import {NzModalModule} from "ng-zorro-antd/modal";
import {DatePipe, NgClass, NgForOf, NgIf} from "@angular/common";
import {GoodsStatusPipe} from "../../../pipes/goods/goods-status.pipe";
-import {OrderGoodsStatusPipe} from "../../../pipes/order/order-goods-status.pipe";
import {NzDropDownADirective, NzDropDownDirective, NzDropdownMenuComponent} from "ng-zorro-antd/dropdown";
import {NzMenuDirective, NzMenuItemComponent} from "ng-zorro-antd/menu";
import {NzDescriptionsModule} from "ng-zorro-antd/descriptions";
@@ -57,7 +56,6 @@ import {OrderCinemaStatusPipe} from "../../../pipes/goods/order-cinema-status.pi
NzImageDirective,
GoodsStatusPipe,
DatePipe,
- OrderGoodsStatusPipe,
NzDropdownMenuComponent,
NgIf,
NzMenuDirective,
diff --git a/src/app/pages/trade/order-starbucks/order-starbucks.component.html b/src/app/pages/trade/order-starbucks/order-starbucks.component.html
new file mode 100644
index 0000000..3235114
--- /dev/null
+++ b/src/app/pages/trade/order-starbucks/order-starbucks.component.html
@@ -0,0 +1,202 @@
+
+
+
+
+
+ | 商品名称 |
+ 门店名称 |
+ 门店地址 |
+ 用户手机号 |
+ 订单号 |
+ 子订单号 |
+ 渠道订单号 |
+ 订单价格 |
+
+ 创建时间 |
+ 更新时间 |
+ 支付类型 |
+ 状态 |
+ 操作 |
+
+
+
+
+ | {{data.productName}} | {{data.productSpecName}} |
+ {{data.storeName}} |
+ {{data.storeAddress}} |
+ {{data.userPhone}} |
+ {{data.orderNo}} |
+ {{data.childOrderNo}} |
+ {{data.channelOrderNo}} |
+ ¥{{data.productPrice}} |
+
+ {{ data.createTime | date: 'yyyy-MM-dd HH:mm'}} |
+ {{ data.updateTime | date: 'yyyy-MM-dd HH:mm'}} |
+
+
+ |
+ {{data.status | orderChildStatus}} |
+
+ 详情
+ |
+
+
+ 总计 {{ total }} 条
+
+
+
+
+
+
+
+
+
+
+
+ {{ orderGoodsData?.userPhone }}
+
+
+
+ {{ orderChild?.business['storeName'] }}
+ {{ orderChild?.business['storeAddress'] }}
+
+
+
+
+
+
+
+ | 产品名称 |
+ 产品图片 |
+ 规格 |
+ 数量 |
+ 单价 |
+ 总价 |
+
+
+
+
+ | {{data.name}} |
+
+ ![]()
+ |
+ {{data.speList}} |
+ {{data.num}} |
+ ¥{{data.price}} |
+ ¥{{data.totalPrice}} |
+
+
+
+
+
+
+ {{ orderChild?.orderNo }}
+ {{ orderChild?.childOrderNo }}
+ {{ orderGoodsData?.paySerialNo }}
+ ¥{{ orderGoodsData?.totalPrice }}
+ ¥{{ orderChild?.couponDiscountPrice }}
+ ¥{{ orderChild?.integralDiscountPrice/100 }}
+ ¥{{ orderChild?.totalDeductionPrice }}
+ ¥{{ orderGoodsData?.payRealPrice }}
+
+
+
+
+ {{ orderGoodsData?.createTime | date: 'yyyy-MM-dd HH:mm' }}
+ {{ orderGoodsData?.payTime | date: 'yyyy-MM-dd HH:mm' }}
+ {{ orderGoodsData?.cancelTime | date: 'yyyy-MM-dd HH:mm' }}
+ {{ orderGoodsData?.refundTime | date: 'yyyy-MM-dd HH:mm' }}
+ {{ orderGoodsData?.finishTime | date: 'yyyy-MM-dd HH:mm' }}
+ {{ orderGoodsData?.updateTime | date: 'yyyy-MM-dd HH:mm' }}
+
+
+
+
+
+
diff --git a/src/app/pages/trade/order-starbucks/order-starbucks.component.less b/src/app/pages/trade/order-starbucks/order-starbucks.component.less
new file mode 100644
index 0000000..cb045d5
--- /dev/null
+++ b/src/app/pages/trade/order-starbucks/order-starbucks.component.less
@@ -0,0 +1,9 @@
+.search-area {
+ margin-bottom: 10px;
+}
+.search-area button {
+ margin-right: 8px;
+}
+.fontColor {
+ color: red;
+}
diff --git a/src/app/pages/trade/order-starbucks/order-starbucks.component.ts b/src/app/pages/trade/order-starbucks/order-starbucks.component.ts
new file mode 100644
index 0000000..69ad36c
--- /dev/null
+++ b/src/app/pages/trade/order-starbucks/order-starbucks.component.ts
@@ -0,0 +1,177 @@
+import { Component } from '@angular/core';
+import {FormGroup, NonNullableFormBuilder, ReactiveFormsModule} from "@angular/forms";
+import {NzMessageService} from "ng-zorro-antd/message";
+import {NzColDirective, NzRowDirective} from "ng-zorro-antd/grid";
+import {NzFormControlComponent, NzFormDirective, NzFormLabelComponent, NzFormModule} from "ng-zorro-antd/form";
+import {NzInputDirective} from "ng-zorro-antd/input";
+import {NzDatePickerComponent, NzRangePickerComponent} from "ng-zorro-antd/date-picker";
+import {NzRadioButtonDirective, NzRadioComponent, NzRadioGroupComponent} from "ng-zorro-antd/radio";
+import {DatePipe, NgClass, NgForOf, NgIf, NgOptimizedImage} from "@angular/common";
+import {NzOptionComponent, NzSelectComponent} from "ng-zorro-antd/select";
+import {NzButtonComponent} from "ng-zorro-antd/button";
+import {NzCellFixedDirective, NzTableComponent, NzTableModule, NzThMeasureDirective} from "ng-zorro-antd/table";
+import {NzModalComponent, NzModalContentDirective, NzModalModule} from "ng-zorro-antd/modal";
+import {NzTabComponent, NzTabSetComponent} from "ng-zorro-antd/tabs";
+import {NzDescriptionsComponent, NzDescriptionsItemComponent} from "ng-zorro-antd/descriptions";
+import {NzImageDirective, NzImageGroupComponent, NzImageModule} from "ng-zorro-antd/image";
+import {OrderStarbucksService} from "../../../services/trade/order-starbucks.service";
+import {OrderStarbucksPipe} from "../../../pipes/goods/order-starbucks.pipe";
+import {
+ fallbackImg,
+ orderGoodsChild,
+ orderPayType,
+} from "../../../data/goods/goods.namespace";
+import {DateUtils} from "../../../utils/dateUtils.service";
+import {OrderChildStatusPipe} from "../../../pipes/goods/order-child-status.pipe";
+import {OrderService} from "../../../services/trade/order.service";
+import {OrderCinemaStatusPipe} from "../../../pipes/goods/order-cinema-status.pipe";
+import {PayTypePipe} from "../../../pipes/goods/pay-type.pipe";
+import {NzIconDirective, NzIconService} from "ng-zorro-antd/icon";
+import {IconService} from "../../../services/common/icon.service";
+import {NzBadgeComponent} from "ng-zorro-antd/badge";
+import {OrderStarbucksTypePipe} from "../../../pipes/goods/order-starbucks-type.pipe";
+
+@Component({
+ selector: 'app-order-starbucks',
+ standalone: true,
+ imports: [
+ ReactiveFormsModule,
+ NzRowDirective,
+ NzFormLabelComponent,
+ NzFormControlComponent,
+ NzColDirective,
+ NzInputDirective,
+ NzDatePickerComponent,
+ NzRadioGroupComponent,
+ NzRadioButtonDirective,
+ NzTableModule,
+ NzModalModule,
+ NzFormModule,
+ NgForOf,
+ NzRadioComponent,
+ NzSelectComponent,
+ NzButtonComponent,
+ NzTableComponent,
+ NzThMeasureDirective,
+ NzCellFixedDirective,
+ NgClass,
+ DatePipe,
+ NzModalComponent,
+ NzTabSetComponent,
+ NzDescriptionsComponent,
+ NzTabComponent,
+ NzDescriptionsItemComponent,
+ NzImageGroupComponent,
+ NzImageDirective,
+ NzFormDirective,
+ NzImageModule,
+ NzModalContentDirective,
+ OrderStarbucksPipe,
+ NzOptionComponent,
+ NzRangePickerComponent,
+ OrderChildStatusPipe,
+ NgIf,
+ OrderCinemaStatusPipe,
+ PayTypePipe,
+ NgOptimizedImage,
+ NzIconDirective,
+ NzBadgeComponent,
+ OrderStarbucksTypePipe
+ ],
+ templateUrl: './order-starbucks.component.html',
+ styleUrl: './order-starbucks.component.less'
+})
+export class OrderStarbucksComponent {
+ // 表单页数
+ tablePageNum = 1;
+ // 表单数据
+ tableData: any = {
+ total: 0,
+ loading: false,
+ list: [],
+ };
+ // 搜索表单
+ searchForm: FormGroup;
+ orderDetailModal = false;
+ orderGoodsData: any;
+ orderChild: any;
+
+ protected readonly orderGoodsChild = orderGoodsChild;
+ protected readonly orderPayType = orderPayType;
+
+ constructor(private fb: NonNullableFormBuilder,
+ private msg: NzMessageService,
+ private iconService: IconService,
+ private orderService: OrderService,
+ private orderStarbucks: OrderStarbucksService) {
+
+ // 初始化搜索框
+ this.searchForm = this.fb.group({
+ orderNo: [''],
+ childOrderNo: [''],
+ userPhone: [''],
+ productName: [''],
+ storeName: [''],
+ storeAddress: [''],
+ createTimeArray: [[]],
+ createTimeS: [''],
+ createTimeE: [''],
+ goodsName: [''],
+ payType: [''],
+ status: [''],
+ });
+ this.getRequest();
+ }
+
+ // 查询列表
+ public getRequest(reset: boolean = false) {
+
+ if (this.searchForm.controls['createTimeArray'].value != null
+ && this.searchForm.controls['createTimeArray'].value.length > 0) {
+ this.searchForm.controls['createTimeS'].setValue(DateUtils.getDateHMS(new Date(this.searchForm.controls['createTimeArray'].value[0]) , 1).getTime());
+ this.searchForm.controls['createTimeE'].setValue(DateUtils.getDateHMS(new Date(this.searchForm.controls['createTimeArray'].value[1]) , 2).getTime());
+ } else {
+ this.searchForm.controls['createTimeS'].setValue(null)
+ this.searchForm.controls['createTimeE'].setValue(null)
+ }
+
+ this.tableData.loading = true;
+ if (reset) {
+ this.tablePageNum = 1;
+ }
+ this.searchForm.value.pageNum = this.tablePageNum;
+ this.searchForm.value.pageSize = 10;
+ this.searchForm.value.time = new Date().getTime();
+
+ this.orderStarbucks.getListStarbucks(this.searchForm.value , (data: any) => {
+ if (data['return_code'] == '000000') {
+ this.tableData = data['return_data'];
+ } else {
+ this.msg.error(data['return_msg']);
+ }
+ this.tableData.loading = false;
+ });
+ }
+
+ // 重制
+ public reset() {
+ this.searchForm.reset();
+ this.getRequest();
+ }
+
+ // 查询详情
+ showDetail(orderNo: string): void {
+ this.orderService.queryOrder(orderNo , (data: any) => {
+ if (data['return_code'] == '000000') {
+ this.orderGoodsData = data['return_data'];
+ this.orderChild = this.orderGoodsData['orderChildList'][0]
+ } else {
+ this.msg.error(data['return_msg']);
+ }
+ })
+ this.orderDetailModal = true;
+ }
+
+
+ protected readonly fallbackImg = fallbackImg;
+}
diff --git a/src/app/pages/trade/trade.routes.ts b/src/app/pages/trade/trade.routes.ts
index e7cedec..52a34b3 100644
--- a/src/app/pages/trade/trade.routes.ts
+++ b/src/app/pages/trade/trade.routes.ts
@@ -4,6 +4,8 @@ import {OrderAfterSalesComponent} from "./order-after-sales/order-after-sales.co
import {GoodsListComponent} from "./goods-list/goods-list.component";
import {OrderRefundComponent} from "./order-refund/order-refund.component";
import {OrderCinemaComponent} from "./order-cinema/order-cinema.component";
+import {OrderStarbucksComponent} from "./order-starbucks/order-starbucks.component";
+import {GoodsLogisticsListComponent} from "./goods-logistics-list/goods-logistics-list.component";
export const TRADE_ROUTES: Routes = [
{ path: 'goods-list', component: GoodsListComponent },
@@ -11,4 +13,6 @@ export const TRADE_ROUTES: Routes = [
{ path: 'order-after-sales', component: OrderAfterSalesComponent },
{ path: 'order-refund', component: OrderRefundComponent },
{ path: 'order-cinema', component: OrderCinemaComponent },
+ { path: 'order-starbucks', component: OrderStarbucksComponent },
+ { path: 'goods-logistics-list', component: GoodsLogisticsListComponent },
];
diff --git a/src/app/pipes/common/data-utils.pipe.ts b/src/app/pipes/common/data-utils.pipe.ts
new file mode 100644
index 0000000..89fd259
--- /dev/null
+++ b/src/app/pipes/common/data-utils.pipe.ts
@@ -0,0 +1,16 @@
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({
+ name: 'dataUtils',
+ standalone: true
+})
+export class DataUtilsPipe implements PipeTransform {
+
+ transform(data: any, length: number): any {
+ if (data.length == 0) {
+ return [];
+ }
+ return data.slice(0 , length);
+ }
+
+}
diff --git a/src/app/pipes/file/business-type.pipe.ts b/src/app/pipes/file/business-type.pipe.ts
new file mode 100644
index 0000000..d648af3
--- /dev/null
+++ b/src/app/pipes/file/business-type.pipe.ts
@@ -0,0 +1,30 @@
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({
+ name: 'businessType',
+ standalone: true
+})
+export class BusinessTypePipe implements PipeTransform {
+
+ transform(value: number): any {
+ switch (value) {
+ case 1:
+ return '实物产品';
+ case 2:
+ return '虚拟产品';
+ case 3:
+ return '肯德基';
+ case 4:
+ return '星巴克';
+ case 5:
+ return '支付订单';
+ case 6:
+ return '物流上传订单';
+ case 7:
+ return '物流下载订单';
+ default:
+ return '未知状态'
+ }
+ }
+
+}
diff --git a/src/app/pipes/file/status.pipe.ts b/src/app/pipes/file/status.pipe.ts
new file mode 100644
index 0000000..f94cb5a
--- /dev/null
+++ b/src/app/pipes/file/status.pipe.ts
@@ -0,0 +1,22 @@
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({
+ name: 'status',
+ standalone: true
+})
+export class StatusPipe implements PipeTransform {
+
+ transform(value: number): any {
+ switch (value) {
+ case 1:
+ return '成功';
+ case 2:
+ return '导出中';
+ case 3:
+ return '失败';
+ default:
+ return '未知状态'
+ }
+ }
+
+}
diff --git a/src/app/pipes/goods/order-child-status.pipe.ts b/src/app/pipes/goods/order-child-status.pipe.ts
new file mode 100644
index 0000000..5fd6ba5
--- /dev/null
+++ b/src/app/pipes/goods/order-child-status.pipe.ts
@@ -0,0 +1,28 @@
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({
+ name: 'orderChildStatus',
+ standalone: true
+})
+export class OrderChildStatusPipe implements PipeTransform {
+
+ transform(value: number): any {
+ switch (value) {
+ case 1:
+ return '待支付';
+ case 2:
+ return '已支付';
+ case 3:
+ return '已完成';
+ case 4:
+ return '已退款';
+ case 5:
+ return '已取消';
+ case 6:
+ return '退款中';
+ default:
+ return '未知状态'
+ }
+ }
+
+}
diff --git a/src/app/pipes/goods/order-starbucks-type.pipe.ts b/src/app/pipes/goods/order-starbucks-type.pipe.ts
new file mode 100644
index 0000000..cb51a51
--- /dev/null
+++ b/src/app/pipes/goods/order-starbucks-type.pipe.ts
@@ -0,0 +1,32 @@
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({
+ name: 'orderStarbucksType',
+ standalone: true
+})
+export class OrderStarbucksTypePipe implements PipeTransform {
+
+ transform(value: number): any {
+ switch (value) {
+ case 0:
+ return 'warning';
+ case 5:
+ return 'processing';
+ case 10:
+ return 'processing';
+ case 15:
+ return 'success';
+ case 20:
+ return 'processing';
+ case 25:
+ return 'success';
+ case -5:
+ return 'default';
+ case -10:
+ return 'error';
+ default:
+ return 'error'
+ }
+ }
+
+}
diff --git a/src/app/pipes/goods/order-starbucks.pipe.ts b/src/app/pipes/goods/order-starbucks.pipe.ts
new file mode 100644
index 0000000..b19f57d
--- /dev/null
+++ b/src/app/pipes/goods/order-starbucks.pipe.ts
@@ -0,0 +1,32 @@
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({
+ name: 'orderStarbucks',
+ standalone: true
+})
+export class OrderStarbucksPipe implements PipeTransform {
+
+
+ transform(value: number): any {
+ switch (value) {
+ case 0:
+ return '待付款';
+ case 5:
+ return '已支付';
+ case 10:
+ return '出单中';
+ case 15:
+ return '出单成功';
+ case 20:
+ return '配送中';
+ case 25:
+ return '配送完成';
+ case -5:
+ return '已取消';
+ case -10:
+ return '失败';
+ default:
+ return '未知状态'
+ }
+ }
+}
diff --git a/src/app/pipes/goods/pay-type.pipe.ts b/src/app/pipes/goods/pay-type.pipe.ts
new file mode 100644
index 0000000..5eae8f9
--- /dev/null
+++ b/src/app/pipes/goods/pay-type.pipe.ts
@@ -0,0 +1,25 @@
+import { Pipe, PipeTransform } from '@angular/core';
+import {aliLogo, gzBankLogo, hltLogo, noPayLogo, wxLogo} from "../../data/goods/goods.namespace";
+
+@Pipe({
+ name: 'payType',
+ standalone: true
+})
+export class PayTypePipe implements PipeTransform {
+
+ transform(value: number): any {
+ switch (value) {
+ case 1:
+ return "icon-weixin";
+ case 2:
+ return "icon-zhifubao";
+ case 3:
+ return "icon-guizhouyinhanglogo";
+ case 4:
+ return "icon-work_icon_party-01";
+ default:
+ return "icon-daizhifu"
+ }
+ }
+
+}
diff --git a/src/app/pipes/order/order-goods-status.pipe.ts b/src/app/pipes/order/order-goods-status.pipe.ts
deleted file mode 100644
index f543cfa..0000000
--- a/src/app/pipes/order/order-goods-status.pipe.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { Pipe, PipeTransform } from '@angular/core';
-
-@Pipe({
- name: 'orderGoodsStatus',
- standalone: true
-})
-export class OrderGoodsStatusPipe implements PipeTransform {
-
- transform(value: number): any {
- switch (value) {
- case 1:
- return '待发货';
- case 2:
- return '已发货';
- case 3:
- return '配送中';
- case 4:
- return '已送达';
- case 5:
- return '已取消';
- case 6:
- return '退货中';
- case 7:
- return '已退货';
- case 8:
- return '待支付';
- default:
- return '未知状态'
- }
- }
-
-}
diff --git a/src/app/services/common/communication.service.ts b/src/app/services/common/communication.service.ts
new file mode 100644
index 0000000..78ab2cc
--- /dev/null
+++ b/src/app/services/common/communication.service.ts
@@ -0,0 +1,17 @@
+import { Injectable } from '@angular/core';
+import {Subject} from "rxjs";
+
+@Injectable({
+ providedIn: 'root'
+})
+export class CommunicationService {
+
+ private messageSource = new Subject();
+ currentMessage = this.messageSource.asObservable();
+
+ constructor() { }
+
+ sendMessage(message: string) {
+ this.messageSource.next(message);
+ }
+}
diff --git a/src/app/services/common/icon.service.ts b/src/app/services/common/icon.service.ts
new file mode 100644
index 0000000..c89c04c
--- /dev/null
+++ b/src/app/services/common/icon.service.ts
@@ -0,0 +1,14 @@
+import { Injectable } from '@angular/core';
+import {NzIconService} from "ng-zorro-antd/icon";
+
+@Injectable({
+ providedIn: 'root'
+})
+export class IconService {
+
+ constructor(private iconService: NzIconService) {
+ this.iconService.fetchFromIconfont({
+ scriptUrl: 'https://at.alicdn.com/t/c/font_4647823_ys5j7ogeas.js'
+ });
+ }
+}
diff --git a/src/app/services/file/file.service.ts b/src/app/services/file/file.service.ts
new file mode 100644
index 0000000..64f58b2
--- /dev/null
+++ b/src/app/services/file/file.service.ts
@@ -0,0 +1,41 @@
+import { Injectable } from '@angular/core';
+import {HttpClient} from "@angular/common/http";
+import {environment} from "../../../environments/environment";
+import {ObjectData} from "../../utils/objectData.service";
+
+@Injectable({
+ providedIn: 'root'
+})
+export class FileService {
+
+ constructor(private http: HttpClient) { }
+
+ /**
+ * 查询列表
+ * @param params
+ * @param callBack
+ */
+ public getFileRecordsList(params: object, callBack:any) {
+ this.http.get(environment.baseUrl + 'file/getFileRecordsList?' + ObjectData.objectByString(params)).subscribe(data => {
+ callBack(data);
+ });
+ }
+
+ /**
+ * 查询详情
+ * @param id
+ * @param callBack
+ */
+ public findFileRecords(id: number, callBack:any) {
+ this.http.get(environment.baseUrl + 'file/findFileRecords?id=' + id + "&time=" + new Date().getTime()).subscribe(data => {
+ callBack(data);
+ });
+ }
+
+ public getDownLoad(id: number, callBack:any) {
+ this.http.get(environment.baseUrl + 'file/getDownLoad?id=' + id + "&time=" + new Date().getTime()).subscribe(data => {
+ callBack(data);
+ });
+ }
+
+}
diff --git a/src/app/services/trade/order-goods.service.ts b/src/app/services/trade/order-goods.service.ts
index 1eeee14..309b8b6 100644
--- a/src/app/services/trade/order-goods.service.ts
+++ b/src/app/services/trade/order-goods.service.ts
@@ -32,4 +32,15 @@ export class OrderGoodsService {
callBack(data);
});
}
+
+ /**
+ * 订单导出
+ * @param param
+ * @param callBack
+ */
+ public exportGoodsOrder(param: object, callBack:any) {
+ this.http.get(environment.orderUrl + 'orderGoods/exportGoodsOrder?'+ObjectData.objectByString(param)).subscribe(data => {
+ callBack(data);
+ });
+ }
}
diff --git a/src/app/services/trade/order-starbucks.service.ts b/src/app/services/trade/order-starbucks.service.ts
new file mode 100644
index 0000000..5de0c4e
--- /dev/null
+++ b/src/app/services/trade/order-starbucks.service.ts
@@ -0,0 +1,24 @@
+import { Injectable } from '@angular/core';
+import {HttpClient} from "@angular/common/http";
+import {environment} from "../../../environments/environment";
+import {ObjectData} from "../../utils/objectData.service";
+
+@Injectable({
+ providedIn: 'root'
+})
+export class OrderStarbucksService {
+
+ constructor(private http: HttpClient) { }
+
+ /**
+ * 查询订单列表
+ * @param param
+ * @param callBack
+ */
+ public getListStarbucks(param: object, callBack:any) {
+ this.http.get(environment.orderUrl + 'orderStarbucks/getListStarbucks?'+ObjectData.objectByString(param)).subscribe(data => {
+ callBack(data);
+ });
+ }
+
+}
diff --git a/src/app/services/trade/order.service.ts b/src/app/services/trade/order.service.ts
new file mode 100644
index 0000000..8a5d404
--- /dev/null
+++ b/src/app/services/trade/order.service.ts
@@ -0,0 +1,23 @@
+import { Injectable } from '@angular/core';
+import {HttpClient} from "@angular/common/http";
+import {environment} from "../../../environments/environment";
+import {ObjectData} from "../../utils/objectData.service";
+
+@Injectable({
+ providedIn: 'root'
+})
+export class OrderService {
+
+ constructor(private http: HttpClient) { }
+
+ /**
+ * 查询订单
+ * @param orderNo
+ * @param callBack
+ */
+ public queryOrder(orderNo: string, callBack:any) {
+ this.http.get(environment.orderUrl + 'queryOrder?orderNo='+ orderNo).subscribe(data => {
+ callBack(data);
+ });
+ }
+}
diff --git a/src/app/utils/dateUtils.service.ts b/src/app/utils/dateUtils.service.ts
index 7ef2e54..05bbb81 100644
--- a/src/app/utils/dateUtils.service.ts
+++ b/src/app/utils/dateUtils.service.ts
@@ -119,4 +119,23 @@ export class DateUtils {
return returnObj;
}
+
+ /**
+ * 获取时间
+ * @param currentDate 当前时间
+ * @param type 1；开始时间 2:结束时间
+ */
+ public static getDateHMS(currentDate: Date , type: number): any {
+ if (type == 1) {
+ currentDate.setHours(0);
+ currentDate.setMinutes(0);
+ currentDate.setSeconds(0);
+ }
+ if (type == 2) {
+ currentDate.setHours(23);
+ currentDate.setMinutes(59);
+ currentDate.setSeconds(59);
+ }
+ return currentDate;
+ }
}
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index ee124eb..b8075c0 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -4,15 +4,15 @@
export const environment = {
production: false,
- // baseUrl: 'https://phg.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
- // orderUrl: 'https://phg.dctpay.com/order/', // 测试环境服务器地址(请求数据地址)
- // userUrl: 'https://phg.dctpay.com/user/', // 测试环境服务器地址(请求数据地址)
- // imageUrl: 'https://phg.obs.cn-southwest-2.myhuaweicloud.com/',
-
- baseUrl: 'http://localhost:9702/brest/', // 测试环境服务器地址(请求数据地址)
- orderUrl: 'http://localhost:9703/order/', // 测试环境服务器地址(请求数据地址)
- userUrl: 'http://localhost:9704/user/', // 测试环境服务器地址(请求数据地址)
- imageUrl: 'https://phg-test.obs.cn-southwest-2.myhuaweicloud.com/',
+ baseUrl: 'https://phg.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
+ orderUrl: 'https://phg.dctpay.com/order/', // 测试环境服务器地址(请求数据地址)
+ userUrl: 'https://phg.dctpay.com/user/', // 测试环境服务器地址(请求数据地址)
+ imageUrl: 'https://phg.obs.cn-southwest-2.myhuaweicloud.com/',
+ //
+ // baseUrl: 'http://localhost:9702/brest/', // 测试环境服务器地址(请求数据地址)
+ // orderUrl: 'http://localhost:9703/order/', // 测试环境服务器地址(请求数据地址)
+ // userUrl: 'http://localhost:9704/user/', // 测试环境服务器地址(请求数据地址)
+ // imageUrl: 'https://phg-test.obs.cn-southwest-2.myhuaweicloud.com/',
};