提交代理商订单页面

src/app/admin/config-manage/third-product/third-product.component.html

@@ -105,7 +105,7 @@
             <nz-form-label [nzSpan]="6" nzRequired>卡券来源</nz-form-label>
             <nz-form-control [nzSpan]="16" nzErrorTip="请选择卡券来源!">
                 <nz-select nzShowSearch nzAllowClear formControlName="productId" nzPlaceHolder="请选择卡券来源！">
-                    <nz-option *ngFor="let item of couponSource" nzValue="{{item.codeValue}}" nzLabel="{{item.codeName}}"></nz-option>
+                    <nz-option *ngFor="let item of couponSource" [nzValue]="item.codeValue" nzLabel="{{item.codeName}}"></nz-option>
                 </nz-select>
             </nz-form-control>
         </nz-form-item>

src/app/admin/config-manage/third-product/third-product.component.ts

@@ -132,8 +132,10 @@ export class ThirdProductComponent implements OnInit {
             this.id = id;
             this.edit = true;
             this.apiProduct.findProductConfig(id, data => {
+                console.log(data);
                 data['return_data']['productPlatform'] = data['return_data']['productPlatformString'].substring(0 , data['return_data']['productPlatformString'].length - 1).split(',');
                 data['return_data']['payType'] = data['return_data']['productPayTypeString'].substring(0 , data['return_data']['productPayTypeString'].length - 1).split(',');
+                data['return_data']['productId'] = String(data['return_data']['productId']);
                 this.validateForm.patchValue(data['return_data']);
                 this.isVisible = true;
             });

src/app/admin/order-manage/hlt-charge-order/hlt-charge-order.component.ts

@@ -121,6 +121,19 @@ export class HltChargeOrderComponent implements OnInit {
         }
         whereObject['pageNum'] = this.pageNum;
         whereObject['pageSize'] = this.pageSize;
+        if (whereObject['payTimeArray'] != null && whereObject['payTimeArray'].length !== 0) {
+            whereObject['payTimeS'] = whereObject['payTimeArray'][0].getTime();
+            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();
+        }
+
+        if (whereObject['createTimeArray'] != null && whereObject['createTimeArray'].length !== 0) {
+            whereObject['createTimeS'] = whereObject['createTimeArray'][0].getTime();
+            whereObject['createTimeE'] = whereObject['createTimeArray'][1].getTime();
+        }
         this.hltOrderService.getOrderList(whereObject, data => {
             this.loading = false;
             if (data['return_code'] === '000000') {

src/app/admin/order-manage/kfc-order/kfc-order-list/kfc-order-list.component.ts

@@ -119,6 +119,19 @@ export class KfcOrderListComponent implements OnInit {
         }
         whereObject['pageNum'] = this.pageNum;
         whereObject['pageSize'] = this.pageSize;
+        if (whereObject['payTimeArray'] != null && whereObject['payTimeArray'].length !== 0) {
+            whereObject['payTimeS'] = whereObject['payTimeArray'][0].getTime();
+            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();
+        }
+
+        if (whereObject['createTimeArray'] != null && whereObject['createTimeArray'].length !== 0) {
+            whereObject['createTimeS'] = whereObject['createTimeArray'][0].getTime();
+            whereObject['createTimeE'] = whereObject['createTimeArray'][1].getTime();
+        }
         this.thirdPartyOrder.getOrderList(whereObject, data => {
             this.loading = false;
             if (data['return_code'] === '000000') {

src/app/admin/order-manage/member-charge-order/member-charge-order-list/member-charge-order-list.component.ts

@@ -118,6 +118,19 @@ export class MemberChargeOrderListComponent implements OnInit {
         }
         whereObject['pageNum'] = this.pageNum;
         whereObject['pageSize'] = this.pageSize;
+        if (whereObject['payTimeArray'] != null && whereObject['payTimeArray'].length !== 0) {
+            whereObject['payTimeS'] = whereObject['payTimeArray'][0].getTime();
+            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();
+        }
+
+        if (whereObject['createTimeArray'] != null && whereObject['createTimeArray'].length !== 0) {
+            whereObject['createTimeS'] = whereObject['createTimeArray'][0].getTime();
+            whereObject['createTimeE'] = whereObject['createTimeArray'][1].getTime();
+        }
         this.thirdPartyOrder.getOrderList(whereObject, data => {
             this.loading = false;
             if (data['return_code'] === '000000') {

src/app/admin/order-manage/mobile-recharge-order-list/mobile-recharge-order-list.component.html

@@ -208,8 +208,9 @@
             <nz-tab  nzTitle="充值信息">
                 <nz-descriptions nzBordered [nzColumn]="3" [nzSize]="'middle'">
                     <nz-descriptions-item nzTitle="运营商" >{{orderDetailObject.mobileOrder.operatorName}}</nz-descriptions-item>
-                    <nz-descriptions-item nzTitle="充值内容" >{{orderDetailObject.tradeOrder.title}}</nz-descriptions-item>
+                    <nz-descriptions-item nzTitle="充值号码" >{{orderDetailObject.mobileOrder.rechargeContent}}</nz-descriptions-item>
                     <nz-descriptions-item nzTitle="充值状态">{{orderDetailObject.mobileOrder.rechargeStatus | rechargeStatus}}</nz-descriptions-item>
+                    <nz-descriptions-item nzTitle="充值内容" >{{orderDetailObject.tradeOrder.title}}</nz-descriptions-item>
                 </nz-descriptions>
             </nz-tab>
             <nz-tab  nzTitle="支付信息">

src/app/admin/order-manage/mobile-recharge-order-list/mobile-recharge-order-list.component.ts

@@ -119,6 +119,19 @@ export class MobileRechargeOrderListComponent implements OnInit {
         }
         whereObject['pageNum'] = this.pageNum;
         whereObject['pageSize'] = this.pageSize;
+        if (whereObject['payTimeArray'] != null && whereObject['payTimeArray'].length !== 0) {
+            whereObject['payTimeS'] = whereObject['payTimeArray'][0].getTime();
+            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();
+        }
+
+        if (whereObject['createTimeArray'] != null && whereObject['createTimeArray'].length !== 0) {
+            whereObject['createTimeS'] = whereObject['createTimeArray'][0].getTime();
+            whereObject['createTimeE'] = whereObject['createTimeArray'][1].getTime();
+        }
         this.orderMobileRechargeService.getOrderList(whereObject, data => {
             this.loading = false;
             if (data['return_code'] === '000000') {

src/app/admin/order-manage/starbucks-order/starbucks-order-list/starbucks-order-list.component.ts

@@ -118,6 +118,19 @@ export class StarbucksOrderListComponent implements OnInit {
         }
         whereObject['pageNum'] = this.pageNum;
         whereObject['pageSize'] = this.pageSize;
+        if (whereObject['payTimeArray'] != null && whereObject['payTimeArray'].length !== 0) {
+            whereObject['payTimeS'] = whereObject['payTimeArray'][0].getTime();
+            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();
+        }
+
+        if (whereObject['createTimeArray'] != null && whereObject['createTimeArray'].length !== 0) {
+            whereObject['createTimeS'] = whereObject['createTimeArray'][0].getTime();
+            whereObject['createTimeE'] = whereObject['createTimeArray'][1].getTime();
+        }
         this.thirdPartyOrder.getOrderList(whereObject, data => {
             this.loading = false;
             if (data['return_code'] === '000000') {

src/app/pipes/recharge-price/recharge-platform.pipe.ts

@@ -18,6 +18,9 @@ export class RechargePlatformPipe implements PipeTransform {
             if (Number(i) === 3) {
                 string = string +  '城宇,';
             }
+            if (Number(i) === 4) {
+                string = string +  '嗨购,';
+            }
 
         }
         return string.substring(0 , string.length - 1);

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://hsg.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
-  orderUrl: 'https://hsg.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=',
 };