提交代码

src/app/admin/order/oil-station-order/oil-station-order.component.html

@@ -34,6 +34,16 @@
                     </nz-form-control>
                 </nz-form-item>
             </div>
+            <div nz-col nzSpan="8">
+                <nz-form-item>
+                    <nz-form-label [nzSpan]="6">油号</nz-form-label>
+                    <nz-form-control [nzSpan]="16">
+                        <nz-select nzShowSearch nzAllowClear nzPlaceHolder="请选择订单状态" formControlName="oilNo">
+                            <nz-option *ngFor="let item of oilNoArray" nzLabel="{{item.codeName}}" nzValue="{{item.codeValue}}"></nz-option>
+                        </nz-select>
+                    </nz-form-control>
+                </nz-form-item>
+            </div>
             <div nz-col nzSpan="8">
                 <nz-form-item>
                     <nz-form-label [nzSpan]="6">状态</nz-form-label>
@@ -61,6 +71,18 @@
                     </nz-form-control>
                 </nz-form-item>
             </div>
+            <div nz-col nzSpan="8">
+                <nz-form-item>
+                    <nz-form-label [nzSpan]="6">支付时间</nz-form-label>
+                    <nz-form-control [nzSpan]="16">
+                        <nz-range-picker
+                                formControlName="payTime"
+                                [nzShowTime]="{ nzHideDisabledOptions: true}"
+                                nzFormat="yyyy-MM-dd HH:mm:ss"
+                        ></nz-range-picker>
+                    </nz-form-control>
+                </nz-form-item>
+            </div>
         </div>
 
         <div nz-row>
@@ -76,7 +98,7 @@
 
 
 <div class="inner-content">
-    <span>共计 {{total}} 条数据</span>
+    <span>总笔数：{{dataCount.refuelNum}} 笔，总加油金额：{{dataCount.refuelPrice}} 元，总升数：{{dataCount.refuelLiters}} 升</span>
     <div class="operating-button">
         <button nz-button nzType="primary" class="right-btn" (click)="excelOrder()" ><i nz-icon nzType="import" nzTheme="outline"></i>导出订单</button>
     </div>
@@ -110,6 +132,7 @@
             <th nzWidth="90px">支付金额</th>
             <th nzWidth="90px">优惠金额</th>
             <th nzWidth="120px">创建时间</th>
+            <th nzWidth="120px">支付时间</th>
             <th nzRight nzWidth="80px">状态</th>
             <th nzWidth="105px" nzRight>操作</th>
         </tr>
@@ -130,6 +153,7 @@
             <td>{{data.payRealPrice}}</td>
             <td>{{data.deductionPrice}}</td>
             <td>{{data.createTime | date: 'yyyy-MM-dd HH:mm:ss'}}</td>
+            <td>{{data.payTime | date: 'yyyy-MM-dd HH:mm:ss'}}</td>
             <td nzRight>{{data.status | orderCouponStatus}}</td>
             <td nzRight class="table-td-operation">
                 <a style="float: left;width: 100%;margin-bottom: 10px;" *ngIf="BTN_GAS_ORDER_PRINT && (secUser['objectType'] == 3 || secUser['objectType'] == 8) && data.printStatus == false" (click)="showPrintModal(data.orderId, data)">打印小票</a>

src/app/admin/order/oil-station-order/oil-station-order.component.ts

@@ -50,9 +50,16 @@ export class OilStationOrderComponent implements OnInit {
     userSession = {};
     gasStaffArray = [];
 
+    oilNoArray = [];
+
     BTN_GAS_ORDER_REFUND = false;
     BTN_GAS_ORDER_PRINT = false;
 
+    dataCount = {
+        refuelNum: 0,
+        refuelPrice: 0,
+        refuelLiters: 0,
+    };
     constructor(
         private form: FormBuilder,
         private order: OrderService,
@@ -106,9 +113,18 @@ export class OilStationOrderComponent implements OnInit {
             staffId: [null],
             orderNo: [null],
             status: [null],
+            oilNo: [null],
             createTime: [null],
+            payTime: [null],
         });
         this.getRequest(true, this.searchForm.value);
+
+        // 查询油号
+        this.common.getDictionary("GAS_OIL_TYPE", data => {
+           if (data['return_code'] == '000000') {
+               this.oilNoArray = data['return_data'];
+           }
+        });
     }
 
     // 查询列表
@@ -132,6 +148,16 @@ export class OilStationOrderComponent implements OnInit {
                 this.message.error(data['return_msg']);
             }
         });
+        this.countGasOrder();
+    }
+
+    // 统计订单
+    public countGasOrder() {
+        this.orderService.countGasOrder(this.searchForm.value, data => {
+            if (data['return_code'] == '000000') {
+                this.dataCount = data['return_data'];
+            }
+        });
     }
 
     // 查询列表

src/app/services/order.service.ts

@@ -52,6 +52,18 @@ export class OrderService {
         });
     }
 
+  /**
+   * 统计油站订单
+   *
+   * @param  paramsObject   对象
+   * @param  callBack   回调
+   */
+  public countGasOrder(paramsObject: object, callBack) {
+    this.http.get(environment.baseUrl + 'highGas/countGasOrder?' + this.common.getWhereCondition(paramsObject)).subscribe(data => {
+      callBack(data);
+    });
+  }
+
   /**
    * @Author Sum1Dream
    * @methodName getDiscountPackageList

src/environments/environment.ts

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