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

pull/1/head
袁野 3 years ago
commit 8d3c6dd3ec
  1. 10
      src/app/admin/login/login/login.component.ts
  2. 18
      src/app/admin/navigation/navigation.component.ts
  3. 26
      src/app/admin/recharge-order/order-list/order-list.component.html
  4. 287
      src/app/admin/recharge-order/price-list/price-list.component.html
  5. 141
      src/app/admin/recharge-order/price-list/price-list.component.ts
  6. 16
      src/app/app-common.module.ts
  7. 2
      src/app/pipes/index.ts
  8. 6
      src/app/pipes/recharge-price.pipe.ts
  9. 14
      src/app/services/commons.service.ts
  10. 1
      src/app/services/local-storage.namespace.ts
  11. 8
      src/app/services/recharge.service.ts
  12. 8
      src/environments/environment.ts

@ -1,12 +1,13 @@
import {Component, OnInit} from '@angular/core';
import {FormGroup, Validators, FormBuilder} from '@angular/forms';
import {LoginService} from '../../../services/login.service';
import {NzModalService} from 'ng-zorro-antd';
import {NzMessageService, NzModalService} from 'ng-zorro-antd';
import {ADMIN_INFO_OBJECT, TOKEN, INIT_FLAG, LOGINTYPE} from '../../../services/local-storage.namespace';
import {LocalStorageService} from '../../../services/local-storage.service';
import {Router} from '@angular/router';
import {HttpClient} from '@angular/common/http';
@Component({
selector: 'app-login',
templateUrl: './login.component.html',
@ -21,6 +22,7 @@ export class LoginComponent implements OnInit {
private form: FormBuilder, // 表单校验
private http: HttpClient, // http请求
private loginService: LoginService,
private message: NzMessageService,
private modal: NzModalService) {
}
@ -55,11 +57,9 @@ export class LoginComponent implements OnInit {
this.store.set(LOGINTYPE, data['return_data']['type']);
this.router.navigateByUrl('/admin/index').then();
} else {
this.modal.warning({
nzTitle: '提示',
nzContent: data['return_msg']
});
this.message.error(data['return_msg']);
}
});
}
}

