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 f04b2272a8
commit 0fba1e3e77
3 changed files with 60 additions and 30 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. 51
      src/app/admin/discount-package/discount-package-list/discount-package-list.component.html
  2. 32
      src/app/admin/discount-package/discount-package-list/discount-package-list.component.ts
  3. 7
      src/app/services/discount-package.service.ts

51
src/app/admin/discount-package/discount-package-list/discount-package-list.component.html
Unescape View File

@ -114,7 +114,7 @@
<li class="li-a" *ngIf="data.status == 2 || data.status == 3" nz-menu-item><a (click)="upDiscountPackage(data.id)" >上架</a></li>
<li class="li-a" *ngIf="data.status == 1" nz-menu-item><a (click)="downDiscountPackage(data.id)">下架</a></li>
<li class="li-a" *ngIf="data.status == 2 || data.status == 3" nz-menu-item><a (click)="deleteDiscountPackage(data.id)">删除</a></li>
<li class="li-a" nz-menu-item><a (click)="showDeliverUserModal(data.id, data.title)">赠送用户</a></li>
<li class="li-a" *ngIf="data.status == 1" nz-menu-item><a (click)="showDeliverUserModal(data.id, data.title)">赠送用户</a></li>
</ul>
</nz-dropdown-menu>
</td>
@ -197,7 +197,8 @@
</div>
</div>
</form>
<span nz-typography nzType="danger">注意：提交赠送时系统会自动过滤 ”有误“ 和 ”重复“ 的数据，有误的数据不会赠送卷包。</span>
<span nz-typography nzType="danger">注意：提交赠送时系统会自动过滤 ”有误“ 和 ”重复“ 的数据，有误的数据不会赠送卷包。</span><br>
<span nz-typography >共计 {{deliverUserArray.length}} 条数据</span>
<nz-table #deliverUserTable [nzData]="deliverUserArray" [nzFrontPagination]="true">
<thead>
<tr>
@ -250,28 +251,30 @@
</nz-modal>
<nz-modal [(nzVisible)]="excelUserModal" nzTitle="导入用户" (nzOnCancel)="closeExcelUserModal()" [nzFooter]="null" nzWidth="450">
<span *ngIf="deliverUserArray.length > 0" nz-typography nzType="danger">注意：导入用户会清空现有列表中的数据。 </span>
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="24">
<nz-form-item>
<nz-form-label nzRequired>excel文件</nz-form-label>
<nz-form-control>
<nz-upload
[nzAccept]="'.xls,.xlsx'"
[(nzFileList)]="excelUploadFile"
nzAction="{{BASE_URL}}/fileUpload/uploadfile"
[nzHeaders]="{ authorization: 'authorization-text' }"
(nzChange)="excelUserHandleChange($event)"
>
<button nz-button><i nz-icon nzType="upload"></i>{{excelUploadBtn?'上传文件':'重新上传'}}</button>
</nz-upload>
</nz-form-control>
</nz-form-item>
<nz-spin nzTip="{{spinObject.title}}" [nzSpinning]="spinObject.status">
<span *ngIf="deliverUserArray.length > 0" nz-typography nzType="danger">注意：导入用户会清空现有列表中的数据。 </span>
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="24">
<nz-form-item>
<nz-form-label nzRequired>excel文件</nz-form-label>
<nz-form-control>
<nz-upload
[nzAccept]="'.xls,.xlsx'"
[(nzFileList)]="excelUploadFile"
nzAction="{{BASE_URL}}/fileUpload/uploadfile"
[nzHeaders]="{ authorization: 'authorization-text' }"
(nzChange)="excelUserHandleChange($event)"
>
<button nz-button><i nz-icon nzType="upload"></i>{{excelUploadBtn?'上传文件':'重新上传'}}</button>
</nz-upload>
</nz-form-control>
</nz-form-item>
</div>
</div>
</div>
<div nz-row>
<div nz-col [nzSpan]="24" style="text-align: center">
<button nz-button style="width: 150px;" (click)="submitExcelUser()" [nzType]="'primary'">确定</button>
<div nz-row>
<div nz-col [nzSpan]="24" style="text-align: center">
<button nz-button style="width: 150px;" (click)="submitExcelUser()" [nzType]="'primary'">确定</button>
</div>
</div>
</div>
</nz-spin>
</nz-modal>

