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

合并自建站代码到话费修改

Browse Source
pull/1/head
袁野 3 years ago
parent 7196d106b1
commit f982a05ef2
8 changed files with 359 additions and 366 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. 140
      src/app/admin/recharge-order/order-list/order-list.component.html
  2. 14
      src/app/admin/recharge-order/order-list/order-list.component.ts
  3. 2
      src/app/admin/recharge-order/price-list/price-list.component.html
  4. 10
      src/app/app-common.module.ts
  5. 2
      src/app/pipes/index.ts
  6. 11
      src/app/pipes/recharge-pay-type.pipe.ts
  7. 20
      src/app/pipes/recharge-status.pipe.ts
  8. 12
      src/app/services/recharge.service.ts

140
src/app/admin/recharge-order/order-list/order-list.component.html
Unescape View File

@ -84,32 +84,15 @@
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
</div> </div>
<!-- <div nz-col nzSpan="8">-->
<!-- <nz-form-item>-->
<!-- <nz-form-label [nzSpan]="6">用户电话</nz-form-label>-->
<!-- <nz-form-control [nzSpan]="16">-->
<!-- <input nz-input placeholder="请输入用户电话..." [formControlName]="'userPhone'" />-->
<!-- </nz-form-control>-->
<!-- </nz-form-item>-->
<!-- </div>-->
<div nz-col nzSpan="8"> <div nz-col nzSpan="8">
<nz-form-item> <nz-form-item>
<nz-form-label [nzSpan]="6">支付时间</nz-form-label> <nz-form-label [nzSpan]="6">支付时间</nz-form-label>
<nz-form-control [nzSpan]="16"> <nz-form-control [nzSpan]="16">
<nz-range-picker [nzShowTime]="{ nzFormat: 'HH:mm' }" formControlName="payTime"></nz-range-picker> <nz-range-picker [nzShowTime]="{ nzFormat: 'HH:mm' }"
formControlName="payTime"></nz-range-picker>
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
</div> </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 [nzShowTime]="{ nzFormat: 'HH:mm' }" formControlName="createTime"></nz-range-picker>-->
<!-- </nz-form-control>-->
<!-- </nz-form-item>-->
<!-- </div>-->
</div> </div>
<div nz-row> <div nz-row>
<div nz-col nzSpan="24" class="search-button"> <div nz-col nzSpan="24" class="search-button">
@ -125,16 +108,10 @@
<div class="inner-content"> <div class="inner-content">
<span>共计 {{total}} 条数据</span> <span>共计 {{total}} 条数据</span>
<div class="operating-button"> <div class="operating-button">
<!-- <nz-upload--> <button nz-button nzType="primary" class="right-btn" (click)="downloadTemplate(searchForm.value)"><i nz-icon
<!-- [nzAccept]="'.xls,.xlsx'"--> nzType="download"
<!-- nzAction="{{WEB_SERVE_URL}}outRechargeOrder/importRechargeOrder"--> nzTheme="outline"></i>导出订单
<!-- [nzHeaders]="{ authorization: 'authorization-text' }"--> </button>
<!-- (nzChange)="handleChange($event)"-->
<!-- [nzShowUploadList]="false"-->
<!-- >-->
<!-- <button nz-button nzType="primary" ><i nz-icon nzType="import" nzTheme="outline"></i>导入充值订单</button>-->
<!-- </nz-upload>-->
<button nz-button nzType="primary" class="right-btn" (click)="downloadTemplate(searchForm.value)" ><i nz-icon nzType="download" nzTheme="outline"></i>导出订单</button>
</div> </div>
<nz-table <nz-table
class="table" class="table"
@ -152,105 +129,84 @@
<thead nzSingleSort> <thead nzSingleSort>
<tr> <tr>
<th nzWidth="80px">编号</th> <th nzWidth="80px">编号</th>
<th nzWidth="180px">订单名称</th> <th nzWidth="100px">充值类型</th>
<th nzWidth="180px">订单类型</th> <th nzWidth="120px">运营商</th>
<th nzWidth="180px">充值类型</th> <th nzWidth="180px">充值内容</th>
<th nzWidth="180px">工会卡号</th>
<th nzWidth="180px">订单号</th>
<th nzWidth="120px">客户名称</th>
<th nzWidth="130px">充值号码</th>
<th nzWidth="100px">充值金额</th> <th nzWidth="100px">充值金额</th>
<th nzWidth="100px">支付金额</th> <th nzWidth="180px">充值订单号</th>
<th nzWidth="120px">客户名称</th>
<th nzWidth="140px">生成时间</th> <th nzWidth="140px">生成时间</th>
<th nzWidth="100px" nzRight>支付方式</th> <th nzWidth="100px" nzRight>支付方式</th>
<th nzWidth="90px" nzRight>充值状态</th> <th nzWidth="90px" nzRight>充值状态</th>
<th nzWidth="100px" nzRight>订单状态</th> <th nzWidth="100px" nzRight>支付状态</th>
<th nzWidth="200px" nzRight>操作</th> <th nzWidth="180px" nzRight>操作</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr *ngFor="let data of ajaxTable.data; let i = index"> <tr *ngFor="let data of ajaxTable.data; let i = index">
<td>{{i + 1}}</td> <td>{{i + 1}}</td>
<td>{{data.remarks}}</td> <td>{{data.type == 1 ? '话费充值' : ''}}</td>
<td>{{data.rechargeModel | rechargePrice}}</td> <td>{{data.operatorName}}</td>
<td>{{data.rechargeType== 1? '快充':'慢充'}}</td> <td>{{data.rechargeContent}} | {{data.rechargeType == 1 ? '快充' : '慢充'}}</td>
<td>{{data.idCard}}</td> <td>¥{{data.rechargePrice}}</td>
<td>{{data.orderNo}}</td> <td>{{data.orderNo}}</td>
<td>{{data.userName == null ? '暂无' : data.userName}}</td> <td>{{data.userName == null ? '暂无' : data.userName}}</td>
<td>{{data.rechargeContent == null ? '暂无': data.rechargeContent}}</td>
<td>{{data.orderPrice}}</td>
<td>{{data.payPrice}}</td>
<td>{{data.createTimed | date: 'yyyy-MM-dd HH:mm:ss'}}</td> <td>{{data.createTimed | date: 'yyyy-MM-dd HH:mm:ss'}}</td>
<td nzRight>{{data.payType | rechargePayType}}</td> <td nzRight>{{data.payType | rechargePayType}}</td>
<td nzRight> <td nzRight>{{data.rechargeStatus | rechargeStatus}}</td>
{{data.rechargeStatus == 1 ? '充值异常' : '正常'}} <td nzRight>{{data.payStatus | payStatus}}</td>
<span *ngIf="data.rechargeStatus === 1 && data.abnormalMsg != null">({{data.abnormalMsg}})</span>
</td>
<td nzRight>{{data.status | rechargeStatus}}</td>
<td nzRight class="table-td-operation"> <td nzRight class="table-td-operation">
<a (click)="getDetail(data.id)">详情</a> <a (click)="getDetail(data.id)">详情</a>
<!-- <a *ngIf="data.rechargeStatus === 1" (click)="getMobileRechargeByOrderId(data.id)">再次充值</a>--> <nz-divider nzType="vertical"></nz-divider>
<!-- <a *ngIf="data.status === 2" (click)="postRefund(data.orderNo)">申请退款</a>--> <a (click)="getChildOrder(data.id)">查看子订单</a>
</td> </td>
</tbody> </tbody>
</nz-table> </nz-table>
</div> </div>
<nz-modal [(nzVisible)]="isVisible" nzTitle="订单详情" nzWidth="1200" (nzOnOk)="isVisible = false" (nzOnCancel)="isVisible = false"> <nz-modal [(nzVisible)]="isVisible" nzTitle="订单详情" nzWidth="1200" (nzOnOk)="isVisible = false"
(nzOnCancel)="isVisible = false">
<nz-descriptions nzBordered [nzColumn]="{ xxl: 4, xl: 3, lg: 3, md: 3, sm: 2, xs: 1 }"> <nz-descriptions nzBordered [nzColumn]="{ xxl: 4, xl: 3, lg: 3, md: 3, sm: 2, xs: 1 }">
<nz-descriptions-item nzTitle="订单名称">{{data['remarks']}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="订单类型">{{data['rechargeModel'] | rechargePrice}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="订单号">{{data['orderNo']}}</nz-descriptions-item> <nz-descriptions-item nzTitle="订单号">{{data['orderNo']}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="客户名称">{{data['userName'] == null ? '暂无': data['userName']}}</nz-descriptions-item> <nz-descriptions-item nzTitle="充值类型">{{data['type'] == 1 ? '话费充值' : ''}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="充值号码">{{data['rechargeContent'] == null ? '暂无': data['rechargeContent']}}</nz-descriptions-item> <nz-descriptions-item nzTitle="运营商">{{data['operatorName']}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="身份证号" *ngIf="data['rechargeModel'] === 3 ">{{data['idCard']}}</nz-descriptions-item> <nz-descriptions-item nzTitle="充值内容">{{data['rechargeContent']}} ｜ {{data['rechargeType'] == 1 ? '快充' : '慢充'}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="充值姓名" *ngIf="data['rechargeModel'] === 3 ">{{data['rechargeName']}}</nz-descriptions-item> <nz-descriptions-item nzTitle="充值金额">¥{{data['rechargePrice']}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="充值金额">{{data['orderPrice']}}</nz-descriptions-item> <nz-descriptions-item nzTitle="应付金额">¥{{data['payPrice']}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="支付金额">{{data['payPrice']}}</nz-descriptions-item> <nz-descriptions-item nzTitle="积分抵扣金额">¥{{data['integralDeductionPrice'] == null ? '0' : data['integralDeductionPrice']}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="退款金额" *ngIf="data['refundFee'] != null">{{data['refundFee']}}</nz-descriptions-item> <nz-descriptions-item nzTitle="优惠券抵扣金额">¥{{data['discountDeductionPrice'] == null ? '0' : data['discountDeductionPrice']}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="实付金额">¥{{data['payRealPrice']}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="退款金额" *ngIf="data['refundFee'] != null">¥{{data['refundFee']}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="优惠券名称" *ngIf="data['memDiscountName'] != null">{{data['memDiscountName']}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="支付流水号">{{data['paySerialNo']}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="生成时间">{{data['createTimed'] | date: 'yyyy-MM-dd HH:mm:ss'}}</nz-descriptions-item> <nz-descriptions-item nzTitle="生成时间">{{data['createTimed'] | date: 'yyyy-MM-dd HH:mm:ss'}}</nz-descriptions-item>
<nz-descriptions-item *ngIf="data['cancelTime'] != null" nzTitle="取消时间">{{data['cancelTime'] | date: 'yyyy-MM-dd HH:mm:ss'}}</nz-descriptions-item> <nz-descriptions-item *ngIf="data['cancelTime'] != null" nzTitle="取消时间">{{data['cancelTime'] | date: 'yyyy-MM-dd HH:mm:ss'}}</nz-descriptions-item>
<nz-descriptions-item *ngIf="data['finishTime'] != null" nzTitle="完成时间">{{data['finishTime'] | date: 'yyyy-MM-dd HH:mm:ss'}}</nz-descriptions-item> <nz-descriptions-item *ngIf="data['finishTime'] != null" nzTitle="完成时间">{{data['finishTime'] | date: 'yyyy-MM-dd HH:mm:ss'}}</nz-descriptions-item>
<nz-descriptions-item *ngIf="data['payTime'] != null" nzTitle="支付时间">{{data['payTime'] | date: 'yyyy-MM-dd HH:mm:ss'}}</nz-descriptions-item> <nz-descriptions-item *ngIf="data['payTime'] != null" nzTitle="支付时间">{{data['payTime'] | date: 'yyyy-MM-dd HH:mm:ss'}}</nz-descriptions-item>
<nz-descriptions-item *ngIf="data['refundTime'] != null" nzTitle="退款时间">{{data['refundTime'] | date: 'yyyy-MM-dd HH:mm:ss'}}</nz-descriptions-item> <nz-descriptions-item *ngIf="data['refundTime'] != null" nzTitle="退款时间">{{data['refundTime'] | date: 'yyyy-MM-dd HH:mm:ss'}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="状态">{{data['status'] | rechargeStatus}}</nz-descriptions-item> <nz-descriptions-item nzTitle="支付类型">{{data['payType'] | rechargePayType}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="充值状态">{{data['rechargeStatus'] | rechargeStatus}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="支付状态">{{data['payStatus'] | payStatus}}</nz-descriptions-item>
</nz-descriptions> </nz-descriptions>
</nz-modal> </nz-modal>
<nz-modal [(nzVisible)]="errorStudentVisible" nzTitle="导入失败数据" (nzOnCancel)="errorStudentVisible = false" nzWidth="1200px" [nzFooter]="null">
<nz-table #errorStudentTable [nzData]="importErrorStudentArray" [nzScroll]="{ x: '1200px' }"> <nz-modal [(nzVisible)]="isVisibleChild" nzWidth="700" nzTitle="子订单记录" (nzOnCancel)="isVisibleChild = false" (nzOnOk)="isVisibleChild = false">
<nz-table #basicTable [nzData]="childData">
<thead> <thead>
<tr> <tr>
<th nzWidth="80px">序号</th> <th>订单号</th>
<th nzWidth="150px">订单号</th> <th>充值平台</th>
<th nzWidth="150px">用户昵称</th> <th>充值状态</th>
<th nzWidth="150px">用户联系方式</th> <th>创建时间</th>
<th nzWidth="150px">充值类型</th>
<th nzWidth="150px">充值内容</th>
<th nzWidth="150px">支付方式</th>
<th nzWidth="150px">卡号</th>
<th nzWidth="150px">订单金额</th>
<th nzWidth="150px">应付金额</th>
<th nzWidth="150px">订单状态</th>
<th nzWidth="150px">支付时间</th>
<th nzWidth="300px">原因</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr *ngFor="let data of errorStudentTable.data;let i = index"> <tr *ngFor="let data of basicTable.data">
<td>{{ i + 1}}</td>
<td>{{data.orderNo}}</td> <td>{{data.orderNo}}</td>
<td>{{data.userName}}</td> <td>{{data.rechargePlatform}}</td>
<td>{{data.userPhone}}</td> <td>{{data.status | chlidRechargeStatus}}</td>
<td>{{data.rechargeModelName}}</td> <td>{{data['createTime'] | date: 'yyyy-MM-dd HH:mm'}}</td>
<td>{{data.rechargeContent}}</td>
<td>{{data.payTypeName}}</td>
<td>{{data.cardNo}}</td>
<td>{{data.orderPrice}}</td>
<td>{{data.payRealPrice}}</td>
<td>{{data.statusName}}</td>
<td>{{data.payTime}}</td>
<td>{{data.errorMessage}}</td>
</tr> </tr>
</tbody> </tbody>
</nz-table> </nz-table>

14
src/app/admin/recharge-order/order-list/order-list.component.ts
Unescape View File

@ -22,8 +22,10 @@ export class OrderListComponent implements OnInit , OnDestroy {
searchForm: FormGroup; // 搜索框 searchForm: FormGroup; // 搜索框
validateForm: FormGroup; // 添加框 validateForm: FormGroup; // 添加框
requestData = []; // 列表数据 requestData = []; // 列表数据
childData = []; // 列表数据
importErrorStudentArray = []; importErrorStudentArray = [];
errorStudentVisible = false; errorStudentVisible = false;
isVisibleChild = false;
total: number; // 页码 total: number; // 页码
pageNum = 1; // 页码 pageNum = 1; // 页码
pageSize = 10; // 条码 pageSize = 10; // 条码
@ -249,4 +251,16 @@ export class OrderListComponent implements OnInit , OnDestroy {
this.errorStudentVisible = true; this.errorStudentVisible = true;
} }
// 查询子订单
public getChildOrder(id: number): void {
this.isVisibleChild = true;
this.recharge.getChildOrder(id , data => {
if (data['return_code'] === '000000') {
this.childData = data['return_data'];
} else {
this.message.error(data['return_msg']);
}
});
}
} }

2
src/app/admin/recharge-order/price-list/price-list.component.html
Unescape View File

@ -68,7 +68,7 @@
<nz-form-item> <nz-form-item>
<nz-form-label [nzSpan]="6">价格状态</nz-form-label> <nz-form-label [nzSpan]="6">价格状态</nz-form-label>
<nz-form-control [nzSpan]="16"> <nz-form-control [nzSpan]="16">
<nz-select nzShowSearch nzAllowClear formControlName="rechargeWay" nzPlaceHolder="请选择价格状态"> <nz-select nzShowSearch nzAllowClear formControlName="status" nzPlaceHolder="请选择价格状态">
<nz-option nzLabel="正常" [nzValue]="1"></nz-option> <nz-option nzLabel="正常" [nzValue]="1"></nz-option>
<nz-option nzLabel="售空" [nzValue]="2"></nz-option> <nz-option nzLabel="售空" [nzValue]="2"></nz-option>
<nz-option nzLabel="编辑中" [nzValue]="3"></nz-option> <nz-option nzLabel="编辑中" [nzValue]="3"></nz-option>

10
src/app/app-common.module.ts
Unescape View File

@ -41,7 +41,13 @@ import {
CompanyAmountRecordTypePipe, CompanyAmountRecordTypePipe,
CompanyAmountRecordSourceTypePipe, CompanyAmountRecordSourceTypePipe,
OilCardBindStatusPipe, OilCardBindStatusPipe,
OilCardRecordTypePipe, OilCardRecordSourceTypePipe, RechargePlatformPipe, PriceStatusPipe, GasStaffStatusPipe OilCardRecordTypePipe,
OilCardRecordSourceTypePipe,
RechargePlatformPipe,
PriceStatusPipe,
GasStaffStatusPipe,
PayStatusPipe,
ChlidRechargeStatusPipe
} from './pipes'; } from './pipes';
import {OilCardStatusPipe} from './pipes'; import {OilCardStatusPipe} from './pipes';
import {OilTypePipe} from './pipes/store/oil-type.pipe'; import {OilTypePipe} from './pipes/store/oil-type.pipe';
@ -92,6 +98,8 @@ const PIPES = [
OilPriceTaskStatusPipe, OilPriceTaskStatusPipe,
OilPriceTaskExecutionTypePipe, OilPriceTaskExecutionTypePipe,
OilPriceTaskPriceTypePipe, OilPriceTaskPriceTypePipe,
PayStatusPipe,
ChlidRechargeStatusPipe,
]; ];

2
src/app/pipes/index.ts
Unescape View File

@ -35,3 +35,5 @@ export * from './oil-card/oil-card-record-source-type.pipe';
export * from './gas-staff/gas-staff-status.pipe'; export * from './gas-staff/gas-staff-status.pipe';
export * from './recharge-price/recharge-platform.pipe'; export * from './recharge-price/recharge-platform.pipe';
export * from './recharge-price/price-status.pipe'; export * from './recharge-price/price-status.pipe';
export * from './pay-status.pipe';
export * from './chlid-recharge-status.pipe';

11
src/app/pipes/recharge-pay-type.pipe.ts
Unescape View File

@ -9,13 +9,18 @@ export class RechargePayTypePipe implements PipeTransform {
transform(value: number): string { transform(value: number): string {
switch (value) { switch (value) {
case 1: case 1:
return '微信'; return '支付宝';
case 2: case 2:
return '工会卡'; return '微信';
case 3: case 3:
return '积分'; return '汇联通工会卡';
case 4: case 4:
return '银联'; return '银联';
case 5:
return '银联分期';
case null:
return '积分抵扣';
} }
} }
} }

20
src/app/pipes/recharge-status.pipe.ts
Unescape View File

@ -7,18 +7,14 @@ export class RechargeStatusPipe implements PipeTransform {
transform(value: number): string { transform(value: number): string {
switch (value) { switch (value) {
case 1: case 201:
return '待支付'; return '充值中';
case 2: case 202:
return '已支付'; return '充值成功';
case 3: case 203:
return '已完成'; return '充值失败';
case 4: case 204:
return '已取消'; return '充值中';
case 5:
return '已退款';
case 6:
return '退款中';
} }
} }

12
src/app/services/recharge.service.ts
Unescape View File

@ -247,5 +247,17 @@ export class RechargeService {
}); });
} }
/**
* @Author Sum1Dream
* @methodName orderToRefundPre
* @Description // 预约订单退款
* @Date 11:17 上午 2021/11/23
* @Param [id: number, callBack]
*/
public getChildOrder(id: number, callBack) {
this.http.get(environment.baseUrl + 'outRechargeOrder/getChildOrder?orderId=' + id).subscribe(data => {
callBack(data);
});
}
} }

Write Preview
Loading…
Cancel
Save