| {{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/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 @@
-
-
-
-
-
创建时间
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 c4e5026..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 = [
@@ -20,12 +20,13 @@ 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 },
{ 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/app/admin/recharge-order/price-list/price-list.component.html b/src/app/admin/recharge-order/price-list/price-list.component.html
index 95864b4..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
@@ -237,15 +237,7 @@
-
-
-
-
-
-
-
-
-
+
折扣比例
@@ -281,19 +273,7 @@
>
-
-
-
-
-
-
-
-
-
-
-
-
-
+
排序
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内容
*
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);
+ });
+ }
+
+
+}
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=',
};
|