Merge branch 'dev' of http://139.159.177.244:3000/yuanye/high-web into dev

src/app/admin/index/index.module.ts

@@ -6,11 +6,12 @@ import { IndexComponent } from './index/index.component';
 import {NgxEchartsModule} from 'ngx-echarts';
 import {SystemRoutingModule} from '../system/system-routing.module';
 import {NgZorroAntdModule} from 'ng-zorro-antd';
-import {FormsModule, ReactiveFormsModule} from "@angular/forms";
+import {FormsModule, ReactiveFormsModule} from '@angular/forms';
-import {NgxNeditorModule} from "@notadd/ngx-neditor";
+import {NgxNeditorModule} from '@notadd/ngx-neditor';
-import {RichtextModule} from "../../common/richtext/richtext.module";
+import {RichtextModule} from '../../common/richtext/richtext.module';
-import {BreadcrumbModule} from "../../common/breadcrumb/breadcrumb.module";
+import {BreadcrumbModule} from '../../common/breadcrumb/breadcrumb.module';
-import {RegionSelectorModule} from "../../common/region-selector/region-selector.module";
+import {RegionSelectorModule} from '../../common/region-selector/region-selector.module';
+import {AppCommonModule} from '../../app-common.module';
 
 
 @NgModule({
@@ -26,7 +27,8 @@ import {RegionSelectorModule} from "../../common/region-selector/region-selector
         BreadcrumbModule,
         RegionSelectorModule,
         NgxEchartsModule,
-    IndexRoutingModule
+        IndexRoutingModule,
+        AppCommonModule
     ]
 })
 export class IndexModule { }

src/app/admin/index/index/index.component.html

@@ -44,17 +44,22 @@
 <!--运营角色-->
 <div class="inner-content"  *ngIf="roleType == 1">
     <div nz-row  style="margin-top: 20px;" [nzGutter]="16">
-        <div nz-col nzSpan="8">
+        <div nz-col nzSpan="8" *ngFor="let item of tyBalance">
+            <nz-card nzHoverable [nzLoading]="loading" [nzTitle]="item['energyType'] | energyType">
+                <h3>{{item['accountBalance']}}</h3>
+            </nz-card>
+        </div>
+        <div nz-col nzSpan="8" style="margin-top: 20px">
             <nz-card nzHoverable [nzLoading]="loading" [nzTitle]="'注册总人数'">
                 <h3>{{countData['registrantNum']}}</h3>
             </nz-card>
         </div>
-        <div nz-col nzSpan="8">
+        <div nz-col nzSpan="8" style="margin-top: 20px">
             <nz-card nzHoverable [nzLoading]="loading" [nzTitle]="'总交易金额'">
                 <h3>{{countData['transactionNum']}}</h3>
             </nz-card>
         </div>
-        <div nz-col nzSpan="8">
+        <div nz-col nzSpan="8" style="margin-top: 20px">
             <nz-card nzHoverable [nzLoading]="loading" [nzTitle]="'总交易订单数量'">
                 <h3>{{countData['transactionOrder']}}</h3>
             </nz-card>

src/app/admin/index/index/index.component.ts

@@ -1,7 +1,6 @@
 import {Component, OnInit} from '@angular/core';
 import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace';
 import {LocalStorageService} from '../../../services/local-storage.service';
