hurui
/
gratia-pay-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

Browse Source
master
胡锐 1 year ago
parent 09fa8f3e73
commit c33dcceb53
8 changed files with 144 additions and 102 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      src/app/admin/store-discount-activity/store-discount-activity-edit/store-discount-activity-edit.component.ts
  2. 108
      src/app/admin/trade-checking/trade-checking-detail/trade-checking-detail.component.html
  3. 83
      src/app/admin/trade-checking/trade-checking/trade-checking.component.html
  4. 30
      src/app/admin/trade-order/trade-order-list/trade-order-list.component.html
  5. 4
      src/app/admin/trade-order/trade-order-list/trade-order-list.component.scss
  6. 7
      src/app/admin/trade-order/trade-order-list/trade-order-list.component.ts
  7. 2
      src/app/admin/trade-order/trade-order.module.ts
  8. 10
      src/environments/environment.ts

2
src/app/admin/store-discount-activity/store-discount-activity-edit/store-discount-activity-edit.component.ts
Unescape View File

@ -65,7 +65,7 @@ export class StoreDiscountActivityEditComponent implements OnInit {
} }
}); });
this.merService.getMerList({pageNum: 1, pageSize: 99999}, data => { this.merService.getMerList({merStatus: 1, pageNum: 1, pageSize: 99999}, data => {
this.merArray = data['return_data']['list']; this.merArray = data['return_data']['list'];
}); });
} }

108
src/app/admin/trade-checking/trade-checking-detail/trade-checking-detail.component.html
Unescape View File

@ -122,58 +122,62 @@
<!--startprint--> <!--startprint-->
<div id="print-content" style="display: none"> <div id="print-content" style="display: none">
<div class="inner-content"> <nz-layout>
<article nz-typography> <nz-content>
<p> <div class="inner-content">
<span nz-typography><strong>清算日期: {{this.searchForm.value.settleTimeS | date: 'yyyy-MM-dd'}} 至 {{this.searchForm.value.settleTimeE | date: 'yyyy-MM-dd'}}</strong></span> <article nz-typography>
</p> <p>
</article> <span nz-typography><strong>清算日期: {{this.searchForm.value.settleTimeS | date: 'yyyy-MM-dd'}} 至 {{this.searchForm.value.settleTimeE | date: 'yyyy-MM-dd'}}</strong></span>
<article nz-typography> </p>
<p> </article>
<span nz-typography nzType="warning"><strong>汇总：</strong></span> <article nz-typography>
笔数 <span nz-typography nzType="warning"><strong>{{dataObject.totalTradeNum}}</strong></span>、 <p>
交易金额 <span nz-typography nzType="warning"><strong>{{dataObject.totalTradeAmount}}</strong></span> 元、 <span nz-typography nzType="warning"><strong>汇总：</strong></span>
手续费 <span nz-typography nzType="warning"><strong>{{dataObject.totalShdFeeAmount}}</strong></span> 元、 笔数 <span nz-typography nzType="warning"><strong>{{dataObject.totalTradeNum}}</strong></span>、
应结算金额 <span nz-typography nzType="warning"><strong>{{dataObject.totalSettleAmount}}</strong></span> 元 交易金额 <span nz-typography nzType="warning"><strong>{{dataObject.totalTradeAmount}}</strong></span> 元、
</p> 手续费 <span nz-typography nzType="warning"><strong>{{dataObject.totalShdFeeAmount}}</strong></span> 元、
</article> 应结算金额 <span nz-typography nzType="warning"><strong>{{dataObject.totalSettleAmount}}</strong></span> 元
<!--数组表格 --> </p>
<nz-table #basicTable </article>
nzBordered <!--数组表格 -->
nzSize="middle" <nz-table #basicTable
[nzData]="dataObject.settleDetailList" nzBordered
[nzTotal]="dataObject.settleDetailList.length" nzSize="middle"
[nzLoading]="tableLoading" [nzData]="dataObject.settleDetailList"
[nzScroll]="{ x: '595px'}"> [nzTotal]="dataObject.settleDetailList.length"
<thead> [nzLoading]="tableLoading"
<tr> [nzScroll]="{ x: '595px'}">
<th nzWidth="90px">清算日期</th> <thead>
<th nzWidth="100px">商户号</th> <tr>
<th nzWidth="130px">商户名称</th> <th nzWidth="90px">清算日期</th>
<th nzWidth="80px">交易金额</th> <th nzWidth="100px">商户号</th>
<th nzWidth="80px">清算金额</th> <th nzWidth="130px">商户名称</th>
<th nzWidth="80px">手续费</th> <th nzWidth="80px">交易金额</th>
<th nzWidth="80px">交易笔数</th> <th nzWidth="80px">清算金额</th>
<!-- <th nzWidth="40px" nzRight="0px">操作</th>--> <th nzWidth="80px">手续费</th>
</tr> <th nzWidth="80px">交易笔数</th>
</thead> <!-- <th nzWidth="40px" nzRight="0px">操作</th>-->
<tbody> </tr>
<tr *ngFor="let data of basicTable.data;let i = index"> </thead>
<td>{{data.settleDay}}</td> <tbody>
<td>{{data.merNo}}</td> <tr *ngFor="let data of basicTable.data;let i = index">
<td>{{data.merName}}</td> <td>{{data.settleDay}}</td>
<td>{{data.tradeAmount}}</td> <td>{{data.merNo}}</td>
<td>{{data.settleAmount}}</td> <td>{{data.merName}}</td>
<td>{{data.shdFeeAmount}}</td> <td>{{data.tradeAmount}}</td>
<td>{{data.tradeNum}}</td> <td>{{data.settleAmount}}</td>
<!--<td nzRight="0px" class="table-td-operation"> <td>{{data.shdFeeAmount}}</td>
<a [routerLink]="['/admin/agent/detail']" [queryParams]="{agentId: data.id}">明细</a> <td>{{data.tradeNum}}</td>
</td>--> <!--<td nzRight="0px" class="table-td-operation">
</tr> <a [routerLink]="['/admin/agent/detail']" [queryParams]="{agentId: data.id}">明细</a>
</tbody> </td>-->
</nz-table> </tr>
</div> </tbody>
<img style="z-index: 0;margin: -70px 0px 0px 500px; position: absolute;" src="https://pay.dctpay.com/filesystem/b6b7e8860b6135101334aa840eb7e17d.png"> </nz-table>
</div>
<img style="z-index: 0;margin: -150px 0px 0px 500px; position: absolute;" src="https://pay.dctpay.com/filesystem/b6b7e8860b6135101334aa840eb7e17d.png">
</nz-content>
</nz-layout>
</div> </div>
<!--endprint--> <!--endprint-->

