分公司
diff --git a/src/app/admin/order-manage/mobile-recharge-order-list/mobile-recharge-order-list.component.ts b/src/app/admin/order-manage/mobile-recharge-order-list/mobile-recharge-order-list.component.ts
index 4e1bb54..b498f2a 100644
--- a/src/app/admin/order-manage/mobile-recharge-order-list/mobile-recharge-order-list.component.ts
+++ b/src/app/admin/order-manage/mobile-recharge-order-list/mobile-recharge-order-list.component.ts
@@ -125,8 +125,8 @@ export class MobileRechargeOrderListComponent implements OnInit {
whereObject['payTimeE'] = whereObject['payTimeArray'][1].getTime();
}
if (whereObject['refundTimeArray'] != null && whereObject['refundTimeArray'].length !== 0) {
- whereObject['payTimeS'] = whereObject['refundTimeArray'][0].getTime();
- whereObject['payTimeE'] = whereObject['refundTimeArray'][1].getTime();
+ whereObject['refundTimeS'] = whereObject['refundTimeArray'][0].getTime();
+ whereObject['refundTimeE'] = whereObject['refundTimeArray'][1].getTime();
}
if (whereObject['createTimeArray'] != null && whereObject['createTimeArray'].length !== 0) {
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 ba5dbd9..e63851b 100644
--- a/src/app/admin/order-manage/order-manage-routing.module.ts
+++ b/src/app/admin/order-manage/order-manage-routing.module.ts
@@ -12,6 +12,7 @@ import {DicountPackageOrderListComponent} from './dicount-package-order-list/dic
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';
+import {GoodsOrderComponent} from './goods-order/goods-order.component';
const routes: Routes = [
@@ -27,6 +28,7 @@ const routes: Routes = [
{ path: 'discount-use-condition-list', component: DiscountUseConditionListComponent },
{ path: 'discount-package-order-list', component: DicountPackageOrderListComponent},
{ path: 'hlt-order-list', component: HltChargeOrderComponent},
+ { path: 'goods-order', component: GoodsOrderComponent},
];
@NgModule({
diff --git a/src/app/admin/order-manage/order-manage.module.ts b/src/app/admin/order-manage/order-manage.module.ts
index 18ccb4d..dace081 100644
--- a/src/app/admin/order-manage/order-manage.module.ts
+++ b/src/app/admin/order-manage/order-manage.module.ts
@@ -21,20 +21,23 @@ 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';
+import { GoodsOrderComponent } from './goods-order/goods-order.component';
+import {PreviewImageModule} from "../../common/preview-image/preview-image.module";
@NgModule({
- declarations: [OrderOilListComponent, OrderCouponListComponent, OrderIntegralRechargeComponent, OrderRefundListComponent, KfcOrderListComponent, StarbucksOrderListComponent, MemberChargeOrderListComponent, MobileRechargeOrderListComponent, PreOrderComponent,DicountPackageOrderListComponent, MemberChargeOrderListComponent, DiscountUseConditionListComponent, HltChargeOrderComponent],
- imports: [
- CommonModule,
- OrderManageRoutingModule,
- NgZorroAntdModule,
- SeparateModule,
- ReactiveFormsModule,
- FormsModule,
- BreadcrumbModule,
- RegionSelectorModule,
- AppCommonModule,
- NzSpaceModule
- ]
+ declarations: [OrderOilListComponent, OrderCouponListComponent, OrderIntegralRechargeComponent, OrderRefundListComponent, KfcOrderListComponent, StarbucksOrderListComponent, MemberChargeOrderListComponent, MobileRechargeOrderListComponent, PreOrderComponent,DicountPackageOrderListComponent, MemberChargeOrderListComponent, DiscountUseConditionListComponent, HltChargeOrderComponent, GoodsOrderComponent],
+ imports: [
+ CommonModule,
+ OrderManageRoutingModule,
+ NgZorroAntdModule,
+ SeparateModule,
+ ReactiveFormsModule,
+ FormsModule,
+ BreadcrumbModule,
+ RegionSelectorModule,
+ AppCommonModule,
+ NzSpaceModule,
+ PreviewImageModule
+ ]
})
export class OrderManageModule { }
diff --git a/src/app/admin/order-manage/starbucks-order/starbucks-order-list/starbucks-order-list.component.ts b/src/app/admin/order-manage/starbucks-order/starbucks-order-list/starbucks-order-list.component.ts
index f873bc8..11044c2 100644
--- a/src/app/admin/order-manage/starbucks-order/starbucks-order-list/starbucks-order-list.component.ts
+++ b/src/app/admin/order-manage/starbucks-order/starbucks-order-list/starbucks-order-list.component.ts
@@ -123,8 +123,8 @@ export class StarbucksOrderListComponent implements OnInit {
whereObject['payTimeE'] = whereObject['payTimeArray'][1].getTime();
}
if (whereObject['refundTimeArray'] != null && whereObject['refundTimeArray'].length !== 0) {
- whereObject['payTimeS'] = whereObject['refundTimeArray'][0].getTime();
- whereObject['payTimeE'] = whereObject['refundTimeArray'][1].getTime();
+ whereObject['refundTimeS'] = whereObject['refundTimeArray'][0].getTime();
+ whereObject['refundTimeE'] = whereObject['refundTimeArray'][1].getTime();
}
if (whereObject['createTimeArray'] != null && whereObject['createTimeArray'].length !== 0) {
diff --git a/src/app/admin/system/system-user/system-user.component.html b/src/app/admin/system/system-user/system-user.component.html
index 4334564..1cbc9ff 100644
--- a/src/app/admin/system/system-user/system-user.component.html
+++ b/src/app/admin/system/system-user/system-user.component.html
@@ -147,6 +147,13 @@
+
+ 渠道商商户号
+
+
+
+
+
通知权限
@@ -245,6 +252,13 @@
+
+ 渠道商商户号
+
+
+
+
+
通知权限
diff --git a/src/app/admin/system/system-user/system-user.component.ts b/src/app/admin/system/system-user/system-user.component.ts
index 86a6b3f..977cb77 100644
--- a/src/app/admin/system/system-user/system-user.component.ts
+++ b/src/app/admin/system/system-user/system-user.component.ts
@@ -90,6 +90,7 @@ export class SystemUserComponent implements OnInit {
password: [null, [Validators.required, ValidatorsService.minLength(6), ValidatorsService.maxLength(40)]],
telephone: [null],
label: [null],
+ ext3: [null],
roleId: [null, [Validators.required]],
});
@@ -209,6 +210,7 @@ export class SystemUserComponent implements OnInit {
password: value.password,
telephone: value.telephone,
roleId: value.roleId,
+ ext3: value.ext3,
labelIdArray: value.label
};
this.isOkLoading = true;
@@ -264,6 +266,7 @@ export class SystemUserComponent implements OnInit {
this.secUser.telephone = value.telephone;
this.secUser.roleId = value.roleId;
this.secUser.labelIdArray = value.label;
+ this.secUser.ext3 = value.ext3;
this.http.post(this.WEB_SERVE_URL + '/secUser/editUser', this.secUser).subscribe(data => {
if (data['return_code'] === '000000') {
diff --git a/src/app/app-common.module.ts b/src/app/app-common.module.ts
index 4bcbd61..9a536ce 100644
--- a/src/app/app-common.module.ts
+++ b/src/app/app-common.module.ts
@@ -72,10 +72,12 @@ import {
ProductConfigPipe,
PayCouponStatusPipe,
OrderOilChannelTypePipe,
- VerifyProductTypePipe
+ VerifyProductTypePipe,
} from './pipes';
import {MsgTypePipe} from './pipes/msg/msg-type.pipe';
import { OrderProductTypePipe } from './pipes/order/order-product-type.pipe';
+import { LogisticsStatusPipe } from './pipes/goods/logistics-status.pipe';
+import { GoodsStatusPipe } from './pipes/goods/goods-status.pipe';
@@ -147,7 +149,9 @@ const PIPES = [
MsgTypePipe,
OrderOilChannelTypePipe,
VerifyProductTypePipe,
+ LogisticsStatusPipe,
OrderProductTypePipe,
+ GoodsStatusPipe
];
@@ -161,6 +165,7 @@ const PIPES = [
],
declarations: [
...PIPES,
+
],
exports: [
diff --git a/src/app/pipes/audit-type.pipe.ts b/src/app/pipes/audit-type.pipe.ts
index 6d4a02a..bb285a1 100644
--- a/src/app/pipes/audit-type.pipe.ts
+++ b/src/app/pipes/audit-type.pipe.ts
@@ -13,6 +13,8 @@ export class AuditTypePipe implements PipeTransform {
return '卡卷价格审批';
case 3:
return '卡券分发审批';
+ case 4:
+ return '实物审批';
}
}
}
diff --git a/src/app/pipes/index.ts b/src/app/pipes/index.ts
index 864f080..646de1c 100644
--- a/src/app/pipes/index.ts
+++ b/src/app/pipes/index.ts
@@ -61,3 +61,5 @@ export * from './order/pay-coupon-status.pipe';
export * from './order/order-oil-channel-type.pipe';
export * from './apiMerchant/verify-product-type.pipe';
export * from './order/order-product-type.pipe';
+export * from './goods/logistics-status.pipe';
+export * from './goods/goods-status.pipe';
diff --git a/src/app/pipes/integral/integral-type.pipe.ts b/src/app/pipes/integral/integral-type.pipe.ts
index 9663a1b..c78398e 100644
--- a/src/app/pipes/integral/integral-type.pipe.ts
+++ b/src/app/pipes/integral/integral-type.pipe.ts
@@ -25,6 +25,10 @@ export class IntegralTypePipe implements PipeTransform {
return '汇联通充值';
case 9:
return '话费充值';
+ case 101:
+ return '普通支付';
+ case 102:
+ return '支付差价';
}
}
diff --git a/src/app/pipes/order/order-child-goods-type.pipe.ts b/src/app/pipes/order/order-child-goods-type.pipe.ts
index 4df2cef..497db50 100644
--- a/src/app/pipes/order/order-child-goods-type.pipe.ts
+++ b/src/app/pipes/order/order-child-goods-type.pipe.ts
@@ -27,6 +27,8 @@ export class OrderChildGoodsTypePipe implements PipeTransform {
return '星巴克';
case 10:
return '第三方充值';
+ case 12:
+ return '实物商品';
}
}
}
diff --git a/src/app/pipes/third-product/product-type.pipe.ts b/src/app/pipes/third-product/product-type.pipe.ts
index 99ed7fd..9947c43 100644
--- a/src/app/pipes/third-product/product-type.pipe.ts
+++ b/src/app/pipes/third-product/product-type.pipe.ts
@@ -14,6 +14,7 @@ export class ProductTypePipe implements PipeTransform {
6: [''],
7: ['优惠券包'],
8: ['汇联通充值'],
+ 10: ['实物购买'],
};
transform(type: number , product: number): string {
diff --git a/src/app/services/commons.service.ts b/src/app/services/commons.service.ts
index cbb611a..24a777e 100644
--- a/src/app/services/commons.service.ts
+++ b/src/app/services/commons.service.ts
@@ -183,6 +183,12 @@ export class CommonsService {
});
}
+ public getIndustry(callback): any {
+ this.http.get(environment.baseUrl + '/common/getIndustry').subscribe( data => {
+ callback(data);
+ });
+ }
+
public mappingSysNameOl(codeType: string , callback): any {
this.http.get(environment.baseUrl + '/common/getDictionaryByCodeTypeOl?codeType=' + codeType).subscribe( data => {
callback(data);
@@ -413,17 +419,43 @@ export class CommonsService {
// 拼接图片内容
public stitchImg(imgUrl: string): any {
- const img = imgUrl;
const imgArray = [];
- imgArray.push(
- {
- uid: 1,
- name: img,
- status: 'done',
- url: environment.imageUrl + img
- });
+ for (const i of imgUrl.split(',')) {
+ imgArray.push(
+ {
+ uid: 1,
+ name: i,
+ status: 'done',
+ url: environment.imageUrl + i
+ });
+ }
+ console.log(imgArray);
return imgArray;
}
+ public postImg(imgArray: any): any {
+ const array = [];
+ for (const i of imgArray) {
+ if (i['response'] != null) {
+ array.push(i['response']['return_data'][0]);
+ } else {
+ array.push(i.name);
+ }
+ }
+
+ return array.join(',');
+ }
+
+ /**
+ * @Author Sum1Dream
+ * @methodName getRegional
+ * @Description // 获取区域信息
+ * @Date 17:23 2023/4/14
+ */
+ public getRegional(callback): any {
+ this.http.get(environment.baseUrl + 'common/getRegional').subscribe(data => {
+ callback(data);
+ });
+ }
}
diff --git a/src/app/services/order/order-third-party.service.ts b/src/app/services/order/order-third-party.service.ts
index 61a6e93..ce83b0d 100644
--- a/src/app/services/order/order-third-party.service.ts
+++ b/src/app/services/order/order-third-party.service.ts
@@ -52,4 +52,6 @@ export class OrderThirdPartyService {
callBack(data);
});
}
+
+
}
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 54aeb74..1440ff1 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -5,7 +5,9 @@
export const environment = {
production: false,
baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址)
- orderUrl: 'https://hsgcs.dctpay.com/order/', // 测试环境服务器地址(请求数据地址)
+ orderUrl: 'http://localhost:9304/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=',