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

src/app/admin/recharge-order/order-list/order-list.component.html

@@ -185,6 +185,7 @@
         <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 nzTitle="支付类型">{{data['payType'] | rechargePayType}}</nz-descriptions-item>
+        <nz-descriptions-item *ngIf="data['laborUnionCard'] != null" nzTitle="工会卡号">{{data['laborUnionCard']}}</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>
@@ -204,7 +205,7 @@
         <tbody>
         <tr *ngFor="let data of basicTable.data">
             <td>{{data.orderNo}}</td>
-            <td>{{data.rechargePlatform}}</td>
+            <td>{{data.rechargePlatform == 1  ? '尖椒':'龙阅'}}</td>
             <td>{{data.status | chlidRechargeStatus}}</td>
             <td>{{data['createTime'] | date: 'yyyy-MM-dd HH:mm'}}</td>
         </tr>

src/app/admin/recharge-order/order-statistical/order-statistical.component.html

@@ -19,11 +19,11 @@
                     <nz-form-label [nzSpan]="6">订单状态</nz-form-label>
                     <nz-form-control [nzSpan]="16">
                         <nz-select nzShowSearch nzAllowClear formControlName="status" nzPlaceHolder="请选择订单状态">
-                            <nz-option nzLabel="待支付" nzValue="1"></nz-option>
+                            <nz-option nzLabel="待支付" nzValue="101"></nz-option>
-                            <nz-option nzLabel="已支付" nzValue="2"></nz-option>
+                            <nz-option nzLabel="已支付" nzValue="102"></nz-option>
-                            <nz-option nzLabel="已完成" nzValue="3"></nz-option>
+                            <nz-option nzLabel="已完成" nzValue="100"></nz-option>
-                            <nz-option nzLabel="已取消" nzValue="4"></nz-option>
+                            <nz-option nzLabel="已取消" nzValue="104"></nz-option>
-                            <nz-option nzLabel="已退款" nzValue="5"></nz-option>
+                            <nz-option nzLabel="已退款" nzValue="105"></nz-option>
                         </nz-select>
                     </nz-form-control>
                 </nz-form-item>
@@ -74,7 +74,7 @@
             <td>{{data.count}}</td>
             <td>{{data.payPrice}}</td>
             <td>{{data.orderPrice}}</td>
-            <td>{{data.status | rechargeStatus}}</td>
+            <td>{{data.payStatus | payStatus}}</td>
         </tbody>
     </nz-table>
 </div>

src/app/admin/recharge-order/order-statistical/order-statistical.component.ts

@@ -27,7 +27,7 @@ export class OrderStatisticalComponent implements OnInit {
   ngOnInit(): void {
     this.searchForm = this.form.group({
       finishTime: [null],
-      status: ['3'],
+      status: ['100'],
     });
     this.getRequest(true, this.searchForm.value);
   }