83
src/app/admin/trade-checking/trade-checking/trade-checking.component.html
Unescape View File

@ -88,45 +88,50 @@
<!--startprint--> <!--startprint-->
<div id="print-content" style="display: none"> <div id="print-content" style="display: none">
<div class="inner-content"> <nz-layout>
<article nz-typography> <nz-content>
<p> <div class="inner-content">
<span nz-typography><strong>清算日期: {{this.searchForm.value.settleTimeS | date: 'yyyy-MM-dd'}} 至 {{this.searchForm.value.settleTimeE | date: 'yyyy-MM-dd'}}</strong></span> <article nz-typography>
</p> <p>
</article> <span nz-typography><strong>清算日期: {{this.searchForm.value.settleTimeS | date: 'yyyy-MM-dd'}} 至 {{this.searchForm.value.settleTimeE | date: 'yyyy-MM-dd'}}</strong></span>
<!--数组表格 --> </p>
<nz-table #basicTable2 </article>
nzBordered <!--数组表格 -->
nzShowSizeChanger <nz-table #basicTable2
nzSize="middle" nzBordered
[nzData]="dataObjectArray" nzShowSizeChanger
[nzTotal]="dataObjectArray.length" nzSize="middle"
[nzLoading]="tableLoading" [nzData]="dataObjectArray"
[nzShowPagination]="false" [nzTotal]="dataObjectArray.length"
[nzScroll]="{ x: '550px'}"> [nzLoading]="tableLoading"
<thead> [nzShowPagination]="false"
<tr> [nzScroll]="{ x: '550px'}">
<th nzWidth="100px">商户号</th> <thead>
<th nzWidth="130px">商户名称</th> <tr>
<th nzWidth="80px">交易金额</th> <th nzWidth="100px">商户号</th>
<th nzWidth="80px">清算金额</th> <th nzWidth="130px">商户名称</th>
<th nzWidth="80px">手续费</th> <th nzWidth="80px">交易金额</th>
<th nzWidth="80px">交易笔数</th> <th nzWidth="80px">清算金额</th>
</tr> <th nzWidth="80px">手续费</th>
</thead> <th nzWidth="80px">交易笔数</th>
<tbody> </tr>
<tr *ngFor="let data of basicTable2.data;let i = index"> </thead>
<td>{{data.merNo}}</td> <tbody>
<td>{{data.merName}}</td> <tr *ngFor="let data of basicTable2.data;let i = index">
<td>{{data.totalTradeAmount}}</td> <td>{{data.merNo}}</td>
<td>{{data.totalSettleAmount}}</td> <td>{{data.merName}}</td>
<td>{{data.totalShdFeeAmount}}</td> <td>{{data.totalTradeAmount}}</td>
<td>{{data.totalTradeNum}}</td> <td>{{data.totalSettleAmount}}</td>
</tr> <td>{{data.totalShdFeeAmount}}</td>
</tbody> <td>{{data.totalTradeNum}}</td>
</nz-table> </tr>
</div> </tbody>
<img style="z-index: 0;margin: -100px 0px 0px 500px; position: absolute;" src="https://pay.dctpay.com/filesystem/b6b7e8860b6135101334aa840eb7e17d.png"> </nz-table>
</div>
<img style="z-index: 0;margin: -100px 0px 0px 500px; position: absolute;" src="https://pay.dctpay.com/filesystem/b6b7e8860b6135101334aa840eb7e17d.png">
</nz-content>
</nz-layout>
</div> </div>
<!--endprint--> <!--endprint-->

