1

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

@@ -163,7 +163,8 @@
             <th nzWidth="100px">支付金额</th>
             <th nzWidth="140px">生成时间</th>
             <th nzWidth="100px" nzRight>支付方式</th>
-            <th nzWidth="100px" nzRight>状态</th>
+            <th nzWidth="300px" nzRight>充值状态</th>
+            <th nzWidth="100px" nzRight>订单状态</th>
             <th nzWidth="200px" nzRight>操作</th>
         </tr>
         </thead>
@@ -181,12 +182,15 @@
             <td>{{data.payPrice}}</td>
             <td>{{data.createTimed | date: 'yyyy-MM-dd HH:mm:ss'}}</td>
             <td nzRight>{{data.payType  | rechargePayType}}</td>
+            <td nzRight>
+                {{data.rechargeStatus == 1 ? '充值异常' : '正常'}}
+                <span *ngIf="data.rechargeStatus === 1 && data.abnormalMsg != null">({{data.abnormalMsg}})</span>
+            </td>
             <td nzRight>{{data.status | rechargeStatus}}</td>
             <td nzRight class="table-td-operation">
                 <a  (click)="getDetail(data.id)">详情</a>
-<!--                <a *ngIf="data.status === 2" (click)="finishOrder(data.id)">完成充值</a>-->
+                <a *ngIf="data.rechargeStatus === 1" (click)="getMobileRechargeByOrderId(data.id)">再次充值</a>
-<!--&lt;!&ndash;                <a *ngIf="data.status === 2 &&  data.payType !== 3" (click)="orderToRefund(data.id)">退款</a>&ndash;&gt;-->
+                <a *ngIf="data.status === 2" (click)="postRefund(data.orderNo)">申请退款</a>
-<!--                <a *ngIf="data.status === 2 &&  data.payType !== 3" (click)="postRefund(data.orderNo)">申请退款</a>-->
             </td>
         </tbody>
     </nz-table>
@@ -211,10 +215,10 @@
         <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>
+<!--    <div *nzModalFooter>-->
-        <button nz-button nzType="default" (click)="handleCancel()">取消</button>
+<!--        <button nz-button nzType="default" (click)="handleCancel()">取消</button>-->
-        <button nz-button *ngIf="data['status'] === 2" nzType="primary" (click)="finishOrder(id)">完成充值</button>
+<!--        <button nz-button *ngIf="data['status'] === 2" nzType="primary" (click)="finishOrder(id)">完成充值</button>-->
-    </div>
+<!--    </div>-->
 </nz-modal>
 
 <nz-modal [(nzVisible)]="errorStudentVisible" nzTitle="导入失败数据" (nzOnCancel)="errorStudentVisible = false" nzWidth="1200px" [nzFooter]="null">

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

@@ -49,20 +49,20 @@ export class OrderListComponent implements OnInit , OnDestroy {
 
   ngOnInit(): void {
     this.init();
-    this.timer = setInterval(() => { // 设置定时刷新事件，每隔1分钟刷新
+    // this.timer = setInterval(() => { // 设置定时刷新事件，每隔1分钟刷新
-      this.recharge.countOrder(data => {
+    //   this.recharge.countOrder(data => {
-        if (data['return_data'] > 0) {
+    //     if (data['return_data'] > 0) {
-          this.getRequest(true, this.searchForm.value);
+    //       this.getRequest(true, this.searchForm.value);
-          this.notification.info(
+    //       this.notification.info(
-              '充值订单',
+    //           '充值订单',
-              '您有' + data['return_data'] + '条未充值的订单，请尽快充值，点击可查看未充值订单！'
+    //           '您有' + data['return_data'] + '条未充值的订单，请尽快充值，点击可查看未充值订单！'
-          ).onClick.subscribe(() => {
+    //       ).onClick.subscribe(() => {
-            this.searchForm.value.status = 2;
+    //         this.searchForm.value.status = 2;
-            this.getRequest(true, this.searchForm.value);
+    //         this.getRequest(true, this.searchForm.value);
-          });
+    //       });
-        }
+    //     }
-      });
+    //   });
-    }, 10000);
+    // }, 10000);
   }
 
   // 销毁
@@ -147,10 +147,10 @@ export class OrderListComponent implements OnInit , OnDestroy {
   }
 
 
-  public finishOrder(id: number): void {
+  public getMobileRechargeByOrderId(id: number): void {
-    this.common.showConfirm('确认订单是否完成充值', item => {
+    this.common.showConfirm('确认订单是否再次充值', item => {
       if (item) {
-        this.recharge.finishOrder(id, data => {
+        this.recharge.getMobileRechargeByOrderId(id, data => {
           if (data['return_code'] === '000000') {
             this.getRequest(false, this.searchForm.value);
             this.isVisible = false;

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

@@ -123,7 +123,6 @@
             <nz-form-label [nzSpan]="6" nzRequired>展示区域</nz-form-label>
             <nz-form-control [nzSpan]="16" nzErrorTip="请选择展示区域!">
                 <nz-select nzShowSearch nzAllowClear formControlName="showType" nzPlaceHolder="请选择展示区域">
-<<<<<<< HEAD
                     <nz-option nzLabel="小程序" [nzValue] ="1"></nz-option>
                     <nz-option nzLabel="H5" [nzValue] ="2"></nz-option>
                     <nz-option nzLabel="银联" [nzValue] ="3"></nz-option>
@@ -136,11 +135,6 @@
                 <nz-select nzShowSearch nzAllowClear formControlName="rechargeType" nzPlaceHolder="请选择充值类型">
                     <nz-option nzLabel="快充" [nzValue] ="1"></nz-option>
                     <nz-option nzLabel="慢充" [nzValue]="2"></nz-option>
-=======
-                    <nz-option nzLabel="小程序" [nzValue]="1"></nz-option>
-                    <nz-option nzLabel="H5" [nzValue]="2"></nz-option>
-                    <nz-option nzLabel="银联" [nzValue]="3"></nz-option>
->>>>>>> 79b068eb5f3f130730e5c51b857b9cc72de104f9
                 </nz-select>
             </nz-form-control>
         </nz-form-item>

src/app/services/recharge.service.ts

@@ -120,8 +120,8 @@ export class RechargeService {
    * @param  id   id
    * @param  callBack   回调
    */
-  public finishOrder(id: number, callBack) {
+  public getMobileRechargeByOrderId(id: number, callBack) {
-    this.http.get(environment.baseUrl + 'outRechargeOrder/finishOrder?orderId=' + id).subscribe(data => {
+    this.http.get(environment.baseUrl + 'outRechargeOrder/getMobileRechargeByOrderId?orderId=' + id).subscribe(data => {
       callBack(data);
     });
   }

src/environments/environment.ts

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