From 7f2f7049e42f8271083acd3721aabe92ac5ac2e2 Mon Sep 17 00:00:00 2001 From: Sum1Dream <418471657@qq.com> Date: Fri, 3 Feb 2023 10:08:23 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=90=86?= =?UTF-8?q?=E5=95=86=E8=AE=A2=E5=8D=95=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cms/cms-category/cms-category.component.ts | 1 - .../admin/cms/cms-content/cms-content.component.ts | 4 +--- .../integral-rebate/integral-rebate.component.html | 6 ++++-- .../order-manage/order-manage-routing.module.ts | 4 ++-- src/app/services/cms.service.ts | 13 +++++++++++++ 5 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/app/admin/cms/cms-category/cms-category.component.ts b/src/app/admin/cms/cms-category/cms-category.component.ts index 4333b05..c553822 100644 --- a/src/app/admin/cms/cms-category/cms-category.component.ts +++ b/src/app/admin/cms/cms-category/cms-category.component.ts @@ -104,7 +104,6 @@ export class CmsCategoryComponent implements OnInit { goRequest() { this.http.get(this.WEB_SERVE_URL + '/cmsCategory/getCategoryTree').subscribe(data => { - console.log(data); if (data['return_code'] === '000000') { this.nodes = data['return_data']; if (this.nodes.length !== 0) { diff --git a/src/app/admin/cms/cms-content/cms-content.component.ts b/src/app/admin/cms/cms-content/cms-content.component.ts index f54c81b..d07b877 100644 --- a/src/app/admin/cms/cms-content/cms-content.component.ts +++ b/src/app/admin/cms/cms-content/cms-content.component.ts @@ -89,7 +89,6 @@ export class CmsContentComponent implements OnInit { whereObject['pageNum'] = this.pageNum; whereObject['pageSize'] = this.pageSize; this.cms.getListCmsContent(whereObject, data => { - console.log(data); this.loading = false; if (data['return_code'] === '000000') { this.requestData = data['return_data'].list; @@ -107,7 +106,7 @@ export class CmsContentComponent implements OnInit { // 查询分类树 findCategoryTree(roleType) { - this.cms.getOwnCategoryTree(roleType, data => { + this.cms.getCategoryTree( data => { if (data['return_code'] === '000000') { this.nodes = data['return_data']; if (this.nodes.length !== 0) { @@ -142,7 +141,6 @@ export class CmsContentComponent implements OnInit { } } this.nodes = data; - console.log(this.nodes); } // 新增 diff --git a/src/app/admin/config-manage/integral-rebate/integral-rebate.component.html b/src/app/admin/config-manage/integral-rebate/integral-rebate.component.html index e5217e1..4c1f490 100644 --- a/src/app/admin/config-manage/integral-rebate/integral-rebate.component.html +++ b/src/app/admin/config-manage/integral-rebate/integral-rebate.component.html @@ -62,8 +62,9 @@ 编号 积分返利比例 + 一级分销返利比例 + 二级分销返利比例 类型 - 返利时间范围 创建时间 操作 @@ -73,8 +74,9 @@ {{i + 1}} {{data.percentage + "%"}} + {{data.firstDistribution + "%"}} + {{data.secondDistribution + "%"}} {{data.type | integralType}} - {{data.startTime | date: 'yyyy-MM-dd HH:mm'}} - {{data.endTime | date: 'yyyy-MM-dd HH:mm'}} {{data.createTime | date: 'yyyy-MM-dd HH:mm'}} diff --git a/src/app/admin/order-manage/order-manage-routing.module.ts b/src/app/admin/order-manage/order-manage-routing.module.ts index 3624604..43756e7 100644 --- a/src/app/admin/order-manage/order-manage-routing.module.ts +++ b/src/app/admin/order-manage/order-manage-routing.module.ts @@ -19,8 +19,8 @@ const routes: Routes = [ { path: 'order-integral-recharge-list', component: OrderIntegralRechargeComponent }, { path: 'order-refund-list', component: OrderRefundListComponent }, { path: 'order-kfc-list', component: KfcOrderListComponent}, - { path: 'order-starbucks--list', component: StarbucksOrderListComponent}, - { path: 'order-member-charge--list', component: MemberChargeOrderListComponent}, + { path: 'order-starbucks-list', component: StarbucksOrderListComponent}, + { path: 'order-member-charge-list', component: MemberChargeOrderListComponent}, { path: 'mobile-recharge-order-list', component: MobileRechargeOrderListComponent }, { path: 'pre-order', component: PreOrderComponent }, { path: 'discount-use-condition-list', component: DiscountUseConditionListComponent }, diff --git a/src/app/services/cms.service.ts b/src/app/services/cms.service.ts index 4a9aaa0..a130054 100644 --- a/src/app/services/cms.service.ts +++ b/src/app/services/cms.service.ts @@ -48,6 +48,19 @@ export class CmsService { }); } + /** + * @Author Sum1Dream + * @methodName getCategoryTree + * @Description // 获取分类树数据 + * @Date 16:37 2023/2/1 + * @Param callBack + */ + public getCategoryTree( callBack) { + this.http.get(environment.baseUrl + '/cmsCategory/getCategoryTree').subscribe(data => { + callBack(data); + }); + } + /** * 新增cms内容 * From d8b8e7c77f5f8b3269f75af3cdf8e99ebcfc050e Mon Sep 17 00:00:00 2001 From: Sum1Dream <418471657@qq.com> Date: Fri, 3 Feb 2023 17:37:08 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=90=86?= =?UTF-8?q?=E5=95=86=E8=AE=A2=E5=8D=95=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../price-list/price-list.component.html | 124 ++++++++---------- src/environments/environment.ts | 8 +- 2 files changed, 56 insertions(+), 76 deletions(-) diff --git a/src/app/admin/recharge-order/price-list/price-list.component.html b/src/app/admin/recharge-order/price-list/price-list.component.html index 95864b4..94832d5 100644 --- a/src/app/admin/recharge-order/price-list/price-list.component.html +++ b/src/app/admin/recharge-order/price-list/price-list.component.html @@ -196,18 +196,18 @@ - - 展示平台 - - - - - - + + + + + + + + + + + + 充值平台 @@ -216,18 +216,18 @@ - - 支付方式 - - - - - - + + + + + + + + + + + + 充值方式 @@ -237,63 +237,43 @@ + - - - - - - + + + + + + + + + + + + + + + - - 折扣比例 - - - - - - 积分支付比例 - - - - - - - + + + - - - + + + - + + + + + + 排序 diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 76173d9..0082f1d 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/', // 测试环境服务器地址(请求数据地址) key: 'https://hsgcs.dctpay.com/phone-recharge-H5/index.html?codeValue=', inviteUrl: 'https://hsgcs.dctpay.com/wx/?action=ic&id=', }; From da7ec43abed42680a33958342ae8217b6dca3ead Mon Sep 17 00:00:00 2001 From: Sum1Dream <418471657@qq.com> Date: Mon, 6 Feb 2023 11:00:53 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=90=86?= =?UTF-8?q?=E5=95=86=E8=AE=A2=E5=8D=95=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member-charge-order-list.component.html | 3 --- .../order-integral-recharge.component.html | 18 ------------------ .../order-integral-recharge.component.ts | 10 +++++----- .../order-manage-routing.module.ts | 3 ++- .../admin/order-manage/order-manage.module.ts | 3 ++- src/environments/environment.ts | 8 ++++---- 6 files changed, 13 insertions(+), 32 deletions(-) diff --git a/src/app/admin/order-manage/member-charge-order/member-charge-order-list/member-charge-order-list.component.html b/src/app/admin/order-manage/member-charge-order/member-charge-order-list/member-charge-order-list.component.html index 31b4b22..e92fa77 100644 --- a/src/app/admin/order-manage/member-charge-order/member-charge-order-list/member-charge-order-list.component.html +++ b/src/app/admin/order-manage/member-charge-order/member-charge-order-list/member-charge-order-list.component.html @@ -87,9 +87,6 @@ - - -
创建时间 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 01625c5..9ddca3d 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 @@ -75,24 +75,6 @@
-
- -
diff --git a/src/app/admin/order-manage/order-integral-recharge/order-integral-recharge.component.ts b/src/app/admin/order-manage/order-integral-recharge/order-integral-recharge.component.ts index d183476..03c790f 100644 --- a/src/app/admin/order-manage/order-integral-recharge/order-integral-recharge.component.ts +++ b/src/app/admin/order-manage/order-integral-recharge/order-integral-recharge.component.ts @@ -53,16 +53,16 @@ export class OrderIntegralRechargeComponent implements OnInit { ngOnInit(): void { - let currentDate = new Date(); + const currentDate = new Date(); currentDate.setHours(0); currentDate.setMinutes(0); currentDate.setSeconds(0); - let createTimeS = currentDate.getTime(); + const createTimeS = currentDate.getTime(); currentDate.setHours(23); currentDate.setMinutes(59); currentDate.setSeconds(59); - let createTimeE = currentDate.getTime(); + const createTimeE = currentDate.getTime(); this.whereObject = { createTimeS: createTimeS, createTimeE: createTimeE}; this.searchForm = this.form.group({ @@ -71,7 +71,7 @@ export class OrderIntegralRechargeComponent implements OnInit { couponName: [null], payType: [null], status: [null], - createTime: [[createTimeS,createTimeE]], + createTime: [[createTimeS, createTimeE]], payTime: [null], finishTime: [null], }); @@ -189,7 +189,7 @@ export class OrderIntegralRechargeComponent implements OnInit { */ pageSizeChang(pageSize: number) { this.pageSize = pageSize; - this.requestData(1) + this.requestData(1); } } diff --git a/src/app/admin/order-manage/order-manage-routing.module.ts b/src/app/admin/order-manage/order-manage-routing.module.ts index f1eff2d..ba5dbd9 100644 --- a/src/app/admin/order-manage/order-manage-routing.module.ts +++ b/src/app/admin/order-manage/order-manage-routing.module.ts @@ -11,7 +11,7 @@ import {DiscountUseConditionListComponent} from './discount-use-condition-list/d import {DicountPackageOrderListComponent} from './dicount-package-order-list/dicount-package-order-list.component'; import {PreOrderComponent} from './pre-order/pre-order.component'; import {MobileRechargeOrderListComponent} from './mobile-recharge-order-list/mobile-recharge-order-list.component'; - +import {HltChargeOrderComponent} from './hlt-charge-order/hlt-charge-order.component'; const routes: Routes = [ @@ -26,6 +26,7 @@ const routes: Routes = [ { path: 'pre-order', component: PreOrderComponent }, { path: 'discount-use-condition-list', component: DiscountUseConditionListComponent }, { path: 'discount-package-order-list', component: DicountPackageOrderListComponent}, + { path: 'hlt-order-list', component: HltChargeOrderComponent}, ]; @NgModule({ diff --git a/src/app/admin/order-manage/order-manage.module.ts b/src/app/admin/order-manage/order-manage.module.ts index abaeec8..18ccb4d 100644 --- a/src/app/admin/order-manage/order-manage.module.ts +++ b/src/app/admin/order-manage/order-manage.module.ts @@ -20,9 +20,10 @@ import {SeparateModule} from '../../common/separate/separate.module'; import {NzSpaceModule} from 'ng-zorro-antd/space'; import {RegionSelectorModule} from '../../common/region-selector/region-selector.module'; import {MobileRechargeOrderListComponent} from './mobile-recharge-order-list/mobile-recharge-order-list.component'; +import { HltChargeOrderComponent } from './hlt-charge-order/hlt-charge-order.component'; @NgModule({ - declarations: [OrderOilListComponent, OrderCouponListComponent, OrderIntegralRechargeComponent, OrderRefundListComponent, KfcOrderListComponent, StarbucksOrderListComponent, MemberChargeOrderListComponent, MobileRechargeOrderListComponent, PreOrderComponent,DicountPackageOrderListComponent, MemberChargeOrderListComponent, DiscountUseConditionListComponent], + declarations: [OrderOilListComponent, OrderCouponListComponent, OrderIntegralRechargeComponent, OrderRefundListComponent, KfcOrderListComponent, StarbucksOrderListComponent, MemberChargeOrderListComponent, MobileRechargeOrderListComponent, PreOrderComponent,DicountPackageOrderListComponent, MemberChargeOrderListComponent, DiscountUseConditionListComponent, HltChargeOrderComponent], imports: [ CommonModule, OrderManageRoutingModule, diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 0082f1d..76173d9 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/', // 测试环境服务器地址(请求数据地址) key: 'https://hsgcs.dctpay.com/phone-recharge-H5/index.html?codeValue=', inviteUrl: 'https://hsgcs.dctpay.com/wx/?action=ic&id=', }; From ecfadda8987299c480de9f19485c2bef891c3eab Mon Sep 17 00:00:00 2001 From: Sum1Dream <418471657@qq.com> Date: Tue, 7 Feb 2023 10:21:07 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=90=86?= =?UTF-8?q?=E5=95=86=E8=AE=A2=E5=8D=95=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dicount-package-order-list.component.html | 396 ++++++++++-------- .../dicount-package-order-list.component.scss | 3 + .../dicount-package-order-list.component.ts | 286 ++++++------- .../price-list/price-list.component.html | 118 +++--- src/environments/environment.prod.ts | 1 + src/environments/environment.ts | 8 +- 6 files changed, 416 insertions(+), 396 deletions(-) diff --git a/src/app/admin/order-manage/dicount-package-order-list/dicount-package-order-list.component.html b/src/app/admin/order-manage/dicount-package-order-list/dicount-package-order-list.component.html index a95a9d6..4b54738 100644 --- a/src/app/admin/order-manage/dicount-package-order-list/dicount-package-order-list.component.html +++ b/src/app/admin/order-manage/dicount-package-order-list/dicount-package-order-list.component.html @@ -2,181 +2,235 @@ - -
-
-
-
- - 区域公司 - - - - - - -
-
- - 商户 - - - - - - -
-
- - 订单号 - - - - -
-
- - 商品名称 - - - - -
-
- - 用户电话 - - - - -
-
- - 支付模式 - - - - - - - - -
-
- - 支付方式 - - - - - - - - - - -
-
- - 状态 - - - - - - - - - - - - -
-
- - 时间区间 - - - - -
-
+ + +
+
+ +
-
-
- - -
-
- -
+
+ + 交易单号 + + + + +
+ +
+ + 客户电话 + + + + +
+
+ + 交易状态 + + + + + + +
+
+ +
+
+ + 分公司 + + + + + + +
+ +
+ + 支付方式 + + + + + + + + + + + + +
+
+ + 支付卡号 + + + + +
+
+ + 支付时间 + + + + +
+
+ + 创建时间 + + + + +
-
- 共计 {{total}} 条数据 -
- +
+ + 退款时间 + + + + +
+
+ + +
- - - - 编号 - 商品名称 - 订单来源 - 订单类型 - 订单号 - 支付流水号 - 客户名称 - 客户电话 - 支付模式 - 支付方式 - 支付金额 - 生成时间 - 支付时间 - 取消时间 - 状态 - - - - - {{i+1}} - {{data.goodsName}} - {{data.giveawayType}} - {{data.goodsType}} - {{data.orderNo}} - {{data.paySerialNo}} - {{data.memName == null ? '暂无': data.memName}} - {{data.memPhone == null ? '暂无': data.memPhone}} - {{data.payModel}} - {{data.payType}} - {{data.payPrice}} - {{data.createTime | date: 'yyyy-MM-dd HH:mm:ss'}} - {{data.payTime | date: 'yyyy-MM-dd HH:mm:ss'}} - {{data.cancelTime | date: 'yyyy-MM-dd HH:mm:ss'}} - {{data.orderStatus}} - - -
+ + +
+ 共计 {{total?total:0}} 条数据 - - - 退款理由 - - - - - + + + + + 交易单号 + 客户电话 + 订单名称 + 订单金额 + 支付金额 + 支付方式 + 订单状态 + 创建时间 + 操作 + + + + + {{data.orderNo}} + {{data.memPhone}} + {{data.title}} + ￥{{data.totalPrice}} + ￥{{data.payPrice}} + {{data.orderStatus == 1 || data.orderStatus == 5 ? '未支付' : data.payType | orderPayType}} + {{data.orderStatus | orderStatus}} + {{data.createTime | date : 'yyyy-MM-dd HH:mm:ss'}} + + 操作列表 + + + + + + + +
+
+ + + + + + + {{orderDetailObject.tradeOrder.orderNo}} + {{orderDetailObject.tradeOrder.paySerialNo!=null?orderDetailObject.tradeOrder.paySerialNo:'无'}} + {{orderDetailObject.tradeOrder.memPhone}} + {{orderDetailObject.tradeOrder.orderStatus | orderStatus}} + {{orderDetailObject.tradeOrder.payType | orderPayType}} + + {{orderDetailObject.tradeOrder.memCardNo}} + + {{orderDetailObject.tradeOrder.memDiscountName?orderDetailObject.tradeOrder.memDiscountName:'无'}} + {{orderDetailObject.tradeOrder.whetherRebate?'是':'否'}} + {{orderDetailObject.tradeOrder.remarks}} + + + + + {{orderDetailObject.tradeOrder.totalPrice}} 元 + {{orderDetailObject.tradeOrder.totalDeductionPrice}} 元 + {{orderDetailObject.tradeOrder.deductionProductPrice}} 元 + {{orderDetailObject.tradeOrder.deductionCouponPrice}} 元 + {{orderDetailObject.tradeOrder.payablePrice}} 元 + {{orderDetailObject.tradeOrder.payGold / 100}} 元 + + {{orderDetailObject.tradeOrder.payRealPrice!=null?orderDetailObject.tradeOrder.payRealPrice+' 元':'未支付'}} + + + + + + + +

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

+

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

+ + +

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

+

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

+ + 支付时间：{{orderDetailObject.tradeOrder.payTime | date : 'yyyy-MM-dd HH:mm:ss'}} + 完成时间：{{orderDetailObject.tradeOrder.finishTime | date : 'yyyy-MM-dd HH:mm:ss'}} + 退款时间：{{orderDetailObject.tradeOrder.refundTime | date : 'yyyy-MM-dd HH:mm:ss'}} + + + + + + diff --git a/src/app/admin/order-manage/dicount-package-order-list/dicount-package-order-list.component.scss b/src/app/admin/order-manage/dicount-package-order-list/dicount-package-order-list.component.scss index e69de29..363c972 100644 --- a/src/app/admin/order-manage/dicount-package-order-list/dicount-package-order-list.component.scss +++ b/src/app/admin/order-manage/dicount-package-order-list/dicount-package-order-list.component.scss @@ -0,0 +1,3 @@ +img { + width: 60px; +} diff --git a/src/app/admin/order-manage/dicount-package-order-list/dicount-package-order-list.component.ts b/src/app/admin/order-manage/dicount-package-order-list/dicount-package-order-list.component.ts index ed547f0..a09ac99 100644 --- a/src/app/admin/order-manage/dicount-package-order-list/dicount-package-order-list.component.ts +++ b/src/app/admin/order-manage/dicount-package-order-list/dicount-package-order-list.component.ts @@ -10,183 +10,145 @@ import {OrderService} from '../../../services/order.service'; import {CompanyService} from '../../../services/company.service'; import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace'; import {LocalStorageService} from '../../../services/local-storage.service'; +import {HltOrderService} from "../../../services/order/hlt-order.service"; +import {animate, state, style, transition, trigger} from "_@angular_animations@9.0.7@@angular/animations"; @Component({ selector: 'app-dicount-package-order-list', + animations: [ + trigger('openClose', [ + state('open', style({ + height: '260px', + opacity: 1, + backgroundColor: 'white' + })), + state('closed', style({ + opacity: 1, + backgroundColor: 'white' + })), + transition('open => closed', [ + animate('0.3s') + ]), + transition('closed => open', [ + animate('0.3s') + ]), + ]), + ], templateUrl: './dicount-package-order-list.component.html', styleUrls: ['./dicount-package-order-list.component.scss'] }) export class DicountPackageOrderListComponent implements OnInit { - WEB_SERVE_URL = environment.baseUrl; - FILE_URL = environment.imageUrl; - searchForm: FormGroup; // 搜索框 - requestData = []; // 列表数据 - companyData = []; // 列表数据 - merchantData = []; // 列表数据 - total: number; // 页码 - pageNum = 1; // 页码 - pageSize = 10; // 条码 - loading = true; - id: number; // 订单ID - isVisible = false; - refundContent: string; - roleType: number; - constructor( - private form: FormBuilder, - private order: OrderService, - private iconService: IconService, - private message: NzMessageService, - private router: Router, - private company: CompanyService, - private merchant: MerchantService, - private store: LocalStorageService, // 数据请求 - private common: CommonsService - ) { - } - ngOnInit(): void { - this.init(); - this.roleType = this.store.get(ADMIN_INFO_OBJECT)['secRole']['roleType']; - const whereObject = {}; - whereObject['pageNum'] = 1; - whereObject['pageSize'] = 10000; - this.company.selectCompanyList(whereObject, data => { - if (data['return_code'] === '000000') { - this.companyData = data['return_data'].list; - } else { - this.message.error(data['return_msg']); - } - }); - if (this.roleType === 5) { - this.getMerchantListByCompany(this.store.get(ADMIN_INFO_OBJECT)['bsCompany']['id']); - } else { - this.getMerchantListByCompany(this.searchForm.value.companyId); - } - - } - - public init(): void { - this.searchForm = this.form.group({ - companyId: [null], - merchantId: [null], - orderNo: [null], - paySerialNo: [null], - payModel: [null], - payType: [null], - memDiscountName: [null], - memPhone: [null], - orderStatus: [null], - payTime: [null] - }); - this.getRequest(true, this.searchForm.value); - } - - // 查询列表 - public getRequest(reset: boolean = false, whereObject: object) { - - if (whereObject['payTime'] != null && whereObject['payTime'].length !== 0) { - whereObject['payTimeS'] = whereObject['payTime'][0].getTime(); - whereObject['payTimeE'] = whereObject['payTime'][1].getTime(); - } - - this.loading = false; - if (reset) { - this.pageNum = 1; + // 搜索框 + searchForm: FormGroup; + // 搜索框折叠 + isCollapse = false; + // 订单状态数据 + orderStatusArray = []; + // 公司数据 + companyArray = []; + // 角色类型 + roleType: number; + // 列表相关参数 + // 总条数 + total: number; + // 页码 + pageNum = 1; + // 条码 + pageSize = 10; + // 列表数据 + requestData = []; + // 列表加载 + loading = true; + // 订单详情相关参数 + // 详情模态框 + orderDetailModal = false; + // 详情模态框数据等待 + orderDetailModalLoading = false; + // 订单详情数据 + orderDetailObject: any = { + tradeOrder: {}, + }; + // 数据加载中参数 + loadingObject = { + title: '加载中...', + status: false, + }; + // 请求地址参数 + FILE_URL = environment.imageUrl; + constructor( + private form: FormBuilder, + private store: LocalStorageService, + private message: NzMessageService, + private hltOrderService: HltOrderService, + private companyService: CompanyService, + private commonsService: CommonsService, + ) { } + + ngOnInit(): void { + // 搜索表单初始化 + this.searchForm = this.form.group({ + orderNo: [null], + memPhone: [null], + payTimeArray: [null], + orderStatus: [null], + createTimeArray: [null], + refundTimeArray: [null], + companyId: [null], + payType: [null], + memCardNo: [null], + productType: [7], + }); + // 角色类型初始化 + this.roleType = Number(this.store.get(ADMIN_INFO_OBJECT)['secRole'].roleType); + // 查询公司列表 + if (this.roleType === 0 || this.roleType === 1) { + this.companyService.selectCompanyList({ pageNum: 1, pageSize: 999 }, data => { + this.companyArray = data['return_data']['list']; + }); + } + // 查询订单状态数据 + this.commonsService.getDictionary('ORDER_OIL_STATUS', data => { + this.orderStatusArray = data['return_data']; + }); + this.getRequest(true, this.searchForm.value); } - whereObject['pageNum'] = this.pageNum; - whereObject['pageSize'] = this.pageSize; - this.order.getDiscountPackageList(whereObject, data => { - if (data['return_code'] === '000000') { - this.requestData = data['return_data'].list; - this.total = data['return_data'].total; - } else { - this.message.error(data['return_msg']); - } - }); - } - // 查询商户 - public getMerchantListByCompany(companyId: number): void { - this.merchant.getMerchantListByCompany(companyId, data => { - if (data['return_code'] === '000000') { - if (data['return_code'] === '000000') { - this.merchantData = data['return_data']; - } else { - this.message.error(data['return_msg']); + // 查询列表 + public getRequest(reset: boolean = false, whereObject: object) { + this.loading = true; + if (reset) { + this.pageNum = 1; } - } else { - this.message.error(data['return_msg']); - } - }); - } - - // 重置 - public resetForm(): void { - this.searchForm.reset(); - } - - - // 查看详情 - public getDetail(id: number): void { - this.router.navigate(['/admin/order/order-detail'], { - queryParams: { - merchantId: id - } - }).then(r => console.log(r)); - } - - // 下载模板 - downloadTemplate(whereObject) { - if (whereObject['payTime'] != null && whereObject['payTime'].length !== 0) { - whereObject['payTimeS'] = whereObject['payTime'][0].getTime(); - whereObject['payTimeE'] = whereObject['payTime'][1].getTime(); + whereObject['pageNum'] = this.pageNum; + whereObject['pageSize'] = this.pageSize; + this.hltOrderService.getOrderList(whereObject, data => { + this.loading = false; + if (data['return_code'] === '000000') { + console.log(data); + this.requestData = data['return_data'].list; + this.total = data['return_data'].total; + } else { + this.message.error(data['return_msg']); + } + }); } - this.order.exportDiscountPackageList(whereObject, data => { - if (data['return_code'] === '000000') { - window.location.href = this.FILE_URL + data['return_data']; - } else { - this.message.error(data['return_msg']); - } - }); - } - - provinceChange(e) { - console.log(e); - } - // 退款 - public orderToRefund(id): void { - - } - - showModal(id): void { - this.id = id; - this.isVisible = true; - } - - handleOk(): void { - this.common.showConfirm('确认订单是否退款', item => { - if (item) { - const params = { - orderId: this.id , - refundContent: this.refundContent - }; - this.order.refuelingOrderRefund(params, data => { - if (data['return_code'] === '000000') { - this.getRequest(false, this.searchForm.value); - this.isVisible = false; - this.message.success('退款成功'); - } else { - this.message.error(data['return_msg']); - } + // 展示订单详情 + public showOrderDetail(orderNo: string) { + this.orderDetailModal = true; + this.orderDetailModalLoading = true; + this.hltOrderService.getOrderDetail(orderNo, data => { + if (data['return_code'] === '000000') { + this.orderDetailObject = data['return_data']; + } else { + this.message.error(data['return_msg']); + } + this.orderDetailModalLoading = false; }); - } - }); - } - handleCancel(): void { - this.isVisible = false; - } + } + } diff --git a/src/app/admin/recharge-order/price-list/price-list.component.html b/src/app/admin/recharge-order/price-list/price-list.component.html index 94832d5..71209ff 100644 --- a/src/app/admin/recharge-order/price-list/price-list.component.html +++ b/src/app/admin/recharge-order/price-list/price-list.component.html @@ -196,18 +196,18 @@ - - - - - - - - - - - - + + 展示平台 + + + + + + 充值平台 @@ -216,18 +216,18 @@ - - - - - - - - - - - - + + 支付方式 + + + + + + 充值方式 @@ -238,41 +238,41 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + 折扣比例 + + + + + + 积分支付比例 + + + + 排序 diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index c33db19..ec0d827 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -1,6 +1,7 @@ export const environment = { production: true, baseUrl: 'https://hsg.dctpay.com/brest/', // 正式环境服务器地址(请求数据地址) + orderUrl: 'https://hsg.dctpay.com/order/', // 测试环境服务器地址(请求数据地址) imageUrl: 'https://hsg.dctpay.com/filesystem/', key: 'https://hsg.dctpay.com/phone-recharge-H5/index.html?codeValue=', inviteUrl: 'https://hsg.dctpay.com/wx/?action=ic&id=', diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 76173d9..a6fe2c1 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://hsg.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址) + orderUrl: 'https://hsg.dctpay.com/order/', // 测试环境服务器地址(请求数据地址) key: 'https://hsgcs.dctpay.com/phone-recharge-H5/index.html?codeValue=', inviteUrl: 'https://hsgcs.dctpay.com/wx/?action=ic&id=', }; From 600b1ca0ffdd8cedb6e580dea3ef18c861b31419 Mon Sep 17 00:00:00 2001 From: Sum1Dream <418471657@qq.com> Date: Tue, 7 Feb 2023 10:21:19 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=90=86?= =?UTF-8?q?=E5=95=86=E8=AE=A2=E5=8D=95=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hlt-charge-order.component.html | 236 ++++++++++++++++++ .../hlt-charge-order.component.scss | 3 + .../hlt-charge-order.component.ts | 151 +++++++++++ src/app/services/order/hlt-order.service.ts | 43 ++++ 4 files changed, 433 insertions(+) create mode 100644 src/app/admin/order-manage/hlt-charge-order/hlt-charge-order.component.html create mode 100644 src/app/admin/order-manage/hlt-charge-order/hlt-charge-order.component.scss create mode 100644 src/app/admin/order-manage/hlt-charge-order/hlt-charge-order.component.ts create mode 100644 src/app/services/order/hlt-order.service.ts diff --git a/src/app/admin/order-manage/hlt-charge-order/hlt-charge-order.component.html b/src/app/admin/order-manage/hlt-charge-order/hlt-charge-order.component.html new file mode 100644 index 0000000..4b54738 --- /dev/null +++ b/src/app/admin/order-manage/hlt-charge-order/hlt-charge-order.component.html @@ -0,0 +1,236 @@ + + + + + + +
+
+
+
+ +
+ + 交易单号 + + + + +
+ +
+ + 客户电话 + + + + +
+
+ + 交易状态 + + + + + + +
+
+ +
+
+ + 分公司 + + + + + + +
+ +
+ + 支付方式 + + + + + + + + + + + + +
+
+ + 支付卡号 + + + + +
+
+ + 支付时间 + + + + +
+ +
+ + 创建时间 + + + + +
+ +
+ + 退款时间 + + + + +
+
+ +
+
+
+ + + +
+ 共计 {{total?total:0}} 条数据 + + + + + + + 交易单号 + 客户电话 + 订单名称 + 订单金额 + 支付金额 + 支付方式 + 订单状态 + 创建时间 + 操作 + + + + + {{data.orderNo}} + {{data.memPhone}} + {{data.title}} + ￥{{data.totalPrice}} + ￥{{data.payPrice}} + {{data.orderStatus == 1 || data.orderStatus == 5 ? '未支付' : data.payType | orderPayType}} + {{data.orderStatus | orderStatus}} + {{data.createTime | date : 'yyyy-MM-dd HH:mm:ss'}} + + 操作列表 + + + + + + + +
+ + + + + + + + {{orderDetailObject.tradeOrder.orderNo}} + {{orderDetailObject.tradeOrder.paySerialNo!=null?orderDetailObject.tradeOrder.paySerialNo:'无'}} + {{orderDetailObject.tradeOrder.memPhone}} + {{orderDetailObject.tradeOrder.orderStatus | orderStatus}} + {{orderDetailObject.tradeOrder.payType | orderPayType}} + + {{orderDetailObject.tradeOrder.memCardNo}} + + {{orderDetailObject.tradeOrder.memDiscountName?orderDetailObject.tradeOrder.memDiscountName:'无'}} + {{orderDetailObject.tradeOrder.whetherRebate?'是':'否'}} + {{orderDetailObject.tradeOrder.remarks}} + + + + + {{orderDetailObject.tradeOrder.totalPrice}} 元 + {{orderDetailObject.tradeOrder.totalDeductionPrice}} 元 + {{orderDetailObject.tradeOrder.deductionProductPrice}} 元 + {{orderDetailObject.tradeOrder.deductionCouponPrice}} 元 + {{orderDetailObject.tradeOrder.payablePrice}} 元 + {{orderDetailObject.tradeOrder.payGold / 100}} 元 + + {{orderDetailObject.tradeOrder.payRealPrice!=null?orderDetailObject.tradeOrder.payRealPrice+' 元':'未支付'}} + + + + + + + +

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

+

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

+ + +

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

+

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

+ + 支付时间：{{orderDetailObject.tradeOrder.payTime | date : 'yyyy-MM-dd HH:mm:ss'}} + 完成时间：{{orderDetailObject.tradeOrder.finishTime | date : 'yyyy-MM-dd HH:mm:ss'}} + 退款时间：{{orderDetailObject.tradeOrder.refundTime | date : 'yyyy-MM-dd HH:mm:ss'}} + + + + + + diff --git a/src/app/admin/order-manage/hlt-charge-order/hlt-charge-order.component.scss b/src/app/admin/order-manage/hlt-charge-order/hlt-charge-order.component.scss new file mode 100644 index 0000000..363c972 --- /dev/null +++ b/src/app/admin/order-manage/hlt-charge-order/hlt-charge-order.component.scss @@ -0,0 +1,3 @@ +img { + width: 60px; +} diff --git a/src/app/admin/order-manage/hlt-charge-order/hlt-charge-order.component.ts b/src/app/admin/order-manage/hlt-charge-order/hlt-charge-order.component.ts new file mode 100644 index 0000000..b7c4bcc --- /dev/null +++ b/src/app/admin/order-manage/hlt-charge-order/hlt-charge-order.component.ts @@ -0,0 +1,151 @@ +import { Component, OnInit } from '@angular/core'; +import {FormBuilder, FormGroup} from '_@angular_forms@9.0.7@@angular/forms'; +import {environment} from '../../../../environments/environment'; +import {LocalStorageService} from '../../../services/local-storage.service'; +import {NzMessageService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd'; +import {OrderThirdPartyService} from '../../../services/order/order-third-party.service'; +import {CompanyService} from '../../../services/company.service'; +import {CommonsService} from '../../../services/commons.service'; +import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace'; +import {animate, state, style, transition, trigger} from '_@angular_animations@9.0.7@@angular/animations'; +import {HltOrderService} from "../../../services/order/hlt-order.service"; + +@Component({ + selector: 'app-hlt-charge-order', + animations: [ + trigger('openClose', [ + state('open', style({ + height: '260px', + opacity: 1, + backgroundColor: 'white' + })), + state('closed', style({ + opacity: 1, + backgroundColor: 'white' + })), + transition('open => closed', [ + animate('0.3s') + ]), + transition('closed => open', [ + animate('0.3s') + ]), + ]), + ], + templateUrl: './hlt-charge-order.component.html', + styleUrls: ['./hlt-charge-order.component.scss'] +}) +export class HltChargeOrderComponent implements OnInit { + + + + // 搜索框 + searchForm: FormGroup; + // 搜索框折叠 + isCollapse = false; + // 订单状态数据 + orderStatusArray = []; + // 公司数据 + companyArray = []; + // 角色类型 + roleType: number; + // 列表相关参数 + // 总条数 + total: number; + // 页码 + pageNum = 1; + // 条码 + pageSize = 10; + // 列表数据 + requestData = []; + // 列表加载 + loading = true; + // 订单详情相关参数 + // 详情模态框 + orderDetailModal = false; + // 详情模态框数据等待 + orderDetailModalLoading = false; + // 订单详情数据 + orderDetailObject: any = { + tradeOrder: {}, + }; + // 数据加载中参数 + loadingObject = { + title: '加载中...', + status: false, + }; + // 请求地址参数 + FILE_URL = environment.imageUrl; + constructor( + private form: FormBuilder, + private store: LocalStorageService, + private message: NzMessageService, + private hltOrderService: HltOrderService, + private companyService: CompanyService, + private commonsService: CommonsService, + ) { } + + ngOnInit(): void { + // 搜索表单初始化 + this.searchForm = this.form.group({ + orderNo: [null], + memPhone: [null], + payTimeArray: [null], + orderStatus: [null], + createTimeArray: [null], + refundTimeArray: [null], + companyId: [null], + payType: [null], + memCardNo: [null], + productType: [8], + }); + // 角色类型初始化 + this.roleType = Number(this.store.get(ADMIN_INFO_OBJECT)['secRole'].roleType); + // 查询公司列表 + if (this.roleType === 0 || this.roleType === 1) { + this.companyService.selectCompanyList({ pageNum: 1, pageSize: 999 }, data => { + this.companyArray = data['return_data']['list']; + }); + } + // 查询订单状态数据 + this.commonsService.getDictionary('ORDER_OIL_STATUS', data => { + this.orderStatusArray = data['return_data']; + }); + this.getRequest(true, this.searchForm.value); + } + + // 查询列表 + public getRequest(reset: boolean = false, whereObject: object) { + this.loading = true; + if (reset) { + this.pageNum = 1; + } + whereObject['pageNum'] = this.pageNum; + whereObject['pageSize'] = this.pageSize; + this.hltOrderService.getOrderList(whereObject, data => { + this.loading = false; + if (data['return_code'] === '000000') { + console.log(data); + this.requestData = data['return_data'].list; + this.total = data['return_data'].total; + } else { + this.message.error(data['return_msg']); + } + }); + } + + // 展示订单详情 + public showOrderDetail(orderNo: string) { + this.orderDetailModal = true; + this.orderDetailModalLoading = true; + this.hltOrderService.getOrderDetail(orderNo, data => { + if (data['return_code'] === '000000') { + this.orderDetailObject = data['return_data']; + } else { + this.message.error(data['return_msg']); + } + this.orderDetailModalLoading = false; + }); + + } + +} diff --git a/src/app/services/order/hlt-order.service.ts b/src/app/services/order/hlt-order.service.ts new file mode 100644 index 0000000..eaa97c9 --- /dev/null +++ b/src/app/services/order/hlt-order.service.ts @@ -0,0 +1,43 @@ +import { Injectable } from '@angular/core'; +import {HttpClient} from '_@angular_common@9.0.7@@angular/common/http'; +import {CommonsService} from '../commons.service'; +import {environment} from '../../../environments/environment'; + +@Injectable({ + providedIn: 'root' +}) +export class HltOrderService { + + constructor( + private http: HttpClient, + private common: CommonsService + ) { } + + /** + * @Author Sum1Dream + * @methodName getOrderKfcList + * @Description // 查询肯德基订单 + * @Date 17:20 2022/10/27 + * @Param param + */ + public getOrderList(param: object, callBack) { + this.http.get(environment.orderUrl + 'hltRecharge/getOrderList?' + this.common.getWhereCondition(param)).subscribe(data => { + callBack(data); + }); + } + + /** + * @Author Sum1Dream + * @methodName getOrderDetail + * @Description // 根据订单号查询订单详情 + * @Date 14:38 2022/10/28 + * @Param orderNo: string, callBack + */ + public getOrderDetail(orderNo: string, callBack) { + this.http.get(environment.orderUrl + 'hltRecharge/getOrderDetail?orderNo=' + orderNo).subscribe(data => { + callBack(data); + }); + } + + +}