提交代码

src/app/admin/discount/discount-edit/discount-edit.component.html

@@ -12,6 +12,28 @@
 <nz-content class="inner-content">
     <form nz-form [formGroup]="validateForm" class="ant-advanced-search-form">
         <div nz-row [nzGutter]="24">
+            <div nz-col [nzSpan]="8">
+                <nz-form-item>
+                    <nz-form-label [nzFor]="'discountName'" nzRequired>平台</nz-form-label>
+                    <nz-form-control nzErrorTip="请选择平台!">
+                        <nz-select nzPlaceHolder="请选择优惠券类型"  [formControlName]="'discountType'">
+                            <nz-option nzValue="HSG" nzLabel="嗨森逛"></nz-option>
+                            <nz-option nzValue="GRATIA_PAY" nzLabel="惠支付"></nz-option>
+                        </nz-select>
+                    </nz-form-control>
+                </nz-form-item>
+            </div>
+            <div nz-col [nzSpan]="8">
+                <nz-form-item>
+                    <nz-form-label [nzFor]="'discountName'" nzRequired>门店id</nz-form-label>
+                    <nz-form-control nzErrorTip="请选择平台!">
+                        <nz-select nzPlaceHolder="请选择优惠券类型"  [formControlName]="'discountType'">
+                            <nz-option nzValue="HSG" nzLabel="嗨森逛"></nz-option>
+                            <nz-option nzValue="GRATIA_PAY" nzLabel="惠支付"></nz-option>
+                        </nz-select>
+                    </nz-form-control>
+                </nz-form-item>
+            </div>
             <div nz-col [nzSpan]="8">
                 <nz-form-item>
                     <nz-form-label [nzFor]="'discountName'" nzRequired>优惠券名称</nz-form-label>

src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.html

@@ -34,6 +34,34 @@
                         </nz-form-control>
                     </nz-form-item>
                 </div>
+
+                <div nz-col nzSpan="8">
+                    <nz-form-item>
+                        <nz-form-label [nzSpan]="8">创建时间</nz-form-label>
+                        <nz-form-control [nzSpan]="14">
+                            <nz-range-picker [nzShowTime]="{ nzFormat: 'yyyy-MM-dd HH:mm:ss' }" formControlName="createTime"></nz-range-picker>
+                        </nz-form-control>
+                    </nz-form-item>
+                </div>
+
+                <div nz-col nzSpan="8">
+                    <nz-form-item>
+                        <nz-form-label [nzSpan]="8">支付时间</nz-form-label>
+                        <nz-form-control [nzSpan]="14">
+                            <nz-range-picker [nzShowTime]="{ nzFormat: 'yyyy-MM-dd HH:mm:ss' }" formControlName="payTime"></nz-range-picker>
+                        </nz-form-control>
+                    </nz-form-item>
+                </div>
+
+                <div nz-col nzSpan="8">
+                    <nz-form-item>
+                        <nz-form-label [nzSpan]="8">完成时间</nz-form-label>
+                        <nz-form-control [nzSpan]="14">
+                            <nz-range-picker [nzShowTime]="{ nzFormat: 'yyyy-MM-dd HH:mm:ss' }" formControlName="finishTime"></nz-range-picker>
+                        </nz-form-control>
+                    </nz-form-item>
+                </div>
+
             </div>
 
             <div nz-row *ngIf="isCollapse">
@@ -109,33 +137,6 @@
                         </nz-form-control>
                     </nz-form-item>
                 </div>
-
-                <div nz-col nzSpan="8">
-                    <nz-form-item>
-                        <nz-form-label [nzSpan]="8">创建时间</nz-form-label>
-                        <nz-form-control [nzSpan]="14">
-                            <nz-range-picker [nzShowTime]="{ nzFormat: 'yyyy-MM-dd HH:mm:ss' }" formControlName="createTime"></nz-range-picker>
-                        </nz-form-control>
-                    </nz-form-item>
-                </div>
-
-                <div nz-col nzSpan="8">
-                    <nz-form-item>
-                        <nz-form-label [nzSpan]="8">支付时间</nz-form-label>
-                        <nz-form-control [nzSpan]="14">
-                            <nz-range-picker [nzShowTime]="{ nzFormat: 'yyyy-MM-dd HH:mm:ss' }" formControlName="payTime"></nz-range-picker>
-                        </nz-form-control>
-                    </nz-form-item>
-                </div>
-
-                <div nz-col nzSpan="8">
-                    <nz-form-item>
-                        <nz-form-label [nzSpan]="8">完成时间</nz-form-label>
-                        <nz-form-control [nzSpan]="14">
-                            <nz-range-picker [nzShowTime]="{ nzFormat: 'yyyy-MM-dd HH:mm:ss' }" formControlName="finishTime"></nz-range-picker>
-                        </nz-form-control>
-                    </nz-form-item>
-                </div>
             </div>
 
             <div nz-row>

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