30
src/app/admin/trade-order/trade-order-list/trade-order-list.component.html
Unescape View File

@ -14,6 +14,7 @@
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
</div> </div>
<div nz-col nzSpan="8"> <div nz-col nzSpan="8">
<nz-form-item> <nz-form-item>
<nz-form-label [nzSpan]="8">账户端交易单号</nz-form-label> <nz-form-label [nzSpan]="8">账户端交易单号</nz-form-label>
@ -22,9 +23,10 @@
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
</div> </div>
<div nz-col nzSpan="8"> <div nz-col nzSpan="8">
<nz-form-item> <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-form-control [nzSpan]="14">
<nz-select nzAllowClear formControlName="payMode"> <nz-select nzAllowClear formControlName="payMode">
<nz-option nzLabel="微信" nzValue="WECHAT"></nz-option> <nz-option nzLabel="微信" nzValue="WECHAT"></nz-option>
@ -35,9 +37,12 @@
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
</div> </div>
</div>
<div nz-row *ngIf="isCollapse">
<div nz-col nzSpan="8"> <div nz-col nzSpan="8">
<nz-form-item> <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-form-control [nzSpan]="14">
<nz-select nzAllowClear formControlName="status"> <nz-select nzAllowClear formControlName="status">
<nz-option nzLabel="待支付" nzValue="1"></nz-option> <nz-option nzLabel="待支付" nzValue="1"></nz-option>
@ -53,7 +58,7 @@
<div nz-col nzSpan="8"> <div nz-col nzSpan="8">
<nz-form-item> <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-form-control [nzSpan]="14">
<nz-range-picker <nz-range-picker
formControlName="payTime" formControlName="payTime"
@ -64,6 +69,15 @@
</nz-form-item> </nz-form-item>
</div> </div>
<div nz-col nzSpan="8">
<nz-form-item>
<nz-form-label [nzSpan]="8">特殊字段</nz-form-label>
<nz-form-control [nzSpan]="14">
<input nz-input formControlName="specialField" />
</nz-form-control>
</nz-form-item>
</div>
<div nz-col nzSpan="8" *ngIf="userObjectType !== 5"> <div nz-col nzSpan="8" *ngIf="userObjectType !== 5">
<nz-form-item> <nz-form-item>
<nz-form-label [nzSpan]="8">商户号</nz-form-label> <nz-form-label [nzSpan]="8">商户号</nz-form-label>
@ -72,6 +86,7 @@
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
</div> </div>
<div nz-col nzSpan="8" *ngIf="userObjectType !== 5"> <div nz-col nzSpan="8" *ngIf="userObjectType !== 5">
<nz-form-item> <nz-form-item>
<nz-form-label [nzSpan]="8">商户名称</nz-form-label> <nz-form-label [nzSpan]="8">商户名称</nz-form-label>
@ -80,6 +95,7 @@
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
</div> </div>
<div nz-col nzSpan="8" *ngIf="userObjectType !== 5"> <div nz-col nzSpan="8" *ngIf="userObjectType !== 5">
<nz-form-item> <nz-form-item>
<nz-form-label [nzSpan]="8">商户简称</nz-form-label> <nz-form-label [nzSpan]="8">商户简称</nz-form-label>
@ -88,6 +104,7 @@
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
</div> </div>
<div nz-col nzSpan="8" *ngIf="userObjectType !== 5"> <div nz-col nzSpan="8" *ngIf="userObjectType !== 5">
<nz-form-item> <nz-form-item>
<nz-form-label [nzSpan]="8">门店名称</nz-form-label> <nz-form-label [nzSpan]="8">门店名称</nz-form-label>
@ -102,6 +119,9 @@
<div nz-col nzSpan="24" class="search-button"> <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="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> <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>
</div> </div>
</div> </div>
</form> </form>
@ -134,10 +154,10 @@
<th nzWidth="100px">门店优惠</th> <th nzWidth="100px">门店优惠</th>
<th nzWidth="130px">优惠券优惠</th> <th nzWidth="130px">优惠券优惠</th>
<th nzWidth="100px">实付金额</th> <th nzWidth="100px">实付金额</th>
<th nzWidth="100px">状态</th> <th nzWidth="100px">交易状态</th>
<th nzWidth="90px">创建方式</th> <th nzWidth="90px">创建方式</th>
<th nzWidth="160px">创建时间</th> <th nzWidth="160px">创建时间</th>
<th nzWidth="160px">支付时间</th> <th nzWidth="160px">交易时间</th>
<th nzWidth="160px">入账商户号</th> <th nzWidth="160px">入账商户号</th>
<th nzWidth="100px">特殊字符</th> <th nzWidth="100px">特殊字符</th>
<th nzWidth="100px">业务员</th> <th nzWidth="100px">业务员</th>