32
src/app/admin/discount-package/discount-package-list/discount-package-list.component.ts
Unescape View File

@ -33,6 +33,7 @@ export class DiscountPackageListComponent implements OnInit {
deliverUserAddForm: FormGroup;
deliverUserAddModal = false;
userInterval;
deliverUserSearchForm: FormGroup;
deliverUserModal = false;
@ -225,8 +226,20 @@ export class DiscountPackageListComponent implements OnInit {
// 打开 发送优惠券包给用户模态框
showDeliverUserModal(packageId: number, packageName: string) {
this.deliverUserForm.patchValue({ packageId: packageId, packageName: packageName})
this.deliverUserModal = true;
this.discountPackage.getHandleByPackageId({ packageId: packageId}, data => {
if (data['return_code'] === '000000') {
if (data['return_data'] != null) {
this.modal.confirm({
nzTitle: '提示',
nzContent: '当前卷包有赠送任务进行中，是否查看赠送进度？',
nzOnOk: () => this.processRate(data['return_data']['serialNumber'])
})
} else {
this.deliverUserForm.patchValue({ packageId: packageId, packageName: packageName});
this.deliverUserModal = true;
}
}
});
}
// 关闭 发送优惠券包给用户模态框
@ -247,6 +260,7 @@ export class DiscountPackageListComponent implements OnInit {
// 关闭导入模态框
closeExcelUserModal() {
this.spinObject.status = false;
this.excelUploadBtn = true;
this.excelUploadFile = [];
this.excelUserModal = false;
@ -260,12 +274,15 @@ export class DiscountPackageListComponent implements OnInit {
this.deliverUserForm.patchValue({ phoneArray: this.deliverUserArray.filter(o => o.errorStatus == false)});
this.spinObject.status = true;
this.spinObject.title = '处理中...';
this.discountPackage.giveAway(this.deliverUserForm.value, data => {
const param = this.deliverUserForm.value;
this.closeDeliverUserModal();
this.discountPackage.giveAway(param, data => {
if (data['return_code'] === '000000') {
this.serialNumber = data['return_data'];
this.closeDeliverUserModal();
this.processRate(this.serialNumber);
} else {
this.showDeliverUserModal(this.deliverUserForm.controls.packageId.value, this.deliverUserForm.controls.packageName.value);
this.message.create('error', data['return_msg']);
this.spinObject.status = false;
}
@ -275,24 +292,27 @@ export class DiscountPackageListComponent implements OnInit {
// 处理进度
processRate(serialNum: string) {
this.spinObject.status = true;
let time = setInterval(() => this.commonsService.getRedisValueByType(serialNum, data => {
this.userInterval = setInterval(() => this.commonsService.getRedisValueByType(serialNum, data => {
if (data['return_data'] != null) {
this.spinObject.title = '已处理' + data['return_data'] + '条数据';
} else {
this.spinObject.status = false;
clearTimeout(time);
this.getRequest(true, this.searchForm.value);
clearTimeout(this.userInterval);
}
}), 1000);
}
// 提交excel数据
submitExcelUser() {
this.spinObject.title = '文件导入中... 数据太多会占用较长时间';
this.spinObject.status = true;
this.discountPackage.getPhoneListByFileUrl({ fileUrl: this.excelUploadFile[0]['url']}, data => {
if (data['return_code'] === '000000') {
this.deliverUserArray = data['return_data']['data'];
this.closeExcelUserModal();
} else {
this.spinObject.status = false;
this.message.error(data['return_msg']);
}
});

7
src/app/services/discount-package.service.ts
Unescape View File

@ -205,6 +205,12 @@ export class DiscountPackageService {
});
}
public getHandleByPackageId(paramsObject: object, callBack) {
this.http.post(environment.baseUrl + 'highDiscountPackage/getHandleByPackageId', paramsObject).subscribe(data => {
callBack(data);
});
}
public giveAway(paramsObject: object, callBack) {
this.http.post(environment.baseUrl + 'highDiscountPackage/giveAway', paramsObject).subscribe(data => {
callBack(data);
@ -212,4 +218,5 @@ export class DiscountPackageService {
}
}

Write Preview
Loading…
Cancel
Save