@@ -58,6 +58,18 @@ export class OrderCouponListComponent implements OnInit {
 
 
   ngOnInit(): void {
+    let currentDate = new Date();
+    currentDate.setHours(0);
+    currentDate.setMinutes(0);
+    currentDate.setSeconds(0);
+    let createTimeS = currentDate.getTime();
+
+    currentDate.setHours(23);
+    currentDate.setMinutes(59);
+    currentDate.setSeconds(59);
+    let createTimeE = currentDate.getTime();
+    this.whereObject = { createTimeS: createTimeS, createTimeE: createTimeE};
+
     this.searchForm = this.form.group({
       companyId: [null],
       orderNo: [null],
@@ -67,7 +79,7 @@ export class OrderCouponListComponent implements OnInit {
       couponName: [null],
       payType: [null],
       orderStatus: [null],
-      createTime: [null],
+      createTime: [[createTimeS,createTimeE]],
       payTime: [null],
       finishTime: [null],
     });
@@ -105,16 +117,16 @@ export class OrderCouponListComponent implements OnInit {
    */
   search(whereObject: object) {
     if (whereObject['createTime'] != null) {
-      whereObject['createTimeS'] = whereObject['createTime'][0].getTime();
+      whereObject['createTimeS'] = new Date(whereObject['createTime'][0]).getTime();
-      whereObject['createTimeE'] = whereObject['createTime'][1].getTime();
+      whereObject['createTimeE'] = new Date(whereObject['createTime'][1]).getTime();
     } else {
       whereObject['createTimeS'] = null;
       whereObject['createTimeE'] = null;
     }
 
     if (whereObject['payTime'] != null) {
-      whereObject['payTimeS'] = whereObject['payTime'][0].getTime();
+      whereObject['payTimeS'] = new Date(whereObject['payTime'][0]).getTime();
-      whereObject['payTimeE'] = whereObject['payTime'][1].getTime();
+      whereObject['payTimeE'] = new Date(whereObject['payTime'][1]).getTime();
     } else {
       whereObject['payTimeS'] = null;
       whereObject['payTimeE'] = null;

src/app/admin/order-manage/order-integral-recharge/order-integral-recharge.component.html

@@ -37,9 +37,7 @@
                         </nz-form-control>
                     </nz-form-item>
                 </div>
-            </div>
 
-            <div nz-row *ngIf="isCollapse">
                 <div nz-col nzSpan="8">
                     <nz-form-item>
                         <nz-form-label [nzSpan]="8">支付方式</nz-form-label>
@@ -77,11 +75,30 @@
 
             </div>
 
+            <div nz-row *ngIf="isCollapse">
+ <!--               <div nz-col nzSpan="8">
+                    <nz-form-item>
+                        <nz-form-label [nzSpan]="8">支付方式</nz-form-label>
+                        <nz-form-control [nzSpan]="14">
+                            <nz-select nzAllowClear formControlName="payType">
+                                <nz-option nzValue="1" nzLabel="支付宝"></nz-option>
+                                <nz-option nzValue="2" nzLabel="微信"></nz-option>
+                                <nz-option nzValue="3" nzLabel="积分抵扣"></nz-option>
+                                <nz-option nzValue="4" nzLabel="汇联通工会卡"></nz-option>
+                                <nz-option nzValue="5" nzLabel="银联"></nz-option>
+                                <nz-option nzValue="6" nzLabel="银联分期"></nz-option>
+                                <nz-option nzValue="7" nzLabel="嗨森逛油卡"></nz-option>
+                            </nz-select>
+                        </nz-form-control>
+                    </nz-form-item>
+                </div>-->
+            </div>
+
             <div nz-row>
                 <div nz-col nzSpan="24" class="search-button">
                     <button nz-button nzType="primary"><i nz-icon nzType="search" nzTheme="outline"></i>搜索</button>
                     <button nz-button nzType="default" (click)="resetForm()"><i nz-icon nzType="reload" nzTheme="outline"></i>重置</button>
-                    <a class="collapse" (click)="toggleCollapse()">更多条件<i nz-icon [nzType]="!isCollapse ? 'down' : 'up'"></i></a>
+<!--                    <a class="collapse" (click)="toggleCollapse()">更多条件<i nz-icon [nzType]="!isCollapse ? 'down' : 'up'"></i></a>-->
                 </div>
             </div>
         </form>

src/app/admin/order-manage/order-integral-recharge/order-integral-recharge.component.ts

@@ -53,13 +53,25 @@ export class OrderIntegralRechargeComponent implements OnInit {
 
 
   ngOnInit(): void {
+    let currentDate = new Date();
+    currentDate.setHours(0);
+    currentDate.setMinutes(0);
+    currentDate.setSeconds(0);
+    let createTimeS = currentDate.getTime();
+
+    currentDate.setHours(23);
+    currentDate.setMinutes(59);
+    currentDate.setSeconds(59);
+    let createTimeE = currentDate.getTime();
+    this.whereObject = { createTimeS: createTimeS, createTimeE: createTimeE};
+
     this.searchForm = this.form.group({
       orderNo: [null],
       memPhone: [null],
       couponName: [null],
       payType: [null],
       status: [null],
-      createTime: [null],
+      createTime: [[createTimeS,createTimeE]],
       payTime: [null],
       finishTime: [null],
     });
@@ -89,24 +101,24 @@ export class OrderIntegralRechargeComponent implements OnInit {
    */
   search(whereObject: object) {
     if (whereObject['createTime'] != null) {
-      whereObject['createTimeS'] = whereObject['createTime'][0].getTime();
+      whereObject['createTimeS'] = new Date(whereObject['createTime'][0]).getTime();
-      whereObject['createTimeE'] = whereObject['createTime'][1].getTime();
+      whereObject['createTimeE'] = new Date(whereObject['createTime'][1]).getTime();
     } else {
       whereObject['createTimeS'] = null;
       whereObject['createTimeE'] = null;
     }
 
     if (whereObject['payTime'] != null) {
-      whereObject['payTimeS'] = whereObject['payTime'][0].getTime();
+      whereObject['payTimeS'] = new Date(whereObject['payTime'][0]).getTime();
-      whereObject['payTimeE'] = whereObject['payTime'][1].getTime();
+      whereObject['payTimeE'] = new Date(whereObject['payTime'][1]).getTime();
     } else {
       whereObject['payTimeS'] = null;
       whereObject['payTimeE'] = null;
     }
 
     if (whereObject['finishTime'] != null) {
-      whereObject['finishTimeS'] = whereObject['finishTime'][0].getTime();
+      whereObject['finishTimeS'] = new Date(whereObject['finishTime'][0]).getTime();
-      whereObject['finishTimeE'] = whereObject['finishTime'][1].getTime();
+      whereObject['finishTimeE'] = new Date(whereObject['finishTime'][1]).getTime();
     } else {
       whereObject['finishTimeS'] = null;
       whereObject['finishTimeE'] = null;

src/app/admin/order-manage/order-oil/order-oil-list/order-oil-list.component.html

@@ -38,15 +38,17 @@
                     </nz-form-item>
                 </div>
 
-            </div>
 
-            <div nz-row *ngIf="isCollapse">
 
-                <div nz-col nzSpan="8" *ngIf="roleType != 3 && roleType != 10">
+                <div nz-col nzSpan="8">
                     <nz-form-item>
-                        <nz-form-label [nzSpan]="8">加油站</nz-form-label>
+                        <nz-form-label [nzSpan]="8">创建时间</nz-form-label>
                         <nz-form-control [nzSpan]="14">
-                            <input nz-input formControlName="storeName" />
+                            <nz-range-picker
+                                    [nzShowTime]="{ nzHideDisabledOptions: true }"
+                                    formControlName="createTimeArray"
+                                    nzFormat="yyyy-MM-dd HH:mm:ss"
+                            ></nz-range-picker>
                         </nz-form-control>
                     </nz-form-item>
                 </div>
@@ -66,50 +68,52 @@
 
                 <div nz-col nzSpan="8">
                     <nz-form-item>
-                        <nz-form-label [nzSpan]="8">交易状态</nz-form-label>
+                        <nz-form-label [nzSpan]="8">退款时间</nz-form-label>
                         <nz-form-control [nzSpan]="14">
-                            <nz-select formControlName="status" nzAllowClear>
+                            <nz-range-picker
-                                <nz-option *ngFor="let item of orderStatusArray" nzValue="{{item.codeValue}}" nzLabel="{{item.codeName}}"></nz-option>
+                                    [nzShowTime]="{ nzHideDisabledOptions: true }"
-                            </nz-select>
+                                    formControlName="refundTimeArray"
+                                    nzFormat="yyyy-MM-dd HH:mm:ss"
+                            ></nz-range-picker>
                         </nz-form-control>
                     </nz-form-item>
                 </div>
 
-                <div nz-col nzSpan="8" *ngIf="roleType != 10">
+            </div>
+
+            <div nz-row *ngIf="isCollapse">
+
+                <div nz-col nzSpan="8" *ngIf="roleType != 3 && roleType != 10">
                     <nz-form-item>
-                        <nz-form-label [nzSpan]="8">加油员</nz-form-label>
+                        <nz-form-label [nzSpan]="8">加油站</nz-form-label>
                         <nz-form-control [nzSpan]="14">
-                            <input nz-input formControlName="gasStaffName" />
+                            <input nz-input formControlName="storeName" />
                         </nz-form-control>
                     </nz-form-item>
                 </div>
 
                 <div nz-col nzSpan="8">
                     <nz-form-item>
-                        <nz-form-label [nzSpan]="8">创建时间</nz-form-label>
+                        <nz-form-label [nzSpan]="8">交易状态</nz-form-label>
                         <nz-form-control [nzSpan]="14">
-                            <nz-range-picker
+                            <nz-select formControlName="status" nzAllowClear>
-                                    [nzShowTime]="{ nzHideDisabledOptions: true }"
+                                <nz-option *ngFor="let item of orderStatusArray" nzValue="{{item.codeValue}}" nzLabel="{{item.codeName}}"></nz-option>
-                                    formControlName="createTimeArray"
+                            </nz-select>
-                                    nzFormat="yyyy-MM-dd HH:mm:ss"
-                            ></nz-range-picker>
                         </nz-form-control>
                     </nz-form-item>
                 </div>
 
-                <div nz-col nzSpan="8">
+                <div nz-col nzSpan="8" *ngIf="roleType != 10">
                     <nz-form-item>
-                        <nz-form-label [nzSpan]="8">退款时间</nz-form-label>
+                        <nz-form-label [nzSpan]="8">加油员</nz-form-label>
                         <nz-form-control [nzSpan]="14">
-                            <nz-range-picker
+                            <input nz-input formControlName="gasStaffName" />
-                                    [nzShowTime]="{ nzHideDisabledOptions: true }"
-                                    formControlName="refundTimeArray"
-                                    nzFormat="yyyy-MM-dd HH:mm:ss"
-                            ></nz-range-picker>
                         </nz-form-control>
                     </nz-form-item>
                 </div>
 
+
+
                 <div nz-col nzSpan="8" *ngIf="roleType == 0 || roleType == 1">
                     <nz-form-item>
                         <nz-form-label [nzSpan]="8">分公司</nz-form-label>

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

@@ -77,6 +77,18 @@ export class OrderOilListComponent implements OnInit {
   }
 
   ngOnInit(): void {
+    let currentDate = new Date();
+    currentDate.setHours(0);
+    currentDate.setMinutes(0);
+    currentDate.setSeconds(0);
+    let createTimeS = currentDate.getTime();
+
+    currentDate.setHours(23);
+    currentDate.setMinutes(59);
+    currentDate.setSeconds(59);
+    let createTimeE = currentDate.getTime();
+    this.whereObject = { createTimeS: createTimeS, createTimeE: createTimeE};
+
     this.REFUND_OIL_BTN = this.commonsService.isBtnCompetence("BTN_REFUND_OIL_BTN");
     this.refundForm = this.form.group({
       orderNo: [{ value: null, disabled: true}, [Validators.required]],
@@ -95,7 +107,7 @@ export class OrderOilListComponent implements OnInit {
       storeName: [null],
       memPhone: [null],
       status: [null],
-      createTimeArray: [null],
+      createTimeArray: [[createTimeS,createTimeE]],
       payTimeArray: [null],
       refundTimeArray: [null],
       companyId: [null],

src/environments/environment.ts

@@ -5,10 +5,10 @@
 export const environment = {
   production: false,
   // baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址)
-  // orderUrl: 'http://localhost:9304/order/',
+  orderUrl: 'http://localhost:9304/order/',
   // imageUrl: 'https://hsgcs.dctpay.com/filesystem/',
   baseUrl: 'https://hsgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
-  orderUrl: 'https://hsgcs.dctpay.com/order/',
+  // 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=',