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

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

Browse Source
pull/1/head
袁野 2 years ago
parent d2a78acc66
commit 82fc004941
7 changed files with 163 additions and 73 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. 26
      src/app/admin/recharge-order/order-list/order-list.component.html
  2. 110
      src/app/admin/recharge-order/price-list/price-list.component.html
  3. 77
      src/app/admin/recharge-order/price-list/price-list.component.ts
  4. 7
      src/app/app-common.module.ts
  5. 2
      src/app/pipes/index.ts
  6. 8
      src/app/services/recharge.service.ts
  7. 4
      src/environments/environment.ts

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

@ -125,15 +125,15 @@
<div class="inner-content">
<span>共计 {{total}} 条数据</span>
<div class="operating-button">
<nz-upload
[nzAccept]="'.xls,.xlsx'"
nzAction="{{WEB_SERVE_URL}}outRechargeOrder/importRechargeOrder"
[nzHeaders]="{ authorization: 'authorization-text' }"
(nzChange)="handleChange($event)"
[nzShowUploadList]="false"
>
<button nz-button nzType="primary" ><i nz-icon nzType="import" nzTheme="outline"></i>导入充值订单</button>
</nz-upload>
<!-- <nz-upload-->
<!-- [nzAccept]="'.xls,.xlsx'"-->
<!-- nzAction="{{WEB_SERVE_URL}}outRechargeOrder/importRechargeOrder"-->
<!-- [nzHeaders]="{ authorization: 'authorization-text' }"-->
<!-- (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>
<nz-table
@ -189,8 +189,8 @@
<td nzRight>{{data.status | rechargeStatus}}</td>
<td nzRight class="table-td-operation">
<a (click)="getDetail(data.id)">详情</a>
<a *ngIf="data.rechargeStatus === 1" (click)="getMobileRechargeByOrderId(data.id)">再次充值</a>
<a *ngIf="data.status === 2" (click)="postRefund(data.orderNo)">申请退款</a>
<!-- <a *ngIf="data.rechargeStatus === 1" (click)="getMobileRechargeByOrderId(data.id)">再次充值</a>-->
<!-- <a *ngIf="data.status === 2" (click)="postRefund(data.orderNo)">申请退款</a>-->
</td>
</tbody>
</nz-table>
@ -215,10 +215,6 @@
<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>
<!-- <div *nzModalFooter>-->
<!-- <button nz-button nzType="default" (click)="handleCancel()">取消</button>-->
<!-- <button nz-button *ngIf="data['status'] === 2" nzType="primary" (click)="finishOrder(id)">完成充值</button>-->
<!-- </div>-->
</nz-modal>
<nz-modal [(nzVisible)]="errorStudentVisible" nzTitle="导入失败数据" (nzOnCancel)="errorStudentVisible = false" nzWidth="1200px" [nzFooter]="null">

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

@ -23,7 +23,7 @@
<nz-form-item>
<nz-form-label [nzSpan]="6">充值平台</nz-form-label>
<nz-form-control [nzSpan]="16">
<nz-select nzShowSearch nzAllowClear formControlName="showType" nzPlaceHolder="请选择充值平台">
<nz-select nzShowSearch nzAllowClear formControlName="rechargePlatform" nzPlaceHolder="请选择充值平台">
<nz-option nzLabel="尖椒" [nzValue]="1"></nz-option>
<nz-option nzLabel="龙阅" [nzValue]="2"></nz-option>
</nz-select>
@ -41,6 +41,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-select nzShowSearch nzAllowClear formControlName="rechargeType" nzPlaceHolder="请选择充值类型">-->
<!-- <nz-option nzLabel="小程序" [nzValue]="1"></nz-option>-->
<!-- <nz-option nzLabel="H5" [nzValue]="2"></nz-option>-->
<!-- <nz-option nzLabel="银联" [nzValue]="3"></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>
@ -96,20 +108,25 @@
[nzTotal]="total"
[(nzPageIndex)]="pageNum"
[(nzPageSize)]="pageSize"
[nzScroll]="{ x: '1200px' }"
(nzPageIndexChange)="getRequest(false , searchForm.value)"
(nzPageSizeChange)="getRequest(false , searchForm.value)">
<thead nzSingleSort>
<tr>
<th>编号</th>
<th>充值金额</th>
<th>折扣比例</th>
<th>支付金额</th>
<th>展示区域</th>
<th>商品ID</th>
<th>充值金额</th>
<th>支付金额</th>
<th>创建时间</th>
<th>操作</th>
<th nzWidth="60px">编号</th>
<th nzWidth="90px">充值金额</th>
<th nzWidth="90px">折扣比例</th>
<th nzWidth="90px">支付金额</th>
<th nzWidth="120px">积分抵扣比例</th>
<th nzWidth="120px">运营商</th>
<th nzWidth="90px">充值类型</th>
<th nzWidth="100px">充值平台</th>
<th nzWidth="100px">支付方式</th>
<th nzWidth="100px">展示平台</th>
<th nzWidth="80px">商品ID</th>
<th nzWidth="120px">创建时间</th>
<th nzRight nzWidth="80px">状态</th>
<th nzRight nzWidth="160px">操作</th>
</tr>
</thead>
<tbody>
@ -118,16 +135,19 @@
<td>{{data.rechargePrice}}</td>
<td>{{data.discount + "%"}}</td>
<td>{{data.payPrice}}</td>
<td>{{data.integralDiscount + "%"}}</td>
<td>{{data.operatorType | rechargePrice}}</td>
<td>{{data.rechargeType== 1? '快充':'慢充'}}</td>
<td>{{data.showType | showType}}</td>
<td>{{data.price}}</td>
<td>{{data.realPrice}}</td>
<td>{{data.rechargePlatform | rechargePlatform}}</td>
<td>{{data.productPayTypeString.substring(0 , data.productPayTypeString.length - 1)}}</td>
<td>{{data.productPlatformString.substring(0 , data.productPlatformString.length - 1)}}</td>
<td>{{data.goodsId == null ? '暂未配置' : data.goodsId}}</td>
<td>{{data.createTime | date: 'yyyy-MM-dd HH:mm'}}</td>
<td class="table-td-operation">
<a (click)="getEdit(data.id)">编辑</a>
<a style="margin-left: 20px;" (click)='getForbiddenUser(data.id , data.status)'>{{data.status === 1 ? '售空': '禁用'}}</a>
<a style="margin-left: 20px;" (click)="getForbiddenUserD(data.id)">删除</a>
<td nzRight="">{{data.status | priceStatus}}</td>
<td nzRight class="table-td-operation">
<a *ngIf="data.status != 1" (click)="getEdit(data.id)">编辑</a>
<a style="margin-left: 20px;" (click)='getForbiddenUser(data.id , data.status)'>{{data.status === 1 ? '售空': '上线'}}</a>
<a *ngIf="data.status != 1" style="margin-left: 20px;" (click)="getForbiddenUserD(data.id)">删除</a>
</td>
</tbody>
</nz-table>
@ -135,7 +155,7 @@
<nz-modal [(nzVisible)]="isVisible" nzTitle="金额编辑" (nzOnCancel)="handleCancel()" (nzOnOk)="handleOk()">
<form nz-form [formGroup]="validateForm" class="login-form">
<nz-form-item>
<nz-form-item *ngIf="!edit">
<nz-form-label [nzSpan]="6" nzRequired>金额类型</nz-form-label>
<nz-form-control [nzSpan]="16" nzErrorTip="请选择类型!">
<nz-select
@ -145,15 +165,28 @@
>
<nz-option *ngFor="let item of priceArray" nzValue="{{item.codeValue}}" nzLabel="{{item.codeName}}"></nz-option>
</nz-select>
<input *ngIf="edit" readonly nz-input formControlName="rechargePrice" />
</nz-form-control>
</nz-form-item>
<nz-form-item *ngIf="!edit">
<nz-form-item *ngIf="edit">
<nz-form-label [nzSpan]="6" nzRequired>充值金额</nz-form-label>
<nz-form-control [nzSpan]="16" nzErrorTip="请输入充值金额!">
<input readonly nz-input formControlName="rechargePrice" />
</nz-form-control>
</nz-form-item>
<nz-form-item *ngIf="edit">
<nz-form-label [nzSpan]="6" nzRequired>支付金额</nz-form-label>
<nz-form-control [nzSpan]="16" nzErrorTip="请输入支付金额!">
<input readonly nz-input formControlName="payPrice" [(ngModel)]="payPrice" />
</nz-form-control>
</nz-form-item>
<nz-form-item>
<nz-form-label [nzSpan]="6" nzRequired>运营商</nz-form-label>
<nz-form-control [nzSpan]="16" nzErrorTip="请选择运营商!">
<nz-select nzShowSearch nzAllowClear formControlName="operatorType" nzPlaceHolder="请选择运营商！">
<nz-option nzLabel="电信运营商" nzValue="1"></nz-option>
<nz-option nzLabel="移动运营商" nzValue="2"></nz-option>
<nz-option nzLabel="联通运营商" nzValue="3"></nz-option>
<nz-option nzLabel="电信运营商" [nzValue]="1"></nz-option>
<nz-option nzLabel="移动运营商" [nzValue]="2"></nz-option>
<nz-option nzLabel="联通运营商" [nzValue]="3"></nz-option>
</nz-select>
</nz-form-control>
</nz-form-item>
@ -173,7 +206,7 @@
<nz-form-label [nzSpan]="6" nzRequired>充值平台</nz-form-label>
<nz-form-control [nzSpan]="16" nzErrorTip="请选择充值平台!">
<nz-select nzShowSearch nzAllowClear nzMode="multiple" formControlName="rechargePlatform" nzPlaceHolder="请选择充值平台">
<nz-option *ngFor="let item of platformArray" nzValue="{{item.codeValue}}" nzLabel="{{item.codeName}}"></nz-option>
<nz-option *ngFor="let item of platformArray" [nzValue]="item.codeValue" [nzLabel]="item.codeName"></nz-option>
</nz-select>
</nz-form-control>
</nz-form-item>
@ -218,6 +251,7 @@
[nzStep]="1"
[nzPrecision]="2"
nzPrecisionMode="cut"
(ngModelChange)="changePayType($event)"
nzPlaceHolder="请输入折扣比例!"
[nzFormatter]="formatterPercent"
[nzParser]="parserPercent"
@ -230,7 +264,7 @@
<nz-input-number
style="width: 200px"
formControlName="integralDiscount"
[nzMin]="1"
[nzMin]="0"
[nzMax]="100"
[nzStep]="1"
[nzPrecision]="2"
@ -241,6 +275,32 @@
></nz-input-number>
</nz-form-control>
</nz-form-item>
<nz-form-item *ngIf="edit">
<nz-form-label [nzSpan]="6" >商品编号</nz-form-label>
<nz-form-control [nzSpan]="16" nzErrorTip="请输入商品编号!">
<nz-input-number
style="width: 200px"
formControlName="goodsId"
[nzMin]="1"
[nzMax]="10000"
[nzStep]="1"
nzPlaceHolder="请输入商品编号!"
></nz-input-number>
</nz-form-control>
</nz-form-item>
<nz-form-item *ngIf="edit">
<nz-form-label [nzSpan]="6" >排序</nz-form-label>
<nz-form-control [nzSpan]="16" nzErrorTip="请输入排序!">
<nz-input-number
style="width: 200px"
formControlName="sort"
[nzMin]="1"
[nzMax]="100"
[nzStep]="1"
nzPlaceHolder="请输入排序!"
></nz-input-number>
</nz-form-control>
</nz-form-item>
</form>
</nz-modal>

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

@ -31,7 +31,7 @@ export class PriceListComponent implements OnInit {
isVisible = false;
id: number;
edit = false;
payPrice;
isVisibleGoods = false;
realPrice = 0;
@ -86,7 +86,7 @@ export class PriceListComponent implements OnInit {
});
this.validateForm = this.form.group({
discount: [null, [Validators.required]],
integralDiscount: [null, [Validators.required]],
integralDiscount: [0],
operatorType: [null, [Validators.required]],
rechargePrices: [null, [Validators.required]],
productPlatform: [null, [Validators.required]],
@ -94,6 +94,10 @@ export class PriceListComponent implements OnInit {
rechargePlatform: [null, [Validators.required]],
rechargeWay: [null, [Validators.required]],
payType: [null, [Validators.required]],
rechargePrice: [null],
payPrice: [null],
sort: [null],
goodsId: [null],
});
@ -131,6 +135,10 @@ export class PriceListComponent implements OnInit {
this.id = id;
this.edit = true;
this.recharge.findById(id, data => {
data['return_data']['productPlatform'] = data['return_data']['productPlatformString'].substring(0 , data['return_data']['productPlatformString'].length - 1).split(',');
data['return_data']['rechargePlatform'] = data['return_data']['rechargePlatform'].substring(1 , data['return_data']['rechargePlatform'].length - 1).split('-');
data['return_data']['payType'] = data['return_data']['productPayTypeString'].substring(0 , data['return_data']['productPayTypeString'].length - 1).split(',');
data['return_data']['rechargePrices'] = ['1'];
this.validateForm.patchValue(data['return_data']);
this.isVisible = true;
});
@ -141,17 +149,8 @@ export class PriceListComponent implements OnInit {
}
}
// 查看详情
public getDetail(id: number): void {
this.router.navigate(['/admin/company/company-detail'], {
queryParams: {
companyId: id
}
}).then(r => console.log(r));
}
handleOk(): void {
const wait = this.message.loading('提交中..', { nzDuration: 0 }).messageId;
// tslint:disable-next-line:forin
for (const i in this.validateForm.controls) {
this.validateForm.controls[i].markAsDirty();
@ -166,6 +165,7 @@ export class PriceListComponent implements OnInit {
this.validateForm.value['id'] = this.id;
this.recharge.updatePrice(this.validateForm.value, data => {
if (data['return_code'] === '000000') {
this.message.remove(wait);
this.message.success('修改成功');
this.getRequest(false, this.searchForm.value);
this.validateForm.reset();
@ -177,6 +177,7 @@ export class PriceListComponent implements OnInit {
} else {
this.recharge.insertPrice(this.validateForm.value, data => {
if (data['return_code'] === '000000') {
this.message.remove(wait);
this.message.success('添加成功');
this.getRequest(false, this.searchForm.value);
this.isVisible = false;
@ -190,33 +191,59 @@ export class PriceListComponent implements OnInit {
}
handleCancel(): void {
this.validateForm.reset();
this.isVisible = false;
}
public getForbiddenUser(id, status: any): void {
const message = (status === 1 ? '是否禁用' : '是否启用');
public getForbiddenUser(idPost, status: any): void {
let statusPost;
let message;
switch (status) {
case 1:
statusPost = 2;
message = '是否售空';
break;
case 2:
statusPost = 1;
message = '是否上线';
break;
case 3:
statusPost = 1;
message = '是否上线';
break;
}
this.common.showConfirm(message, data => {
if (data) {
this.recharge.onAndOffShelves(id, dataUser => {
if (dataUser['return_code'] === '000000') {
this.message.success('操作成功');
this.common.showConfirm(message, item => {
if (item) {
this.recharge.editPriceStatus( {
id: idPost,
status: statusPost
}, data => {
if (data['return_code'] === '000000') {
this.message.success('提交成功');
this.getRequest(false, this.searchForm.value);
} else {
this.message.error(dataUser['return_msg']);
this.message.error(data['return_msg']);
}
});
}
});
console.log(status);
console.log(statusPost);
console.log(message);
}
public getForbiddenUserD(id): void {
public getForbiddenUserD(idPost): void {
this.common.showConfirm('是否删除', item => {
if (item) {
this.recharge.deletePrice(id, data => {
this.recharge.editPriceStatus({
id: idPost,
status: 0
}, data => {
if (data['return_code'] === '000000') {
this.message.success('删除成功');
this.getRequest(false, this.searchForm.value);
@ -228,7 +255,9 @@ export class PriceListComponent implements OnInit {
});
}
public changePayType(e): void {
this.payPrice = this.validateForm.value['rechargePrice'] * e / 100;
}
}

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

@ -45,6 +45,8 @@ import {
} from './pipes';
import {OilCardStatusPipe} from "./pipes/oil-card/oil-card-status.pipe";
import { OilTypePipe } from './pipes/store/oil-type.pipe';
import { RechargePlatformPipe } from './pipes/recharge-price/recharge-platform.pipe';
import { PriceStatusPipe } from './pipes/recharge-price/price-status.pipe';
@ -86,6 +88,9 @@ const PIPES = [
OilCardBindStatusPipe,
OilCardRecordTypePipe,
OilCardRecordSourceTypePipe,
OilTypePipe,
RechargePlatformPipe,
PriceStatusPipe,
];
@ -99,8 +104,6 @@ const PIPES = [
],
declarations: [
...PIPES,
OilTypePipe,
],
exports: [

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

@ -32,3 +32,5 @@ export * from './oil-card/oil-card-status.pipe';
export * from './oil-card/oil-card-bind-status.pipe';
export * from './oil-card/oil-card-record-type.pipe';
export * from './oil-card/oil-card-record-source-type.pipe';
export * from './recharge-price/recharge-platform.pipe';
export * from './recharge-price/price-status.pipe';

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

@ -28,13 +28,13 @@ export class RechargeService {
/**
* @Author Sum1Dream
* @methodName deletePrice
* @Description //上下架
* @methodName editPriceStatus
* @Description // 修改价格状态
* @Date 15:03 2021/8/12
* @Param mod
**/
public onAndOffShelves(id: number, callBack) {
this.http.get(environment.baseUrl + 'outRechargePrice/onAndOffShelves?id=' + id).subscribe(data => {
public editPriceStatus(params: object, callBack) {
this.http.post(environment.baseUrl + 'outRechargePrice/editPriceStatus' , params ).subscribe(data => {
callBack(data);
});
}

4
src/environments/environment.ts
Unescape View File

@ -6,8 +6,8 @@ export const environment = {
production: false,
// baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址)
// imageUrl: 'http://localhost:9302/filesystem/',
baseUrl: 'https://hsgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
imageUrl: 'https://hsgcs.dctpay.com/filesystem/',
baseUrl: 'https://hsg.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
imageUrl: 'https://hsg.dctpay.com/filesystem/',
key: 'https://hsgcs.dctpay.com/phone-recharge-H5/index.html?codeValue=',
inviteUrl: 'https://hsgcs.dctpay.com/wx/?action=ic&id=',
};

Write Preview
Loading…
Cancel
Save