4
src/app/admin/trade-order/trade-order-list/trade-order-list.component.scss
Unescape View File

@ -1,3 +1,7 @@
.table-td-operation a { .table-td-operation a {
padding: 0px 5px; padding: 0px 5px;
} }
.collapse {
margin-left: 8px;
font-size: 12px;
}

7
src/app/admin/trade-order/trade-order-list/trade-order-list.component.ts
Unescape View File

@ -28,6 +28,8 @@ export class TradeOrderListComponent implements OnInit {
msg: '加载中' msg: '加载中'
}; };
isCollapse = false;
constructor(private store: LocalStorageService, // 数据请求 constructor(private store: LocalStorageService, // 数据请求
private modal: NzModalService, private modal: NzModalService,
private message: NzMessageService, private message: NzMessageService,
@ -59,6 +61,7 @@ export class TradeOrderListComponent implements OnInit {
payTimeS: [null], payTimeS: [null],
payTimeE: [null], payTimeE: [null],
status: [null], status: [null],
specialField: [null],
}); });
this.requestData(1); this.requestData(1);
} }
@ -150,4 +153,8 @@ export class TradeOrderListComponent implements OnInit {
}); });
} }
toggleCollapse(): void {
this.isCollapse = !this.isCollapse;
}
} }

2
src/app/admin/trade-order/trade-order.module.ts
Unescape View File

@ -8,6 +8,7 @@ import {AppCommonModule} from '../../app-common.module';
import { TradeOrderDetailComponent } from './trade-order-detail/trade-order-detail.component'; import { TradeOrderDetailComponent } from './trade-order-detail/trade-order-detail.component';
import {NgZorroAntdModule} from 'ng-zorro-antd'; import {NgZorroAntdModule} from 'ng-zorro-antd';
import {FormsModule, ReactiveFormsModule} from '@angular/forms'; import {FormsModule, ReactiveFormsModule} from '@angular/forms';
import {TradeCheckingRoutingModule} from '../trade-checking/trade-checking-routing.module';
@NgModule({ @NgModule({
@ -15,6 +16,7 @@ import {FormsModule, ReactiveFormsModule} from '@angular/forms';
imports: [ imports: [
CommonModule, CommonModule,
TradeOrderRoutingModule, TradeOrderRoutingModule,
TradeCheckingRoutingModule,
NgZorroAntdModule, NgZorroAntdModule,
ReactiveFormsModule, ReactiveFormsModule,
FormsModule, FormsModule,

10
src/environments/environment.ts
Unescape View File

@ -5,12 +5,12 @@
export const environment = { export const environment = {
production: false, production: false,
// baseUrl: 'https://gratia-pay.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址) // baseUrl: 'https://gratia-pay.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
// baseUrl: 'https://gratia-pay.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址) baseUrl: 'https://gratia-pay.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
// imageUrl: 'https://gratia-pay.dctpay.com/filesystem/', imageUrl: 'https://gratia-pay.dctpay.com/filesystem/',
// obsUrl: 'https://gratia-pay-test.obs.cn-southwest-2.myhuaweicloud.com',
baseUrl: 'http://localhost:9602/brest/', // 测试环境服务器地址(请求数据地址)
imageUrl: 'http://localhost:9602/filesystem/',
obsUrl: 'https://gratia-pay-test.obs.cn-southwest-2.myhuaweicloud.com', obsUrl: 'https://gratia-pay-test.obs.cn-southwest-2.myhuaweicloud.com',
// baseUrl: 'http://localhost:9602/brest/', // 测试环境服务器地址(请求数据地址)
// imageUrl: 'http://localhost:9602/filesystem/',
// obsUrl: 'https://gratia-pay-test.obs.cn-southwest-2.myhuaweicloud.com',
}; };
/* /*

Write Preview
Loading…
Cancel
Save