@ -20,12 +20,11 @@ import {Md5} from 'ts-md5';
import {environment} from '../../../environments/environment';
import {HttpClient} from '@angular/common/http';
import {CompanyTwoPwdService} from '../../services/company-two-pwd.service';
import {WebsocketService} from '../../services/websocket.service';
@Component({
selector: 'app-navigation',
templateUrl: './navigation.component.html',
styleUrls: ['./navigation.component.less'],
styleUrls: ['./navigation.component.less']
})
export class NavigationComponent implements OnInit {
@ -47,9 +46,8 @@ export class NavigationComponent implements OnInit {
private companyTwoPwdService: CompanyTwoPwdService,
private http: HttpClient, // http请求
private iconService: IconService,
private webSocketService: WebsocketService,
private store: LocalStorageService, // 数据请求
private modal: NzModalService,
private common: CommonsService,
private fb: FormBuilder, // 表单
private router: Router,
) {
@ -68,12 +66,16 @@ export class NavigationComponent implements OnInit {
this.switchValue = data['return_data']['codeValue'] === '1';
});
this.menuList = this.storage.getList(ADMIN_INFO_OBJECT)['menuList']; // 定义菜单数据
// 连接websocket
// this.webSocketService.connect(`wss://hsgcs.dctpay.com/msg/WebSocket/` + this.store.get(ADMIN_INFO_OBJECT)['merchantStore'].id);
this.common.getDictionaries(data => {
if (data['return_code'] === '000000') {
console.log(data);
} else {
this.message.error(data['return_msg']);
}
});
}
public activeLi(routeName): void {
this.routeName = routeName;
this.storage.set(ROUTENAME, routeName);

@ -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">

@ -9,24 +9,23 @@
<div nz-col nzSpan="8">
<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-select nzShowSearch nzAllowClear formControlName="type" nzPlaceHolder="请选择金额类型">
<nz-option nzLabel="电信充值" nzValue="1"></nz-option>
<nz-option nzLabel="移动充值" nzValue="2"></nz-option>
<nz-option nzLabel="联通充值" nzValue="3"></nz-option>
<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-select>
</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-label [nzSpan]="6">充值平台</nz-form-label>
<nz-form-control [nzSpan]="16">
<nz-select nzShowSearch nzAllowClear formControlName="showType" 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 nzShowSearch nzAllowClear formControlName="rechargePlatform" nzPlaceHolder="请选择充值平台">
<nz-option nzLabel="尖椒" [nzValue]="1"></nz-option>
<nz-option nzLabel="龙阅" [nzValue]="2"></nz-option>
</nz-select>
</nz-form-control>
</nz-form-item>
@ -42,6 +41,42 @@
</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>
<nz-form-control [nzSpan]="16">
<nz-select nzShowSearch nzAllowClear formControlName="rechargeWay" nzPlaceHolder="请选择充值方式">
<nz-option nzLabel="自动" [nzValue]="1"></nz-option>
<nz-option nzLabel="手动" [nzValue]="2"></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>
<nz-form-control [nzSpan]="16">
<nz-select nzShowSearch nzAllowClear formControlName="rechargeWay" nzPlaceHolder="请选择价格状态">
<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>
</div>
</div>
@ -73,35 +108,46 @@
[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>
<tr *ngFor="let data of ajaxTable.data; let i = index">
<td>{{i + 1}}</td>
<td>{{data.type | rechargePrice}}</td>
<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>
@ -112,20 +158,76 @@
<nz-form-item *ngIf="!edit">
<nz-form-label [nzSpan]="6" nzRequired>金额类型</nz-form-label>
<nz-form-control [nzSpan]="16" nzErrorTip="请选择类型!">
<nz-select nzShowSearch nzAllowClear formControlName="type" nzPlaceHolder="请选择类型">
<nz-option nzLabel="电信充值" nzValue="1"></nz-option>
<nz-option nzLabel="移动充值" nzValue="2"></nz-option>
<nz-option nzLabel="联通充值" nzValue="3"></nz-option>
<nz-select
nzMode="multiple"
formControlName="rechargePrices"
nzPlaceHolder="请选择充值金额"
>
<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-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-select>
</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
nzMode="multiple"
formControlName="productPlatform"
nzPlaceHolder="请选择展示平台"
>
<nz-option *ngFor="let item of productPlatformArray" nzValue="{{item.codeValue}}" nzLabel="{{item.codeName}}"></nz-option>
</nz-select>
</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 nzMode="multiple" formControlName="rechargePlatform" nzPlaceHolder="请选择充值平台">
<nz-option *ngFor="let item of platformArray" [nzValue]="item.codeValue" [nzLabel]="item.codeName"></nz-option>
</nz-select>
</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
nzMode="multiple"
formControlName="payType"
nzPlaceHolder="请选择支付方式"
>
<nz-option *ngFor="let item of priceTypeArray" nzValue="{{item.codeValue}}" nzLabel="{{item.codeName}}"></nz-option>
</nz-select>
</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="showType" nzPlaceHolder="请选择展示区域">
<nz-option nzLabel="小程序" [nzValue] ="1"></nz-option>
<nz-option nzLabel="H5" [nzValue] ="2"></nz-option>
<nz-option nzLabel="银联" [nzValue] ="3"></nz-option>
<nz-form-label [nzSpan]="6" nzRequired>充值方式</nz-form-label>
<nz-form-control [nzSpan]="16" nzErrorTip="请选择充值方式!">
<nz-select nzShowSearch nzAllowClear formControlName="rechargeWay" nzPlaceHolder="请选择充值方式">
<nz-option nzLabel="自动" [nzValue]="1"></nz-option>
<nz-option nzLabel="手动" [nzValue]="2"></nz-option>
</nz-select>
</nz-form-control>
</nz-form-item>
@ -139,73 +241,66 @@
</nz-form-control>
</nz-form-item>
<nz-form-item>
<nz-form-label [nzSpan]="6" nzRequired>商品排序</nz-form-label>
<nz-form-control [nzSpan]="16" nzErrorTip="请输入商品排序!">
<input [type]="'number'" nz-input formControlName="sort" />
<nz-form-label [nzSpan]="6" nzRequired>折扣比例</nz-form-label>
<nz-form-control [nzSpan]="16" nzErrorTip="请输入折扣比例!">
<nz-input-number
style="width: 200px"
formControlName="discount"
[nzMin]="1"
[nzMax]="100"
[nzStep]="1"
[nzPrecision]="2"
nzPrecisionMode="cut"
(ngModelChange)="changePayType($event)"
nzPlaceHolder="请输入折扣比例!"
[nzFormatter]="formatterPercent"
[nzParser]="parserPercent"
></nz-input-number>
</nz-form-control>
</nz-form-item>
<!-- <nz-form-item>-->
<!-- <nz-form-label [nzSpan]="6" nzRequired>供货商编号</nz-form-label>-->
<!-- <nz-form-control [nzSpan]="16" nzErrorTip="请输入供货商编号!">-->
<!-- <input [type]="'number'" nz-input formControlName="channel" />-->
<!-- </nz-form-control>-->
<!-- </nz-form-item>-->
<!-- <nz-form-item>-->
<!-- <nz-form-label [nzSpan]="6" nzRequired>商品ID</nz-form-label>-->
<!-- <nz-form-control [nzSpan]="16" nzErrorTip="请输入商品ID!">-->
<!-- <input [type]="'number'" nz-input formControlName="goodsId" />-->
<!-- </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-input-group nzSuffix="RMB" nzPrefix="¥">
<input [type]="'number'" (ngModelChange)="getPrice()" nz-input formControlName="price" />
</nz-input-group>
<nz-form-label [nzSpan]="6" nzRequired>积分支付比例</nz-form-label>
<nz-form-control [nzSpan]="16" nzErrorTip="请输入积分支付比例!">
<nz-input-number
style="width: 200px"
formControlName="integralDiscount"
[nzMin]="0"
[nzMax]="100"
[nzStep]="1"
[nzPrecision]="2"
nzPrecisionMode="cut"
nzPlaceHolder="请输入积分支付比例!"
[nzFormatter]="formatterPercent"
[nzParser]="parserPercent"
></nz-input-number>
</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-input-group nzSuffix="%" >
<input [type]="'number'" (ngModelChange)="getPrice()" nz-input formControlName="discount" />
</nz-input-group>
<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>
<nz-form-label [nzSpan]="6" nzRequired>支付金额</nz-form-label>
<nz-form-control [nzSpan]="16" nzErrorTip="请输入支付金额!">
<nz-input-group nzSuffix="RMB" nzPrefix="¥">
<input [type]="'number'" nz-input [(ngModel)]="realPrice" formControlName="realPrice" />
</nz-input-group>
<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>
<nz-modal [(nzVisible)]="isVisibleGoods" nzWidth="900" nzTitle="渠道商获取关联商品" (nzOnCancel)="handleCancelGoods()" (nzOnOk)="handleCancelGoods()">
<nz-table #basicTable [nzData]="goodsArray">
<thead>
<tr>
<th>供货商编号</th>
<th>商品ID</th>
<th>渠道商标识符</th>
<th>折扣比例</th>
<th>商品名称</th>
<th>渠道商名称</th>
<th>状态</th>
</tr>
</thead>
<tbody>
<tr *ngFor="let data of basicTable.data">
<td>{{data.channel}}</td>
<td>{{data.goodsId}}</td>
<td>{{data.channelMark | channelMark}}</td>
<td>{{data.discountRatio}}%</td>
<td>{{data.goodsName}}</td>
<td>{{data.memberName}}</td>
<td>{{data.state == 1 ? '上架' : '下架'}}</td>
</tr>
</tbody>
</nz-table>
</nz-modal>

@ -19,6 +19,10 @@ export class PriceListComponent implements OnInit {
searchForm: FormGroup; // 搜索框
validateForm: FormGroup; // 添加框
requestData = []; // 列表数据
priceArray = []; // 价格数据
priceTypeArray = []; // 支付类型数据
platformArray = []; // 充值平台数据
productPlatformArray = []; // 展示平台数据
total: number; // 页码
pageNum = 1; // 页码
@ -27,10 +31,13 @@ export class PriceListComponent implements OnInit {
isVisible = false;
id: number;
edit = false;
payPrice;
isVisibleGoods = false;
realPrice = 0;
goodsArray;
formatterPercent = (value: number): string => `${value == null ? 0 : value} %`;
parserPercent = (value: string): string => value.replace(' %', '');
constructor(
private form: FormBuilder,
private recharge: RechargeService,
@ -45,23 +52,53 @@ export class PriceListComponent implements OnInit {
ngOnInit(): void {
this.init();
this.getInitData();
}
// 获取初始化数据
private getInitData(): void {
// 获取价格数据
this.common.getDictionary('RECHARGE_AMOUNT ', data => {
this.priceArray = data['return_data'];
});
// 获取支付类型
this.common.getDictionary('PAY_TYPE ', data => {
this.priceTypeArray = data['return_data'];
});
// 获取充值平台
this.common.getDictionary('RECHARGE_PLATFORM ', data => {
this.platformArray = data['return_data'];
});
// 获取展示平台
this.common.getDictionary('SHOW_PLATFORM ', data => {
this.productPlatformArray = data['return_data'];
});
}
public init(): void {
this.searchForm = this.form.group({
type: [null],
operatorType : [null],
rechargePlatform: [null],
rechargeType: [null],
showType: [null],
rechargeWay: [null],
status: [null],
});
this.validateForm = this.form.group({
type: [null, [Validators.required]],
showType: [null, [Validators.required]],
price: [null, [Validators.required]],
rechargeType: [null, [Validators.required]],
realPrice: [{value: null, disabled: true}, [Validators.required]],
discount: [null, [Validators.required]],
sort: [null, [Validators.required]],
// channel: [null, [Validators.required]],
integralDiscount: [0],
operatorType: [null, [Validators.required]],
rechargePrices: [null, [Validators.required]],
productPlatform: [null, [Validators.required]],
rechargeType: [null, [Validators.required]],
rechargePlatform: [null, [Validators.required]],
rechargeWay: [null, [Validators.required]],
payType: [null, [Validators.required]],
rechargePrice: [null],
payPrice: [null],
sort: [null],
goodsId: [null],
});
@ -98,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;
});
@ -108,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();
@ -128,14 +160,15 @@ export class PriceListComponent implements OnInit {
return;
}
}
this.validateForm.value.realPrice = this.validateForm.value.price * this.validateForm.value.discount / 100;
if (this.edit) {
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();
this.isVisible = false;
} else {
this.message.error(data['return_msg']);
@ -144,9 +177,11 @@ 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;
this.validateForm.reset();
} else {
this.message.error(data['return_msg']);
}
@ -156,35 +191,59 @@ export class PriceListComponent implements OnInit {
}
handleCancel(): void {
this.validateForm.reset();
this.isVisible = false;
}
handleCancelGoods(): void {
this.isVisibleGoods = 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);
@ -196,17 +255,9 @@ export class PriceListComponent implements OnInit {
});
}
public getMemberGoods(): void {
this.isVisibleGoods = true;
this.recharge.getMemberGoods(data => {
this.goodsArray = data['return_data']['data'];
});
public changePayType(e): void {
this.payPrice = this.validateForm.value['rechargePrice'] * e / 100;
}
public getPrice(): void {
this.realPrice = this.validateForm.value.price * this.validateForm.value.discount / 100;
}
}

@ -41,15 +41,11 @@ import {
CompanyAmountRecordTypePipe,
CompanyAmountRecordSourceTypePipe,
OilCardBindStatusPipe,
OilCardRecordTypePipe, OilCardRecordSourceTypePipe
OilCardRecordTypePipe, OilCardRecordSourceTypePipe, RechargePlatformPipe, PriceStatusPipe
} from './pipes';
import {OilCardStatusPipe} from './pipes/oil-card/oil-card-status.pipe';
import {OilCardStatusPipe} from './pipes';
import { OilTypePipe } from './pipes/store/oil-type.pipe';
import {GasStaffStatusPipe} from './pipes/gas-staff/gas-staff-status.pipe';
import {GasStaffStatusPipe} from './pipes';
const PIPES = [
TimesPipe,
@ -88,6 +84,10 @@ const PIPES = [
OilCardRecordTypePipe,
OilCardRecordSourceTypePipe,
GasStaffStatusPipe,
OilTypePipe,
RechargePlatformPipe,
PriceStatusPipe,
];
@ -101,8 +101,6 @@ const PIPES = [
],
declarations: [
...PIPES,
OilTypePipe,
],
exports: [

@ -33,3 +33,5 @@ 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 './gas-staff/gas-staff-status.pipe';
export * from './recharge-price/recharge-platform.pipe';
export * from './recharge-price/price-status.pipe';

@ -8,11 +8,11 @@ export class RechargePricePipe implements PipeTransform {
transform(value: number): string {
switch (value) {
case 1:
return '电信充值';
return '电信运营商';
case 2:
return '移动充值';
return '移动运营商';
case 3:
return '联通充值';
return '联通运营商';
}
}

@ -15,7 +15,8 @@ export class CommonsService {
private modalService: NzModalService, // 对话框
private http: HttpClient,
private notification: NzNotificationService
) { }
) {
}
/**
* GET请求参数 key1=value1&key2=value2
@ -355,4 +356,15 @@ export class CommonsService {
});
}
/**
*
* @param param
* @param callback
*/
public getDictionaries(callback): any {
this.http.get(environment.baseUrl + 'bsOrganization/getOrganizationList').subscribe(data => {
callback(data);
});
}
}

@ -14,3 +14,4 @@ export const RESUME_STATUS = 'resume_status';
export const RESUME_STATUS_NAME = 'resume_status_name';
export const LOGINTYPE = 'loginType'; // 1 pc端登录 2 后台登录
export const COMPANYMENU = 'companyMenu'; // 1 公司路由
export const ALL_DICTIONARY = 'dictionary'; // 数据字典

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

Loading…
Cancel
Save