From 689a40f1d34543b1f988b2c679ababa285b404cd Mon Sep 17 00:00:00 2001 From: yuanye <418471657@qq.com> Date: Mon, 30 Sep 2024 14:11:09 +0800 Subject: [PATCH] 1 --- src/app/data/goods/goods.namespace.ts | 7 + .../sys-account/sys-account.component.html | 8 + .../sys-account/sys-account.component.ts | 4 + src/app/pages/body/index/index.component.ts | 31 ++- .../goods-list/goods-list.component.html | 2 - .../discount-list.component.html | 10 +- .../discount-list/discount-list.component.ts | 6 +- src/app/pages/system/cms/cms.component.html | 9 +- src/app/pages/system/cms/cms.component.ts | 3 +- .../goods-list/goods-list.component.html | 11 + .../trade/goods-list/goods-list.component.ts | 22 +- .../goods-logistics-list.component.ts | 8 +- .../trade/meituan/meituan-list.component.html | 181 +++++++++++++++ .../trade/meituan/meituan-list.component.less | 0 .../trade/meituan/meituan-list.component.ts | 207 ++++++++++++++++++ src/app/pages/trade/trade.routes.ts | 2 + src/app/services/trade/order-goods.service.ts | 12 + src/environments/environment.ts | 8 +- 18 files changed, 495 insertions(+), 36 deletions(-) create mode 100644 src/app/pages/trade/meituan/meituan-list.component.html create mode 100644 src/app/pages/trade/meituan/meituan-list.component.less create mode 100644 src/app/pages/trade/meituan/meituan-list.component.ts diff --git a/src/app/data/goods/goods.namespace.ts b/src/app/data/goods/goods.namespace.ts index 7c485b4..888e87e 100644 --- a/src/app/data/goods/goods.namespace.ts +++ b/src/app/data/goods/goods.namespace.ts @@ -45,6 +45,13 @@ export const orderPayType = [ {name: "快捷支付" , key: 3}, {name: "工会卡" , key: 4} ]; +export const platformCode = [ + {name: "H5客户端" , key: "H5"} , + {name: "微信小程序" , key: "WXAPPLETS"} , + {name: "V家园" , key: "VFAMILY"}, + {name: "省自机关" , key: "GZGOV"} +]; + export const hltLogo = "./assets/order/hlt.png"; export const gzBankLogo = "./assets/order/gzbank.png"; diff --git a/src/app/pages/account/sys-account/sys-account.component.html b/src/app/pages/account/sys-account/sys-account.component.html index d2d21e6..2f5f046 100644 --- a/src/app/pages/account/sys-account/sys-account.component.html +++ b/src/app/pages/account/sys-account/sys-account.component.html @@ -118,6 +118,14 @@ + + 数据权限 + + + + + + 角色权限 diff --git a/src/app/pages/account/sys-account/sys-account.component.ts b/src/app/pages/account/sys-account/sys-account.component.ts index 231577d..4b4b116 100644 --- a/src/app/pages/account/sys-account/sys-account.component.ts +++ b/src/app/pages/account/sys-account/sys-account.component.ts @@ -24,6 +24,7 @@ import {DictionaryPipe} from "../../../pipes/common/dictionary.pipe"; import {Dictionary} from "../../../data/common/dictionary.namespace"; import {SysAccountService} from "../../../services/account/sys-account.service"; import {RoleService} from "../../../services/role/role.service"; +import {platformCode} from "../../../data/goods/goods.namespace"; @Component({ selector: 'app-sys-account', @@ -101,6 +102,7 @@ export class SysAccountComponent { userName: ['', [Validators.required]], loginName: ['', [Validators.required]], telephone: [''], + platformCode: [''], roleId: ['', [Validators.required]], }); this.accountStatus = new DictionaryPipe().getDictionaryList("SEC_USER_STATUS"); @@ -319,4 +321,6 @@ export class SysAccountComponent { } }); } + + protected readonly platformCode = platformCode; } diff --git a/src/app/pages/body/index/index.component.ts b/src/app/pages/body/index/index.component.ts index 218d0da..dcd6742 100644 --- a/src/app/pages/body/index/index.component.ts +++ b/src/app/pages/body/index/index.component.ts @@ -1,4 +1,4 @@ -import {AfterViewInit, Component} from '@angular/core'; +import {AfterViewInit, Component, TemplateRef, ViewChild} from '@angular/core'; import {Router, RouterLink, RouterOutlet} from "@angular/router"; import { NzContentComponent, @@ -31,7 +31,7 @@ import {DataUtilsPipe} from "../../../pipes/common/data-utils.pipe"; import {GoodsListComponent} from "../../trade/goods-list/goods-list.component"; import {Subject} from "rxjs"; import {CommunicationService} from "../../../services/common/communication.service"; -import {NzModalComponent, NzModalContentDirective, NzModalModule} from "ng-zorro-antd/modal"; +import {NzModalComponent, NzModalContentDirective, NzModalModule, NzModalService} from "ng-zorro-antd/modal"; import {NzResultComponent} from "ng-zorro-antd/result"; import {NzSpinComponent} from "ng-zorro-antd/spin"; import {NzTimelineComponent, NzTimelineItemComponent} from "ng-zorro-antd/timeline"; @@ -41,6 +41,8 @@ import {StatusPipe} from "../../../pipes/file/status.pipe"; import {NzPopconfirmDirective} from "ng-zorro-antd/popconfirm"; import {NzButtonComponent} from "ng-zorro-antd/button"; import {NzBadgeComponent} from "ng-zorro-antd/badge"; +import {NzNotificationComponent, NzNotificationService} from "ng-zorro-antd/notification"; +import {OrderGoodsService} from "../../../services/trade/order-goods.service"; @Component({ selector: 'app-index', @@ -94,7 +96,7 @@ import {NzBadgeComponent} from "ng-zorro-antd/badge"; NzBadgeComponent ], templateUrl: './index.component.html', - styleUrl: './index.component.less', + styleUrl: './index.component.less' }) export class IndexComponent { // 菜单数据 @@ -123,13 +125,34 @@ export class IndexComponent { private storage: BrowserStorageService, private communicationService: CommunicationService, private nzConfigService: NzConfigService, - private iconService: IconService, private fileService: FileService, private message: NzMessageService, + private orderGoodsService: OrderGoodsService, + private modal: NzModalService, private router: Router, // 路由 private login: LoginService ) { + this.orderGoodsService.goodsOrderCount((data: any) => { + if (data['return_code'] == '000000') { + + if (data['return_data'] > 0) { + this.modal.warning({ + nzTitle: '物流信息通知', + nzContent: '当前存在' + data['return_data'] + '条未发货订单，请尽快千万发货！', + nzOkText: '去发货', + nzOkType: 'primary', + nzOkDanger: true, + nzOnOk: () => { + this.router.navigateByUrl('/admin/trade/goods-logistics-list?title=物流订单').then(r => console.log("返回内容" ,r)); + }, + nzCancelText: '暂不处理', + nzOnCancel: () => console.log('Cancel') + }); + } + } + }); + this.communicationService.currentMessage.subscribe(message => { this.showComponent = true; this.fileRecords(); diff --git a/src/app/pages/goods/goods-list/goods-list.component.html b/src/app/pages/goods/goods-list/goods-list.component.html index eb3dd27..739b472 100644 --- a/src/app/pages/goods/goods-list/goods-list.component.html +++ b/src/app/pages/goods/goods-list/goods-list.component.html @@ -221,7 +221,6 @@ nzAction="{{baseUrl}}fileUpload/fileUpload" nzListType="picture-card" [(nzFileList)]="bannerImg" - [nzMultiple]="true" [nzShowButton]="bannerImg.length < 20" [nzPreview]="handlePreview" [nzBeforeUpload]="beforeUpload" @@ -251,7 +250,6 @@ nzAction="{{baseUrl}}fileUpload/fileUpload" nzListType="picture-card" [(nzFileList)]="detailImg" - [nzMultiple]="true" [nzShowButton]="detailImg.length < 20" [nzPreview]="handlePreview" [nzBeforeUpload]="beforeUpload" diff --git a/src/app/pages/marketing/discount-list/discount-list.component.html b/src/app/pages/marketing/discount-list/discount-list.component.html index 0946275..bbc3811 100644 --- a/src/app/pages/marketing/discount-list/discount-list.component.html +++ b/src/app/pages/marketing/discount-list/discount-list.component.html @@ -34,9 +34,7 @@ 优惠券平台 - - - + @@ -125,10 +123,8 @@ 优惠券平台 - - - - + + diff --git a/src/app/pages/marketing/discount-list/discount-list.component.ts b/src/app/pages/marketing/discount-list/discount-list.component.ts index bdff579..93bb721 100644 --- a/src/app/pages/marketing/discount-list/discount-list.component.ts +++ b/src/app/pages/marketing/discount-list/discount-list.component.ts @@ -24,7 +24,7 @@ import {NzImageModule} from "ng-zorro-antd/image"; import {environment} from "../../../../environments/environment"; import {NzMessageService} from "ng-zorro-antd/message"; import {CommonService} from "../../../services/common/common.service"; -import { fallbackImg } from '../../../data/goods/goods.namespace'; +import {fallbackImg, orderPayType, platformCode} from '../../../data/goods/goods.namespace'; import {DiscountService} from "../../../services/marketing/discount.service"; import {DictionaryPipe} from "../../../pipes/common/dictionary.pipe"; import { @@ -133,6 +133,8 @@ export class DiscountListComponent { listOfSelectBind: any = [] goodsSpecs:any = []; protected readonly fallbackImg = fallbackImg; + protected readonly platformCode = platformCode; + constructor(private fb: NonNullableFormBuilder, private msg: NzMessageService, @@ -333,4 +335,6 @@ export class DiscountListComponent { } }); } + + protected readonly orderPayType = orderPayType; } diff --git a/src/app/pages/system/cms/cms.component.html b/src/app/pages/system/cms/cms.component.html index 38fb1d7..0e3c24a 100644 --- a/src/app/pages/system/cms/cms.component.html +++ b/src/app/pages/system/cms/cms.component.html @@ -21,9 +21,7 @@ 平台 - - - + @@ -113,9 +111,7 @@ 平台 - - - + @@ -126,6 +122,7 @@ + diff --git a/src/app/pages/system/cms/cms.component.ts b/src/app/pages/system/cms/cms.component.ts index a9715d0..5a92063 100644 --- a/src/app/pages/system/cms/cms.component.ts +++ b/src/app/pages/system/cms/cms.component.ts @@ -20,7 +20,7 @@ import {environment} from "../../../../environments/environment"; import {NzMessageService} from "ng-zorro-antd/message"; import {CommonService} from "../../../services/common/common.service"; import {GoodsTypeData} from "../../../model/goods.interface"; -import { fallbackImg } from '../../../data/goods/goods.namespace'; +import {fallbackImg, platformCode} from '../../../data/goods/goods.namespace'; import {NzOptionComponent, NzSelectComponent} from "ng-zorro-antd/select"; import {CmsService} from "../../../services/cms/cms.service"; import {DictionaryPipe} from "../../../pipes/common/dictionary.pipe"; @@ -252,4 +252,5 @@ export class CmsComponent { } + protected readonly platformCode = platformCode; } diff --git a/src/app/pages/trade/goods-list/goods-list.component.html b/src/app/pages/trade/goods-list/goods-list.component.html index 1f5ca21..b0fec0b 100644 --- a/src/app/pages/trade/goods-list/goods-list.component.html +++ b/src/app/pages/trade/goods-list/goods-list.component.html @@ -27,6 +27,14 @@ +
+ + 完成时间 + + + + +
创建时间 @@ -35,6 +43,7 @@
+
商户 @@ -155,6 +164,7 @@ 物流单号 创建时间 更新时间 + 完成时间 支付类型 支付状态 物流状态 @@ -176,6 +186,7 @@ {{data.logisticsNo}} {{ data.createTime | date: 'yyyy-MM-dd HH:mm'}} {{ data.updateTime | date: 'yyyy-MM-dd HH:mm'}} + {{ data.finishTime | date: 'yyyy-MM-dd HH:mm'}} 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 98a3537..63e10f9 100644 --- a/src/app/pages/trade/goods-list/goods-list.component.ts +++ b/src/app/pages/trade/goods-list/goods-list.component.ts @@ -31,11 +31,11 @@ import {NzIconDirective} from "ng-zorro-antd/icon"; import {NzDescriptionsModule} from "ng-zorro-antd/descriptions"; import {NzBadgeComponent} from "ng-zorro-antd/badge"; import {AuditStatusPipe} from "../../../pipes/audit/audit-status.pipe"; -import {NzTabComponent, NzTabSetComponent, NzTabsModule} from "ng-zorro-antd/tabs"; +import {NzTabSetComponent, NzTabsModule} from "ng-zorro-antd/tabs"; import {NzSpinComponent} from "ng-zorro-antd/spin"; import {NzTimelineComponent, NzTimelineItemComponent} from "ng-zorro-antd/timeline"; import {NzResultComponent} from "ng-zorro-antd/result"; -import {DateSelectType, DateUtils} from "../../../utils/dateUtils.service"; +import {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"; @@ -44,8 +44,7 @@ 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({ @@ -123,12 +122,9 @@ export class GoodsListComponent { nodesBrand = []; orderGoodsData: any; orderDetailModal = false; - isVisible = false; orderDetailModalChild = false; orderDetailModalLoading = false; - logisticsNo: any; logisticsTraceDetails: any; - goodsOrderId: any; deliveryAddress: any; // 更多查询条件 isCollapse = false; @@ -164,9 +160,11 @@ export class GoodsListComponent { userPhone: [''], goodsSpecsName: [''], createTimeArray: [[]], - createTimeSelect: ['1'], + finishTimeArray: [[]], createTimeS: [''], createTimeE: [''], + finishTimeS: [''], + finishTimeE: [''], goodsName: [''], status: [''], payType: [''], @@ -203,6 +201,14 @@ export class GoodsListComponent { this.searchForm.controls['createTimeS'].setValue(null) this.searchForm.controls['createTimeE'].setValue(null) } + 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) + } this.tableData.loading = true; if (reset) { 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 index 730395b..6a9411e 100644 --- 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 @@ -38,6 +38,7 @@ 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"; +import {ActivatedRoute, Router} from "@angular/router"; @Component({ selector: 'app-goods-logistics-list', @@ -125,6 +126,7 @@ export class GoodsLogisticsListComponent { isCollapse = false; merData: any; objectType: any; + logisticsStatusS: any; protected readonly fallbackImg = fallbackImg; protected readonly orderPayType = orderPayType; protected readonly logisticsStatus = logisticsStatus; @@ -134,11 +136,10 @@ export class GoodsLogisticsListComponent { private storage: BrowserStorageService, private merService: MerService, private iconService: IconService, + private route: ActivatedRoute, private orderGoodsService: OrderGoodsService, private goodsService: GoodsService) { - - // 初始化搜索框 this.searchForm = this.fb.group({ logisticsNo: [''], @@ -156,8 +157,9 @@ export class GoodsLogisticsListComponent { goodsName: [''], payType: [''], status: [''], - logisticsStatus: [''], + logisticsStatus: ['待发货'], }); + this.getRequest(); this.getGoodsTypeNode(); this.getGoodsBrandNode(); diff --git a/src/app/pages/trade/meituan/meituan-list.component.html b/src/app/pages/trade/meituan/meituan-list.component.html new file mode 100644 index 0000000..d22eb80 --- /dev/null +++ b/src/app/pages/trade/meituan/meituan-list.component.html @@ -0,0 +1,181 @@ +
+
+ +
+ + 订单号 + + + + +
+
+ + 完成时间 + + + + +
+
+ + 创建时间 + + + + +
+
+ + 支付状态 + + + + + + +
+ +
+ + 商品名称 + + + + +
+ +
+ + 子订单号 + + + + +
+
+ + 用户手机号 + + + + +
+
+ + 支付类型 + + + + + + +
+ +
+ + {{isCollapse ? '收起至简洁查询' : '更多查询条件'}} + + +
+ +
+ + + +
+
+
+ + + + + 商品名称 + 用户手机号 + 订单号 + 子订单号 + 商品价格 + 服务费 + 支付金额 + 创建时间 + 更新时间 + 完成时间 + 支付类型 + 支付状态 + 操作 + + + + + {{data.goodsName}} + {{data.userPhone}} + {{data.orderNo}} + {{data.childOrderNo}} + ¥{{data.tradeAmount}} + ¥{{data.servicePrice}} + ¥{{data.payRealPrice}} + {{ data.createTime | date: 'yyyy-MM-dd HH:mm'}} + {{ data.updateTime | date: 'yyyy-MM-dd HH:mm'}} + {{ data.finishTime | date: 'yyyy-MM-dd HH:mm'}} + + + + + {{data.status | orderChildStatus}} + + + 详情 + + + 总计 {{ total }} 条 + + + + + + + + +

+ + {{ orderGoodsData?.userPhone }}//. + {{ orderGoodsData?.status | orderChildStatus }}//. + + + + + {{ orderGoodsData?.orderNo }} + {{ orderGoodsData?.childOrderNo }} + {{ orderGoodsData?.paySerialNo }} + {{ orderGoodsData?.totalPrice }} + {{ orderGoodsData?.couponDiscountPrice }} + {{ orderGoodsData?.integralDiscountPrice }} + {{ orderGoodsData?.totalDeductionPrice }} + {{ orderGoodsData?.tradeAmount }} + {{ orderGoodsData?.servicePrice }} + {{ 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/meituan/meituan-list.component.less b/src/app/pages/trade/meituan/meituan-list.component.less new file mode 100644 index 0000000..e69de29 diff --git a/src/app/pages/trade/meituan/meituan-list.component.ts b/src/app/pages/trade/meituan/meituan-list.component.ts new file mode 100644 index 0000000..34415c3 --- /dev/null +++ b/src/app/pages/trade/meituan/meituan-list.component.ts @@ -0,0 +1,207 @@ + +import { + fallbackImg, + logisticsStatus, + orderCinemaStatus, + orderGoodsChild, + orderPayType +} from '../../../data/goods/goods.namespace'; +import {NzTabSetComponent, NzTabsModule} from "ng-zorro-antd/tabs"; +import {NzColDirective, NzRowDirective} from "ng-zorro-antd/grid"; +import {NzFormDirective, NzFormModule} from "ng-zorro-antd/form"; +import {FormGroup, FormsModule, NonNullableFormBuilder, ReactiveFormsModule} from "@angular/forms"; +import {NzTreeSelectComponent} from "ng-zorro-antd/tree-select"; +import {NzInputDirective} from "ng-zorro-antd/input"; +import {NzOptionComponent, NzSelectComponent} from "ng-zorro-antd/select"; +import {NzButtonComponent} from "ng-zorro-antd/button"; +import {NzTableComponent, NzTableModule, NzThMeasureDirective} from "ng-zorro-antd/table"; +import {NzImageDirective, NzImageModule} from "ng-zorro-antd/image"; +import {NzModalModule} from "ng-zorro-antd/modal"; +import {DatePipe, NgClass, NgForOf, NgIf} from "@angular/common"; +import {NzDropDownADirective, NzDropDownDirective, NzDropdownMenuComponent} from "ng-zorro-antd/dropdown"; +import {NzMenuDirective, NzMenuItemComponent} from "ng-zorro-antd/menu"; +import {NzDescriptionsModule} from "ng-zorro-antd/descriptions"; +import {NzPopconfirmDirective} from "ng-zorro-antd/popconfirm"; +import {NzDividerComponent} from "ng-zorro-antd/divider"; +import {NzIconDirective} from "ng-zorro-antd/icon"; +import {NzBadgeComponent} from "ng-zorro-antd/badge"; +import {NzSpinComponent} from "ng-zorro-antd/spin"; +import {NzTimelineComponent, NzTimelineItemComponent} from "ng-zorro-antd/timeline"; +import {NzResultComponent} from "ng-zorro-antd/result"; +import {NzDatePickerComponent, NzRangePickerComponent} from "ng-zorro-antd/date-picker"; +import {NzRadioButtonDirective, NzRadioComponent, NzRadioGroupComponent} from "ng-zorro-antd/radio"; +import {Component} from "@angular/core"; +import {PayTypePipe} from "../../../pipes/goods/pay-type.pipe"; +import {OrderChildStatusPipe} from "../../../pipes/goods/order-child-status.pipe"; +import {NzMessageService} from "ng-zorro-antd/message"; +import {BrowserStorageService} from "../../../utils/localStorage.service"; +import {MerService} from "../../../services/merchant/mer.service"; +import {IconService} from "../../../services/common/icon.service"; +import {MeituanService} from "../../../services/trade/meituan.service"; +import {DateUtils} from "../../../utils/dateUtils.service"; +import {CommunicationService} from "../../../services/common/communication.service"; +import {OrderCinemaStatusPipe} from "../../../pipes/goods/order-cinema-status.pipe"; +import {OrderGoodsData} from "../../../model/order.interface"; +@Component({ + selector: 'app-meituan-list', + standalone: true, + imports: [ + NzColDirective, + NzRowDirective, + NzFormDirective, + ReactiveFormsModule, + NzTreeSelectComponent, + NzInputDirective, + NzSelectComponent, + NzOptionComponent, + NzButtonComponent, + NzTableComponent, + NzImageModule, + NzModalModule, + NzTableModule, + NzFormModule, + NzThMeasureDirective, + NgForOf, + NzImageDirective, + DatePipe, + NzDropdownMenuComponent, + NgIf, + NzMenuDirective, + NzDescriptionsModule, + NzMenuItemComponent, + NzPopconfirmDirective, + NzDividerComponent, + NzDropDownADirective, + NzDropDownDirective, + NzTabsModule, + NzIconDirective, + NzBadgeComponent, + NzTabSetComponent, + FormsModule, + NzSpinComponent, + NzTimelineItemComponent, + NgClass, + NzResultComponent, + NzTimelineComponent, + NzDatePickerComponent, + NzRadioButtonDirective, + NzRadioComponent, + NzRadioGroupComponent, + NzRangePickerComponent, + PayTypePipe, + OrderChildStatusPipe, + OrderCinemaStatusPipe, + ], + templateUrl: './meituan-list.component.html', + styleUrl: './meituan-list.component.less' +}) +export class MeituanListComponent { + // 表单页数 + tablePageNum = 1; + // 表单数据 + tableData: any = { + total: 0, + loading: false, + list: [], + }; + // 搜索表单 + searchForm: FormGroup; + orderDetailModal = false; + // 更多查询条件 + isCollapse = false; + orderGoodsData: any; + + protected readonly orderGoodsChild = orderGoodsChild; + protected readonly orderPayType = orderPayType; + + constructor(private fb: NonNullableFormBuilder, + private msg: NzMessageService, + private iconService: IconService, + private communicationService: CommunicationService, + private meiTuanService: MeituanService,) { + + + + + // 初始化搜索框 + this.searchForm = this.fb.group({ + orderNo: [''], + childOrderNo: [''], + userPhone: [''], + createTimeArray: [[]], + finishTimeArray: [[]], + createTimeS: [''], + createTimeE: [''], + finishTimeS: [''], + finishTimeE: [''], + goodsName: [''], + status: [''], + payType: [''], + }); + 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) + } + 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) + } + + 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.meiTuanService.getListMeiTuan(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(); + } + + + // 订单导出 + public getExport() { + this.searchForm.value.time = new Date().getTime(); + this.meiTuanService.exportMeiTuanOrder(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; + }); + } + + showDetail(data: OrderGoodsData): void { + this.orderGoodsData = data; + this.orderDetailModal = true; + } +} diff --git a/src/app/pages/trade/trade.routes.ts b/src/app/pages/trade/trade.routes.ts index 52a34b3..5c5dbd6 100644 --- a/src/app/pages/trade/trade.routes.ts +++ b/src/app/pages/trade/trade.routes.ts @@ -6,6 +6,7 @@ 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"; +import {MeituanListComponent} from "./meituan/meituan-list.component"; export const TRADE_ROUTES: Routes = [ { path: 'goods-list', component: GoodsListComponent }, @@ -15,4 +16,5 @@ export const TRADE_ROUTES: Routes = [ { path: 'order-cinema', component: OrderCinemaComponent }, { path: 'order-starbucks', component: OrderStarbucksComponent }, { path: 'goods-logistics-list', component: GoodsLogisticsListComponent }, + { path: 'meituan-list', component: MeituanListComponent }, ]; diff --git a/src/app/services/trade/order-goods.service.ts b/src/app/services/trade/order-goods.service.ts index 309b8b6..ac3355d 100644 --- a/src/app/services/trade/order-goods.service.ts +++ b/src/app/services/trade/order-goods.service.ts @@ -43,4 +43,16 @@ export class OrderGoodsService { callBack(data); }); } + + + /** + * 查询待发货数量 + * @param callBack + */ + public goodsOrderCount(callBack:any) { + this.http.get(environment.orderUrl + 'orderGoods/goodsOrderCount?time=' + new Date().getTime()).subscribe(data => { + callBack(data); + }); + } + } diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 129ef25..b8075c0 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,10 +4,10 @@ export const environment = { production: false, - baseUrl: 'https://phgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址) - orderUrl: 'https://phgcs.dctpay.com/order/', // 测试环境服务器地址(请求数据地址) - userUrl: 'https://phgcs.dctpay.com/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/', // 测试环境服务器地址(请求数据地址)