-import {CommonsService} from '../../../services/commons.service';
 import {IndexService} from '../../../services/index.service';
 import {NzMessageService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
 import {environment} from '../../../../environments/environment';
@@ -27,17 +26,21 @@ export class IndexComponent implements OnInit {
     orderData = {};
     balanceData = {};
     rechargeData = {};
+    tyBalance;
+
     constructor(
         private store: LocalStorageService, // 数据缓存
         private message: NzMessageService, // 信息提示
         private index: IndexService
-  ) { }
+    ) {
+    }
 
     ngOnInit(): void {
         this.roleType = this.store.get(ADMIN_INFO_OBJECT)['secRole'].roleType;
         if (this.roleType === 1) {
             this.getIndexCount();
             this.getLineCount();
+            this.queryCompanyAccountInfo2JD();
         }
 
         if (this.store.get(ADMIN_INFO_OBJECT)['highAgent'] != null) {
@@ -59,7 +62,7 @@ export class IndexComponent implements OnInit {
         const paramsObject = {
             codeType: 'HLT_BALANCE'
         };
-    this.index.getHLTBalance(paramsObject , data => {
+        this.index.getHLTBalance(paramsObject, data => {
             if (data['return_code'] === '000000') {
                 this.loading = false;
                 this.balance = data['return_data'];
@@ -70,7 +73,7 @@ export class IndexComponent implements OnInit {
     }
 
     public orderByIndex(): void {
-     this.index.orderByIndex(this.code , data => {
+        this.index.orderByIndex(this.code, data => {
             if (data['return_code'] === '000000') {
                 this.orderData = data['return_data'];
                 this.loading = false;
@@ -80,8 +83,20 @@ export class IndexComponent implements OnInit {
         });
     }
 
+    // 查询团油余额
+    public queryCompanyAccountInfo2JD() {
+        this.index.queryCompanyAccountInfo2JD(data => {
+            if (data['return_code'] === '000000') {
+                console.log(data);
+                this.tyBalance = data['return_data'];
+            } else {
+                this.message.error(data['return_msg']);
+            }
+        });
+    }
+
     public HLTOrderByIndex(): void {
-    this.index.HLTOrderByIndex(this.code , data => {
+        this.index.HLTOrderByIndex(this.code, data => {
             if (data['return_code'] === '000000') {
                 this.balanceData = data['return_data'];
                 this.loading = false;
@@ -92,7 +107,7 @@ export class IndexComponent implements OnInit {
     }
 
     public rechargeOrderByIndex(): void {
-    this.index.rechargeOrderByIndex(this.code , data => {
+        this.index.rechargeOrderByIndex(this.code, data => {
             if (data['return_code'] === '000000') {
                 this.rechargeData = data['return_data'];
                 this.loading = false;
@@ -103,7 +118,7 @@ export class IndexComponent implements OnInit {
     }
 
     public HLTOrderByList(): void {
-    this.index.HLTOrderByList(this.code , data => {
+        this.index.HLTOrderByList(this.code, data => {
             if (data['return_code'] === '000000') {
                 this.listOfData = data['return_data'];
             } else {
@@ -186,7 +201,7 @@ export class IndexComponent implements OnInit {
 
     // 下载模板
     downloadTemplate() {
-    this.index.exportHLTOrderByList(this.code , data => {
+        this.index.exportHLTOrderByList(this.code, data => {
             if (data['return_code'] === '000000') {
                 window.location.href = this.FILE_URL + data['return_data'];
             } else {
@@ -205,7 +220,7 @@ export class IndexComponent implements OnInit {
             codeType: 'HLT_BALANCE',
             price: this.price
         };
-    this.index.addHLTBalance(paramsObject , data => {
+        this.index.addHLTBalance(paramsObject, data => {
             if (data['return_code'] === '000000') {
                 this.getHLTBalance();
                 this.isVisibleAdd = false;

src/app/app-common.module.ts

@@ -36,7 +36,8 @@ import {
     ButtonPipe,
     DiscountPackageStatusPipe,
     PriceShowPipe,
-    ShowTypePipe
+    ShowTypePipe,
+    EnergyTypePipe
 } from './pipes';
 
 
@@ -72,6 +73,8 @@ const PIPES = [
     DiscountPackageStatusPipe,
     ShowTypePipe,
     PriceShowPipe,
+    EnergyTypePipe,
+
 ];
 
 

src/app/pipes/index.ts

@@ -25,3 +25,4 @@ export * from './commons/button.pipe';
 export * from './discount-package-status.pipe';
 export * from './show-type.pipe';
 export * from './price-show.pipe';
+export * from './index/energy-type.pipe';

src/app/pipes/index/energy-type.pipe.ts

@@ -0,0 +1,19 @@
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({
+  name: 'energyType'
+})
+export class EnergyTypePipe implements PipeTransform {
+
+    transform(value: number): string {
+        switch (value) {
+            case 1:
+                return '团油汽油余额';
+            case 2:
+                return '团油柴油余额';
+            case 3:
+                return '团油天然气余额';
+        }
+    }
+
+}

src/app/services/index.service.ts

@@ -53,6 +53,19 @@ export class IndexService {
     });
   }
 
+    /**
+     * @Author Sum1Dream
+     * @methodName queryCompanyAccountInfo2JD
+     * @Description // 查询团油余额
+     * @Date 12:12 下午 2022/1/10
+     * @Param
+     */
+    public queryCompanyAccountInfo2JD(callBack) {
+        this.http.get(environment.baseUrl + 'common/queryCompanyAccountInfo2JD').subscribe(data => {
+            callBack(data);
+        });
+    }
+
   /**
    * @Author Sum1Dream
    * @methodName orderByIndex