From d9a6b4184bdb4095a45bbb327618a7fed5b2762b Mon Sep 17 00:00:00 2001 From: hurui <177768073@qq.com> Date: Wed, 2 Nov 2022 16:23:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order-coupon-list.component.html | 2 ++ .../order-integral-recharge.component.html | 2 ++ .../order-oil-list.component.html | 2 ++ .../order-refund-list.component.html | 30 ++++++++++--------- src/app/app-common.module.ts | 4 ++- src/app/pipes/index.ts | 2 ++ .../pipes/order/order-child-status.pipe.ts | 27 +++++++++++++++++ src/app/pipes/order/order-pay-type.pipe.ts | 2 -- .../order/order-refund-opuser-type.pipe.ts | 19 ++++++++++++ src/environments/environment.ts | 8 ++--- 10 files changed, 77 insertions(+), 21 deletions(-) create mode 100644 src/app/pipes/order/order-child-status.pipe.ts create mode 100644 src/app/pipes/order/order-refund-opuser-type.pipe.ts diff --git a/src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.html b/src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.html index e8dcdf7..baf789e 100644 --- a/src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.html +++ b/src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.html @@ -287,6 +287,7 @@ 数量 单价 总价 + 订单状态 @@ -301,6 +302,7 @@ {{ data.saleCount }} {{ data.goodsActualPrice }} 元 {{ data.totalActualPrice }} 元 + {{ data.childOrderStatus | orderChildStatus}} diff --git a/src/app/admin/order-manage/order-integral-recharge/order-integral-recharge.component.html b/src/app/admin/order-manage/order-integral-recharge/order-integral-recharge.component.html index 44e901a..4d386d0 100644 --- a/src/app/admin/order-manage/order-integral-recharge/order-integral-recharge.component.html +++ b/src/app/admin/order-manage/order-integral-recharge/order-integral-recharge.component.html @@ -204,6 +204,7 @@ 数量 单价 总价 + 订单状态 @@ -218,6 +219,7 @@ {{ data.saleCount }} {{ data.goodsActualPrice }} 元 {{ data.totalActualPrice }} 元 + {{ data.childOrderStatus | orderChildStatus}} diff --git a/src/app/admin/order-manage/order-oil/order-oil-list/order-oil-list.component.html b/src/app/admin/order-manage/order-oil/order-oil-list/order-oil-list.component.html index fb9dee1..444d92d 100644 --- a/src/app/admin/order-manage/order-oil/order-oil-list/order-oil-list.component.html +++ b/src/app/admin/order-manage/order-oil/order-oil-list/order-oil-list.component.html @@ -343,6 +343,7 @@ 数量 单价 总价 + 订单状态 @@ -357,6 +358,7 @@ {{ data.saleCount }} {{ data.goodsActualPrice }} 元 {{ data.totalActualPrice }} 元 + {{ data.childOrderStatus | orderChildStatus}} diff --git a/src/app/admin/order-manage/order-refund-list/order-refund-list.component.html b/src/app/admin/order-manage/order-refund-list/order-refund-list.component.html index e6fd084..db7c30a 100644 --- a/src/app/admin/order-manage/order-refund-list/order-refund-list.component.html +++ b/src/app/admin/order-manage/order-refund-list/order-refund-list.component.html @@ -142,6 +142,8 @@ 创建时间 退款时间 退款备注 + 操作人类型 + 操作人名称 操作 @@ -160,7 +162,9 @@ {{data.refundStatus | orderRefundStatus}} {{data.createTime | date : 'yyyy-MM-dd HH:mm:ss'}} {{data.refundTime | date : 'yyyy-MM-dd HH:mm:ss'}} - {{data.refundRemark}} + {{data.refundRemark}} + {{data.opUserType | orderRefundOpuserType}} + {{data.opUserName}} 操作列表 @@ -210,14 +214,8 @@ - -

创建时间：{{orderDetailObject.createTime | date : 'yyyy-MM-dd HH:mm:ss'}}

-

备注：{{orderDetailObject.remarks?orderDetailObject.tradeOrder.remarks:'无'}}

- - -

取消时间：{{orderDetailObject.cancelTime | date : 'yyyy-MM-dd HH:mm:ss'}}

-

备注：{{orderDetailObject.cancelRemarks?orderDetailObject.cancelRemarks:'无'}}

