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 da7ec43abe
commit ecfadda898
6 changed files with 416 additions and 396 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. 262
      src/app/admin/order-manage/dicount-package-order-list/dicount-package-order-list.component.html
  2. 3
      src/app/admin/order-manage/dicount-package-order-list/dicount-package-order-list.component.scss
  3. 228
      src/app/admin/order-manage/dicount-package-order-list/dicount-package-order-list.component.ts
  4. 118
      src/app/admin/recharge-order/price-list/price-list.component.html
  5. 1
      src/environments/environment.prod.ts
  6. 8
      src/environments/environment.ts

262
src/app/admin/order-manage/dicount-package-order-list/dicount-package-order-list.component.html
Unescape View File

@ -2,181 +2,235 @@
<app-breadcrumb></app-breadcrumb> <app-breadcrumb></app-breadcrumb>
<!-- end 面包屑 --> <!-- end 面包屑 -->
<!--条件搜索--> <nz-spin [nzSpinning]="loadingObject.status" [nzTip]="loadingObject.title">
<!-- start 搜索条件 -->
<div [@openClose]="isCollapse ? 'open' : 'closed'">
<div class="inner-content"> <div class="inner-content">
<form nz-form [formGroup]="searchForm" (ngSubmit)="getRequest(true , searchForm.value)"> <form nz-form [formGroup]="searchForm" (ngSubmit)="getRequest(true , searchForm.value)">
<div nz-row> <div nz-row>
<div nz-col nzSpan="8" *ngIf="roleType === 1">
<div nz-col nzSpan="8">
<nz-form-item> <nz-form-item>
<nz-form-label [nzSpan]="6">区域公司</nz-form-label> <nz-form-label [nzSpan]="8">交易单号</nz-form-label>
<nz-form-control [nzSpan]="16"> <nz-form-control [nzSpan]="14">
<nz-select nzShowSearch nzAllowClear [formControlName]="'companyId'" (ngModelChange)="getMerchantListByCompany($event)"> <input nz-input formControlName="orderNo" />
<nz-option *ngFor="let item of companyData" nzValue="{{item.id}}" nzLabel="{{item.name}}"></nz-option>
</nz-select>
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
</div> </div>
<div nz-col nzSpan="8" *ngIf="roleType === 5 || roleType === 1">
<div nz-col nzSpan="8">
<nz-form-item> <nz-form-item>
<nz-form-label [nzSpan]="6">商户</nz-form-label> <nz-form-label [nzSpan]="8">客户电话</nz-form-label>
<nz-form-control [nzSpan]="16"> <nz-form-control [nzSpan]="14">
<nz-select nzShowSearch nzAllowClear [formControlName]="'merchantId'"> <input nz-input formControlName="memPhone" />
<nz-option *ngFor="let item of merchantData" nzValue="{{item.id}}" nzLabel="{{item.merchantName}}"></nz-option>
</nz-select>
</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]="6">订单号</nz-form-label> <nz-form-label [nzSpan]="8">交易状态</nz-form-label>
<nz-form-control [nzSpan]="16"> <nz-form-control [nzSpan]="14">
<input nz-input formControlName="orderNo"/> <nz-select formControlName="orderStatus" nzAllowClear>
<nz-option *ngFor="let item of orderStatusArray" nzValue="{{item.codeValue}}" nzLabel="{{item.codeName}}"></nz-option>
</nz-select>
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
</div> </div>
<div nz-col nzSpan="8"> </div>
<div nz-row *ngIf="isCollapse">
<div nz-col nzSpan="8" *ngIf="roleType == 0 || roleType == 1">
<nz-form-item> <nz-form-item>
<nz-form-label [nzSpan]="6">商品名称</nz-form-label> <nz-form-label [nzSpan]="8">分公司</nz-form-label>
<nz-form-control [nzSpan]="16"> <nz-form-control [nzSpan]="14">
<input nz-input formControlName="memDiscountName"/> <nz-select nzShowSearch formControlName="companyId" nzAllowClear>
<nz-option *ngFor="let item of companyArray" nzValue="{{item['id']}}" nzLabel="{{item['name']}}"></nz-option>
</nz-select>
</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]="6">用户电话</nz-form-label> <nz-form-label [nzSpan]="8">支付方式</nz-form-label>
<nz-form-control [nzSpan]="16"> <nz-form-control [nzSpan]="14">
<input nz-input formControlName="memPhone"/> <nz-select nzAllowClear formControlName="payType">
<nz-option nzValue="1" nzLabel="支付宝"></nz-option>
<nz-option nzValue="2" nzLabel="微信"></nz-option>
<nz-option nzValue="3" nzLabel="积分抵扣"></nz-option>
<nz-option nzValue="4" nzLabel="汇联通工会卡"></nz-option>
<nz-option nzValue="5" nzLabel="银联"></nz-option>
<nz-option nzValue="6" nzLabel="银联分期"></nz-option>
<nz-option nzValue="7" nzLabel="嗨森逛油卡"></nz-option>
</nz-select>
</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]="6">支付模式</nz-form-label> <nz-form-label [nzSpan]="8">支付卡号</nz-form-label>
<nz-form-control [nzSpan]="16"> <nz-form-control [nzSpan]="14">
<nz-select nzShowSearch nzAllowClear formControlName="payModel" nzPlaceHolder="请选择支付模式"> <input nz-input formControlName="memCardNo" />
<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-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]="6">支付方式</nz-form-label> <nz-form-label [nzSpan]="8">支付时间</nz-form-label>
<nz-form-control [nzSpan]="16"> <nz-form-control [nzSpan]="14">
<nz-select nzShowSearch nzAllowClear formControlName="payType" nzPlaceHolder="请选择支付模式"> <nz-range-picker
<nz-option nzLabel="支付宝" nzValue="1"></nz-option> [nzShowTime]="{ nzHideDisabledOptions: true }"
<nz-option nzLabel="微信" nzValue="2"></nz-option> formControlName="payTimeArray"
<nz-option nzLabel="金币" nzValue="3"></nz-option> nzFormat="yyyy-MM-dd HH:mm:ss"
<nz-option nzLabel="工会卡" nzValue="4"></nz-option> ></nz-range-picker>
<nz-option nzLabel="银联" nzValue="5"></nz-option>
</nz-select>
</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]="6">状态</nz-form-label> <nz-form-label [nzSpan]="8">创建时间</nz-form-label>
<nz-form-control [nzSpan]="16"> <nz-form-control [nzSpan]="14">
<nz-select nzShowSearch nzAllowClear nzPlaceHolder="请选择订单状态" formControlName="orderStatus"> <nz-range-picker
<nz-option nzLabel="待支付" nzValue="1"></nz-option> [nzShowTime]="{ nzHideDisabledOptions: true }"
<nz-option nzLabel="已支付" nzValue="2"></nz-option> formControlName="createTimeArray"
<nz-option nzLabel="已完成" nzValue="3"></nz-option> nzFormat="yyyy-MM-dd HH:mm:ss"
<nz-option nzLabel="已退款" nzValue="4"></nz-option> ></nz-range-picker>
<nz-option nzLabel="已取消" nzValue="5"></nz-option>
<nz-option nzLabel="退款中" nzValue="6"></nz-option>
<nz-option nzLabel="退款失败" nzValue="7"></nz-option>
</nz-select>
</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]="6">时间区间</nz-form-label> <nz-form-label [nzSpan]="8">退款时间</nz-form-label>
<nz-form-control [nzSpan]="16"> <nz-form-control [nzSpan]="14">
<nz-range-picker [nzShowTime]="{ nzFormat: 'HH:mm' }" formControlName="payTime"></nz-range-picker> <nz-range-picker
[nzShowTime]="{ nzHideDisabledOptions: true }"
formControlName="refundTimeArray"
nzFormat="yyyy-MM-dd HH:mm:ss"
></nz-range-picker>
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
</div> </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">
<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)="searchForm.reset();"><i nz-icon nzType="reload" nzTheme="outline"></i>重置</button>
<a class="collapse" (click)="isCollapse = !isCollapse;">{{!isCollapse ? '更多条件' : '隐藏条件'}}<i nz-icon [nzType]="!isCollapse ? 'down' : 'up'"></i></a>
</div> </div>
</div> </div>
</form> </form>
</div> </div>
</div>
<!-- end 搜索条件 -->
<!--列表数据-->
<div class="inner-content"> <div class="inner-content">
<span>共计 {{total}} 条数据</span> <span>共计 {{total?total:0}} 条数据</span>
<div class="operating-button">
<button nz-button nzType="primary" class="right-btn" (click)="downloadTemplate(searchForm.value)" ><i nz-icon nzType="download" nzTheme="outline"></i>导出订单</button>
</div> <!--数组表格 -->
<nz-table <nz-table #basicTable
class="table" nzShowPagination
#ajaxTable
nzShowSizeChanger nzShowSizeChanger
[nzFrontPagination]="false" nzBordered
[nzData]="requestData" [nzData]="requestData"
[nzLoading]="loading"
[nzTotal]="total" [nzTotal]="total"
[nzLoading]="loading"
[nzFrontPagination]="false"
[(nzPageIndex)]="pageNum" [(nzPageIndex)]="pageNum"
[(nzPageSize)]="pageSize" [(nzPageSize)]="pageSize"
[nzScroll]="{ x: '1200px' }"
(nzPageIndexChange)="getRequest(false , searchForm.value)" (nzPageIndexChange)="getRequest(false , searchForm.value)"
(nzPageSizeChange)="getRequest(false , searchForm.value)"> (nzPageSizeChange)="getRequest(false , searchForm.value)"
<thead nzSingleSort> [nzPageSizeOptions]="[10,20,50,100]"
[nzScroll]="{ x: '1200px'}">
<thead>
<tr> <tr>
<th nzWidth="50px">编号</th> <th nzWidth="200px">交易单号</th>
<th nzWidth="180px">商品名称</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="130px">客户电话</th>
<th nzWidth="110px">支付模式</th> <th nzWidth="200px">订单名称</th>
<th nzWidth="100px">支付方式</th> <th nzWidth="100px">订单金额</th>
<th nzWidth="100px">支付金额</th> <th nzWidth="100px">支付金额</th>
<th nzWidth="140px">生成时间</th> <th nzWidth="100px">支付方式</th>
<th nzWidth="140px">支付时间</th> <th nzWidth="100px">订单状态</th>
<th nzWidth="140px">取消时间</th> <th nzWidth="180px">创建时间</th>
<th nzRight nzWidth="100px">状态</th> <th nzWidth="110px" nzRight="0px">操作</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr *ngFor="let data of ajaxTable.data; let i = index"> <tr *ngFor="let data of basicTable.data;let i = index">
<td>{{i+1}}</td>
<td>{{data.goodsName}}</td>
<td>{{data.giveawayType}}</td>
<td>{{data.goodsType}}</td>
<td>{{data.orderNo}}</td> <td>{{data.orderNo}}</td>
<td>{{data.paySerialNo}}</td> <td>{{data.memPhone}}</td>
<td>{{data.memName == null ? '暂无': data.memName}}</td> <td>{{data.title}}</td>
<td>{{data.memPhone == null ? '暂无': data.memPhone}}</td> <td>￥{{data.totalPrice}}</td>
<td>{{data.payModel}}</td> <td>￥{{data.payPrice}}</td>
<td>{{data.payType}}</td> <td>{{data.orderStatus == 1 || data.orderStatus == 5 ? '未支付' : data.payType | orderPayType}}</td>
<td>{{data.payPrice}}</td> <td>{{data.orderStatus | orderStatus}}</td>
<td>{{data.createTime | date : 'yyyy-MM-dd HH:mm:ss'}}</td> <td>{{data.createTime | date : 'yyyy-MM-dd HH:mm:ss'}}</td>
<td>{{data.payTime | date: 'yyyy-MM-dd HH:mm:ss'}}</td> <td nzRight="0px" class="table-td-operation">
<td>{{data.cancelTime | date: 'yyyy-MM-dd HH:mm:ss'}}</td> <a nz-dropdown [nzDropdownMenu]="menu"> 操作列表 <i nz-icon nzType="down"></i> </a>
<td nzRight>{{data.orderStatus}}</td> <nz-dropdown-menu #menu="nzDropdownMenu">
<ul nz-menu nzSelectable>
<li nz-menu-item (click)="showOrderDetail(data.orderNo)"><a>详情</a></li>
</ul>
</nz-dropdown-menu>
</td>
</tr>
</tbody> </tbody>
</nz-table> </nz-table>
</div> </div>
</nz-spin>
<nz-modal [(nzVisible)]="orderDetailModal" nzTitle="交易详情" (nzOnCancel)="orderDetailModal = false" [nzFooter]="null"
<nz-modal [(nzVisible)]="isVisible" nzTitle="退款理由" (nzOnCancel)="handleCancel()" (nzOnOk)="handleOk()"> nzWidth="1000px" [nzBodyStyle]=" { padding: '20px 20px 30px 20px'}">
<nz-form-item> <nz-spin [nzSpinning]="orderDetailModalLoading">
<nz-form-label>退款理由</nz-form-label> <nz-tabset [nzType]="'card'">
<nz-form-control> <nz-tab nzTitle="订单信息">
<textarea [(ngModel)]="refundContent" nz-input rows="2" placeholder="请输入退款理由"></textarea> <nz-descriptions nzBordered [nzColumn]="2" [nzSize]="'middle'">
</nz-form-control> <nz-descriptions-item nzTitle="交易订单号">{{orderDetailObject.tradeOrder.orderNo}}</nz-descriptions-item>
</nz-form-item> <nz-descriptions-item nzTitle="第三方交易号">{{orderDetailObject.tradeOrder.paySerialNo!=null?orderDetailObject.tradeOrder.paySerialNo:'无'}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="客户手机号">{{orderDetailObject.tradeOrder.memPhone}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="交易状态">{{orderDetailObject.tradeOrder.orderStatus | orderStatus}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="支付方式">{{orderDetailObject.tradeOrder.payType | orderPayType}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="支付卡号" *ngIf="orderDetailObject.tradeOrder.payType == 4 || orderDetailObject.tradeOrder.payType == 7">
{{orderDetailObject.tradeOrder.memCardNo}}
</nz-descriptions-item>
<nz-descriptions-item nzTitle="优惠券">{{orderDetailObject.tradeOrder.memDiscountName?orderDetailObject.tradeOrder.memDiscountName:'无'}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="返利">{{orderDetailObject.tradeOrder.whetherRebate?'是':'否'}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="备注">{{orderDetailObject.tradeOrder.remarks}}</nz-descriptions-item>
</nz-descriptions>
</nz-tab>
<nz-tab nzTitle="支付信息">
<nz-descriptions nzBordered [nzColumn]="3" [nzSize]="'middle'">
<nz-descriptions-item nzTitle="交易总额" >{{orderDetailObject.tradeOrder.totalPrice}} 元</nz-descriptions-item>
<nz-descriptions-item nzTitle="总优惠" >{{orderDetailObject.tradeOrder.totalDeductionPrice}} 元</nz-descriptions-item>
<nz-descriptions-item nzTitle="产品优惠金额" >{{orderDetailObject.tradeOrder.deductionProductPrice}} 元</nz-descriptions-item>
<nz-descriptions-item nzTitle="优惠券优惠" >{{orderDetailObject.tradeOrder.deductionCouponPrice}} 元</nz-descriptions-item>
<nz-descriptions-item nzTitle="应付金额" >{{orderDetailObject.tradeOrder.payablePrice}} 元</nz-descriptions-item>
<nz-descriptions-item nzTitle="积分抵扣" >{{orderDetailObject.tradeOrder.payGold / 100}} 元 </nz-descriptions-item>
<nz-descriptions-item nzTitle="实付金额" >
{{orderDetailObject.tradeOrder.payRealPrice!=null?orderDetailObject.tradeOrder.payRealPrice+' 元':'未支付'}}
</nz-descriptions-item>
</nz-descriptions>
</nz-tab>
<nz-tab nzTitle="订单时间">
<nz-card>
<nz-timeline>
<nz-timeline-item *ngIf="orderDetailObject.tradeOrder.createTime != null">
<p>创建时间：{{orderDetailObject.tradeOrder.createTime | date : 'yyyy-MM-dd HH:mm:ss'}}</p>
<p>备注：{{orderDetailObject.tradeOrder.remarks?orderDetailObject.tradeOrder.remarks:'无'}}</p>
</nz-timeline-item>
<nz-timeline-item *ngIf="orderDetailObject.tradeOrder.cancelTime != null">
<p>取消时间：{{orderDetailObject.tradeOrder.cancelTime | date : 'yyyy-MM-dd HH:mm:ss'}}</p>
<p>备注：{{orderDetailObject.tradeOrder.cancelRemarks?orderDetailObject.tradeOrder.cancelRemarks:'无'}}</p>
</nz-timeline-item>
<nz-timeline-item *ngIf="orderDetailObject.tradeOrder.payTime != null">支付时间：{{orderDetailObject.tradeOrder.payTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item>
<nz-timeline-item *ngIf="orderDetailObject.tradeOrder.finishTime != null">完成时间：{{orderDetailObject.tradeOrder.finishTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item>
<nz-timeline-item *ngIf="orderDetailObject.tradeOrder.refundTime != null">退款时间：{{orderDetailObject.tradeOrder.refundTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item>
</nz-timeline>
</nz-card>
</nz-tab>
</nz-tabset>
</nz-spin>
</nz-modal> </nz-modal>

3
src/app/admin/order-manage/dicount-package-order-list/dicount-package-order-list.component.scss
Unescape View File

@ -0,0 +1,3 @@
img {
width: 60px;
}

228
src/app/admin/order-manage/dicount-package-order-list/dicount-package-order-list.component.ts
Unescape View File

@ -10,95 +10,124 @@ import {OrderService} from '../../../services/order.service';
import {CompanyService} from '../../../services/company.service'; import {CompanyService} from '../../../services/company.service';
import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace'; import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace';
import {LocalStorageService} from '../../../services/local-storage.service'; import {LocalStorageService} from '../../../services/local-storage.service';
import {HltOrderService} from "../../../services/order/hlt-order.service";
import {animate, state, style, transition, trigger} from "_@angular_animations@9.0.7@@angular/animations";
@Component({ @Component({
selector: 'app-dicount-package-order-list', selector: 'app-dicount-package-order-list',
animations: [
trigger('openClose', [
state('open', style({
height: '260px',
opacity: 1,
backgroundColor: 'white'
})),
state('closed', style({
opacity: 1,
backgroundColor: 'white'
})),
transition('open => closed', [
animate('0.3s')
]),
transition('closed => open', [
animate('0.3s')
]),
]),
],
templateUrl: './dicount-package-order-list.component.html', templateUrl: './dicount-package-order-list.component.html',
styleUrls: ['./dicount-package-order-list.component.scss'] styleUrls: ['./dicount-package-order-list.component.scss']
}) })
export class DicountPackageOrderListComponent implements OnInit { export class DicountPackageOrderListComponent implements OnInit {
WEB_SERVE_URL = environment.baseUrl;
FILE_URL = environment.imageUrl;
searchForm: FormGroup; // 搜索框 // 搜索框
requestData = []; // 列表数据 searchForm: FormGroup;
companyData = []; // 列表数据 // 搜索框折叠
merchantData = []; // 列表数据 isCollapse = false;
total: number; // 页码 // 订单状态数据
pageNum = 1; // 页码 orderStatusArray = [];
pageSize = 10; // 条码 // 公司数据
loading = true; companyArray = [];
id: number; // 订单ID // 角色类型
isVisible = false;
refundContent: string;
roleType: number; roleType: number;
// 列表相关参数
// 总条数
total: number;
// 页码
pageNum = 1;
// 条码
pageSize = 10;
// 列表数据
requestData = [];
// 列表加载
loading = true;
// 订单详情相关参数
// 详情模态框
orderDetailModal = false;
// 详情模态框数据等待
orderDetailModalLoading = false;
// 订单详情数据
orderDetailObject: any = {
tradeOrder: {},
};
// 数据加载中参数
loadingObject = {
title: '加载中...',
status: false,
};
// 请求地址参数
FILE_URL = environment.imageUrl;
constructor( constructor(
private form: FormBuilder, private form: FormBuilder,
private order: OrderService, private store: LocalStorageService,
private iconService: IconService,
private message: NzMessageService, private message: NzMessageService,
private router: Router, private hltOrderService: HltOrderService,
private company: CompanyService, private companyService: CompanyService,
private merchant: MerchantService, private commonsService: CommonsService,
private store: LocalStorageService, // 数据请求 ) { }
private common: CommonsService
) {
}
ngOnInit(): void { ngOnInit(): void {
this.init(); // 搜索表单初始化
this.roleType = this.store.get(ADMIN_INFO_OBJECT)['secRole']['roleType'];
const whereObject = {};
whereObject['pageNum'] = 1;
whereObject['pageSize'] = 10000;
this.company.selectCompanyList(whereObject, data => {
if (data['return_code'] === '000000') {
this.companyData = data['return_data'].list;
} else {
this.message.error(data['return_msg']);
}
});
if (this.roleType === 5) {
this.getMerchantListByCompany(this.store.get(ADMIN_INFO_OBJECT)['bsCompany']['id']);
} else {
this.getMerchantListByCompany(this.searchForm.value.companyId);
}
}
public init(): void {
this.searchForm = this.form.group({ this.searchForm = this.form.group({
companyId: [null],
merchantId: [null],
orderNo: [null], orderNo: [null],
paySerialNo: [null],
payModel: [null],
payType: [null],
memDiscountName: [null],
memPhone: [null], memPhone: [null],
payTimeArray: [null],
orderStatus: [null], orderStatus: [null],
payTime: [null] createTimeArray: [null],
refundTimeArray: [null],
companyId: [null],
payType: [null],
memCardNo: [null],
productType: [7],
});
// 角色类型初始化
this.roleType = Number(this.store.get(ADMIN_INFO_OBJECT)['secRole'].roleType);
// 查询公司列表
if (this.roleType === 0 || this.roleType === 1) {
this.companyService.selectCompanyList({ pageNum: 1, pageSize: 999 }, data => {
this.companyArray = data['return_data']['list'];
});
}
// 查询订单状态数据
this.commonsService.getDictionary('ORDER_OIL_STATUS', data => {
this.orderStatusArray = data['return_data'];
}); });
this.getRequest(true, this.searchForm.value); this.getRequest(true, this.searchForm.value);
} }
// 查询列表 // 查询列表
public getRequest(reset: boolean = false, whereObject: object) { public getRequest(reset: boolean = false, whereObject: object) {
this.loading = true;
if (whereObject['payTime'] != null && whereObject['payTime'].length !== 0) {
whereObject['payTimeS'] = whereObject['payTime'][0].getTime();
whereObject['payTimeE'] = whereObject['payTime'][1].getTime();
}
this.loading = false;
if (reset) { if (reset) {
this.pageNum = 1; this.pageNum = 1;
} }
whereObject['pageNum'] = this.pageNum; whereObject['pageNum'] = this.pageNum;
whereObject['pageSize'] = this.pageSize; whereObject['pageSize'] = this.pageSize;
this.order.getDiscountPackageList(whereObject, data => { this.hltOrderService.getOrderList(whereObject, data => {
this.loading = false;
if (data['return_code'] === '000000') { if (data['return_code'] === '000000') {
console.log(data);
this.requestData = data['return_data'].list; this.requestData = data['return_data'].list;
this.total = data['return_data'].total; this.total = data['return_data'].total;
} else { } else {
@ -107,86 +136,19 @@ export class DicountPackageOrderListComponent implements OnInit {
}); });
} }
// 查询商户 // 展示订单详情
public getMerchantListByCompany(companyId: number): void { public showOrderDetail(orderNo: string) {
this.merchant.getMerchantListByCompany(companyId, data => { this.orderDetailModal = true;
this.orderDetailModalLoading = true;
this.hltOrderService.getOrderDetail(orderNo, data => {
if (data['return_code'] === '000000') { if (data['return_code'] === '000000') {
if (data['return_code'] === '000000') { this.orderDetailObject = data['return_data'];
this.merchantData = data['return_data'];
} else {
this.message.error(data['return_msg']);
}
} else { } else {
this.message.error(data['return_msg']); this.message.error(data['return_msg']);
} }
this.orderDetailModalLoading = false;
}); });
}
// 重置
public resetForm(): void {
this.searchForm.reset();
}
// 查看详情
public getDetail(id: number): void {
this.router.navigate(['/admin/order/order-detail'], {
queryParams: {
merchantId: id
}
}).then(r => console.log(r));
}
// 下载模板
downloadTemplate(whereObject) {
if (whereObject['payTime'] != null && whereObject['payTime'].length !== 0) {
whereObject['payTimeS'] = whereObject['payTime'][0].getTime();
whereObject['payTimeE'] = whereObject['payTime'][1].getTime();
}
this.order.exportDiscountPackageList(whereObject, data => {
if (data['return_code'] === '000000') {
window.location.href = this.FILE_URL + data['return_data'];
} else {
this.message.error(data['return_msg']);
}
});
}
provinceChange(e) {
console.log(e);
} }
// 退款
public orderToRefund(id): void {
}
showModal(id): void {
this.id = id;
this.isVisible = true;
}
handleOk(): void {
this.common.showConfirm('确认订单是否退款', item => {
if (item) {
const params = {
orderId: this.id ,
refundContent: this.refundContent
};
this.order.refuelingOrderRefund(params, data => {
if (data['return_code'] === '000000') {
this.getRequest(false, this.searchForm.value);
this.isVisible = false;
this.message.success('退款成功');
} else {
this.message.error(data['return_msg']);
}
});
}
});
}
handleCancel(): void {
this.isVisible = false;
}
} }

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

@ -196,18 +196,18 @@
</nz-select> </nz-select>
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
<!-- <nz-form-item>--> <nz-form-item>
<!-- <nz-form-label [nzSpan]="6" nzRequired>展示平台</nz-form-label>--> <nz-form-label [nzSpan]="6" nzRequired>展示平台</nz-form-label>
<!-- <nz-form-control [nzSpan]="16" nzErrorTip="请选择展示平台!">--> <nz-form-control [nzSpan]="16" nzErrorTip="请选择展示平台!">
<!-- <nz-select--> <nz-select
<!-- nzMode="multiple"--> nzMode="multiple"
<!-- formControlName="productPlatform"--> formControlName="productPlatform"
<!-- nzPlaceHolder="请选择展示平台"--> nzPlaceHolder="请选择展示平台"
<!-- >--> >
<!-- <nz-option *ngFor="let item of productPlatformArray" nzValue="{{item.codeValue}}" nzLabel="{{item.codeName}}"></nz-option>--> <nz-option *ngFor="let item of productPlatformArray" nzValue="{{item.codeValue}}" nzLabel="{{item.codeName}}"></nz-option>
<!-- </nz-select>--> </nz-select>
<!-- </nz-form-control>--> </nz-form-control>
<!-- </nz-form-item>--> </nz-form-item>
<nz-form-item> <nz-form-item>
<nz-form-label [nzSpan]="6" nzRequired>充值平台</nz-form-label> <nz-form-label [nzSpan]="6" nzRequired>充值平台</nz-form-label>
<nz-form-control [nzSpan]="16" nzErrorTip="请选择充值平台!"> <nz-form-control [nzSpan]="16" nzErrorTip="请选择充值平台!">
@ -216,18 +216,18 @@
</nz-select> </nz-select>
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
<!-- <nz-form-item>--> <nz-form-item>
<!-- <nz-form-label [nzSpan]="6" nzRequired>支付方式</nz-form-label>--> <nz-form-label [nzSpan]="6" nzRequired>支付方式</nz-form-label>
<!-- <nz-form-control [nzSpan]="16" nzErrorTip="请选择支付方式!">--> <nz-form-control [nzSpan]="16" nzErrorTip="请选择支付方式!">
<!-- <nz-select--> <nz-select
<!-- nzMode="multiple"--> nzMode="multiple"
<!-- formControlName="payType"--> formControlName="payType"
<!-- nzPlaceHolder="请选择支付方式"--> nzPlaceHolder="请选择支付方式"
<!-- >--> >
<!-- <nz-option *ngFor="let item of priceTypeArray" nzValue="{{item.codeValue}}" nzLabel="{{item.codeName}}"></nz-option>--> <nz-option *ngFor="let item of priceTypeArray" nzValue="{{item.codeValue}}" nzLabel="{{item.codeName}}"></nz-option>
<!-- </nz-select>--> </nz-select>
<!-- </nz-form-control>--> </nz-form-control>
<!-- </nz-form-item>--> </nz-form-item>
<nz-form-item> <nz-form-item>
<nz-form-label [nzSpan]="6" nzRequired>充值方式</nz-form-label> <nz-form-label [nzSpan]="6" nzRequired>充值方式</nz-form-label>
<nz-form-control [nzSpan]="16" nzErrorTip="请选择充值方式!"> <nz-form-control [nzSpan]="16" nzErrorTip="请选择充值方式!">
@ -238,41 +238,41 @@
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
<!-- <nz-form-item>--> <nz-form-item>
<!-- <nz-form-label [nzSpan]="6" nzRequired>折扣比例</nz-form-label>--> <nz-form-label [nzSpan]="6" nzRequired>折扣比例</nz-form-label>
<!-- <nz-form-control [nzSpan]="16" nzErrorTip="请输入折扣比例!">--> <nz-form-control [nzSpan]="16" nzErrorTip="请输入折扣比例!">
<!-- <nz-input-number--> <nz-input-number
<!-- style="width: 200px"--> style="width: 200px"
<!-- formControlName="discount"--> formControlName="discount"
<!-- [nzMin]="1"--> [nzMin]="1"
<!-- [nzMax]="100"--> [nzMax]="100"
<!-- [nzStep]="1"--> [nzStep]="1"
<!-- [nzPrecision]="2"--> [nzPrecision]="2"
<!-- nzPrecisionMode="cut"--> nzPrecisionMode="cut"
<!-- (ngModelChange)="changePayType($event)"--> (ngModelChange)="changePayType($event)"
<!-- nzPlaceHolder="请输入折扣比例!"--> nzPlaceHolder="请输入折扣比例!"
<!-- [nzFormatter]="formatterPercent"--> [nzFormatter]="formatterPercent"
<!-- [nzParser]="parserPercent"--> [nzParser]="parserPercent"
<!-- ></nz-input-number>--> ></nz-input-number>
<!-- </nz-form-control>--> </nz-form-control>
<!-- </nz-form-item>--> </nz-form-item>
<!-- <nz-form-item>--> <nz-form-item>
<!-- <nz-form-label [nzSpan]="6" nzRequired>积分支付比例</nz-form-label>--> <nz-form-label [nzSpan]="6" nzRequired>积分支付比例</nz-form-label>
<!-- <nz-form-control [nzSpan]="16" nzErrorTip="请输入积分支付比例!">--> <nz-form-control [nzSpan]="16" nzErrorTip="请输入积分支付比例!">
<!-- <nz-input-number--> <nz-input-number
<!-- style="width: 200px"--> style="width: 200px"
<!-- formControlName="integralDiscount"--> formControlName="integralDiscount"
<!-- [nzMin]="0"--> [nzMin]="0"
<!-- [nzMax]="100"--> [nzMax]="100"
<!-- [nzStep]="1"--> [nzStep]="1"
<!-- [nzPrecision]="2"--> [nzPrecision]="2"
<!-- nzPrecisionMode="cut"--> nzPrecisionMode="cut"
<!-- nzPlaceHolder="请输入积分支付比例!"--> nzPlaceHolder="请输入积分支付比例!"
<!-- [nzFormatter]="formatterPercent"--> [nzFormatter]="formatterPercent"
<!-- [nzParser]="parserPercent"--> [nzParser]="parserPercent"
<!-- ></nz-input-number>--> ></nz-input-number>
<!-- </nz-form-control>--> </nz-form-control>
<!-- </nz-form-item>--> </nz-form-item>
<nz-form-item *ngIf="edit"> <nz-form-item *ngIf="edit">
<nz-form-label [nzSpan]="6" >排序</nz-form-label> <nz-form-label [nzSpan]="6" >排序</nz-form-label>

1
src/environments/environment.prod.ts
Unescape View File

@ -1,6 +1,7 @@
export const environment = { export const environment = {
production: true, production: true,
baseUrl: 'https://hsg.dctpay.com/brest/', // 正式环境服务器地址(请求数据地址) baseUrl: 'https://hsg.dctpay.com/brest/', // 正式环境服务器地址(请求数据地址)
orderUrl: 'https://hsg.dctpay.com/order/', // 测试环境服务器地址(请求数据地址)
imageUrl: 'https://hsg.dctpay.com/filesystem/', imageUrl: 'https://hsg.dctpay.com/filesystem/',
key: 'https://hsg.dctpay.com/phone-recharge-H5/index.html?codeValue=', key: 'https://hsg.dctpay.com/phone-recharge-H5/index.html?codeValue=',
inviteUrl: 'https://hsg.dctpay.com/wx/?action=ic&id=', inviteUrl: 'https://hsg.dctpay.com/wx/?action=ic&id=',

8
src/environments/environment.ts
Unescape View File

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

Write Preview
Loading…
Cancel
Save