- + 创建时间：{{orderDetailObject.createTime | date : 'yyyy-MM-dd HH:mm:ss'}} + 取消时间：{{orderDetailObject.cancelTime | date : 'yyyy-MM-dd HH:mm:ss'}} 支付时间：{{orderDetailObject.payTime | date : 'yyyy-MM-dd HH:mm:ss'}} 完成时间：{{orderDetailObject.finishTime | date : 'yyyy-MM-dd HH:mm:ss'}} 退款时间：{{orderDetailObject.refundTime | date : 'yyyy-MM-dd HH:mm:ss'}} @@ -225,21 +223,24 @@ - + + 订单编号 产品类型 产品名称 产品规格 - 数量 - 单价 - 总价 + 数量 + 单价 + 总价 + 订单状态 + {{ data.childOrderNo}} {{ data.goodsType | orderChildGoodsType}} - + {{ data.goodsName }} 赠品 @@ -247,6 +248,7 @@ {{ data.saleCount }} {{ data.goodsActualPrice }} 元 {{ data.totalActualPrice }} 元 + {{ data.childOrderStatus | orderChildStatus}} diff --git a/src/app/app-common.module.ts b/src/app/app-common.module.ts index 0255d6e..1636912 100644 --- a/src/app/app-common.module.ts +++ b/src/app/app-common.module.ts @@ -61,7 +61,7 @@ import { PlatformPipe, OilTypePipe, OilPriceTaskStatusPipe, - OilPriceTaskExecutionTypePipe, OilPriceTaskPriceTypePipe, IntegralTypePipe, IntegralProductPipe, ProductTypePipe + OilPriceTaskExecutionTypePipe, OilPriceTaskPriceTypePipe, IntegralTypePipe, IntegralProductPipe, ProductTypePipe, OrderRefundOpuserTypePipe, OrderChildStatusPipe } from './pipes'; import {MsgTypePipe} from "./pipes/msg/msg-type.pipe"; @@ -121,6 +121,8 @@ const PIPES = [ OrderPayTypePipe, OrderChildGoodsTypePipe, OrderRefundStatusPipe, + OrderRefundOpuserTypePipe, + OrderChildStatusPipe, ]; diff --git a/src/app/pipes/index.ts b/src/app/pipes/index.ts index 588c01b..ac0d595 100644 --- a/src/app/pipes/index.ts +++ b/src/app/pipes/index.ts @@ -45,6 +45,8 @@ export * from './order/order-oil-status.pipe'; export * from './order/order-status.pipe'; export * from './order/order-pay-type.pipe'; export * from './order/order-child-goods-type.pipe'; +export * from './order/order-refund-opuser-type.pipe'; +export * from './order/order-child-status.pipe'; export * from './third-product/product-type.pipe'; export * from './order/order-refund-status.pipe'; export * from './store/oil-type.pipe'; diff --git a/src/app/pipes/order/order-child-status.pipe.ts b/src/app/pipes/order/order-child-status.pipe.ts new file mode 100644 index 0000000..2df0de5 --- /dev/null +++ b/src/app/pipes/order/order-child-status.pipe.ts @@ -0,0 +1,27 @@ +import { Pipe, PipeTransform } from '@angular/core'; + +@Pipe({ + name: 'orderChildStatus' +}) +export class OrderChildStatusPipe implements PipeTransform { + + transform(value: number): string { + switch (value) { + case 1: + return '待支付'; + case 2: + return '已支付'; + case 3: + return '已完成'; + case 4: + return '已退款'; + case 5: + return '已取消'; + case 6: + return '退款中'; + case 7: + return '退款失败'; + } + } + +} diff --git a/src/app/pipes/order/order-pay-type.pipe.ts b/src/app/pipes/order/order-pay-type.pipe.ts index da7bd12..a105349 100644 --- a/src/app/pipes/order/order-pay-type.pipe.ts +++ b/src/app/pipes/order/order-pay-type.pipe.ts @@ -21,8 +21,6 @@ export class OrderPayTypePipe implements PipeTransform { return '银联分期'; case 7: return '嗨森逛油卡'; - default: - return '积分抵扣'; } } diff --git a/src/app/pipes/order/order-refund-opuser-type.pipe.ts b/src/app/pipes/order/order-refund-opuser-type.pipe.ts new file mode 100644 index 0000000..b07e824 --- /dev/null +++ b/src/app/pipes/order/order-refund-opuser-type.pipe.ts @@ -0,0 +1,19 @@ +import { Pipe, PipeTransform } from '@angular/core'; + +@Pipe({ + name: 'orderRefundOpuserType' +}) +export class OrderRefundOpuserTypePipe implements PipeTransform { + + transform(value: number): string { + switch (value) { + case 1: + return '系统'; + case 2: + return '管理员'; + case 3: + return '用户'; + } + } + +} diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 264e5d9..7a35916 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,11 +4,11 @@ export const environment = { production: false, - baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址) - orderUrl: 'http://localhost:9304/order/', + // baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址) + // orderUrl: 'http://localhost:9304/order/', // imageUrl: 'https://hsgcs.dctpay.com/filesystem/', - // baseUrl: 'https://hsgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址) - // orderUrl: 'https://hsgcs.dctpay.com/order/', + baseUrl: 'https://hsgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址) + orderUrl: 'https://hsgcs.dctpay.com/order/', imageUrl: 'https://hsgcs.dctpay.com/filesystem/', key: 'https://hsgcs.dctpay.com/phone-recharge-H5/index.html?codeValue=', inviteUrl: 'https://hsgcs.dctpay.com/wx/?action=ic&id=',