提交商品添加

src/app/admin/order-manage/goods-order/goods-order.component.ts

@@ -163,7 +163,6 @@ export class GoodsOrderComponent implements OnInit {
                 console.log(data);
                 this.orderDetailObject = data['return_data'];
                 this.logisticsTraceDetails = data['return_data']['logisticsTraceDetails'];
-                console.log(this.logisticsTraceDetails);
             } else {
                 this.message.error(data['return_msg']);
             }
@@ -201,7 +200,7 @@ export class GoodsOrderComponent implements OnInit {
                 this.isVisible = false;
                 this.notification.success('成功' , '更新成功');
             } else {
-                this.notification.error( '失败' , '更新成功');
+                this.notification.error( '失败' , data['return_msg']);
             }
         });
     }

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

@@ -28,9 +28,9 @@
 
                     <div nz-col nzSpan="8">
                         <nz-form-item>
-                            <nz-form-label [nzSpan]="8">客户电话</nz-form-label>
+                            <nz-form-label [nzSpan]="8">标题</nz-form-label>
                             <nz-form-control [nzSpan]="14">
-                                <input nz-input formControlName="memPhone" />
+                                <input nz-input formControlName="title" />
                             </nz-form-control>
                         </nz-form-item>
                     </div>
@@ -38,6 +38,17 @@
                 </div>
 
                 <div nz-row *ngIf="isCollapse">
+                    <div nz-col nzSpan="8">
+                        <nz-form-item>
+                            <nz-form-label [nzSpan]="8">异常订单</nz-form-label>
+                            <nz-form-control [nzSpan]="14">
+                                <nz-select formControlName="exceptionStatus" nzAllowClear>
+                                    <nz-option  [nzValue]="true" nzLabel="异常"></nz-option>
+                                    <nz-option  [nzValue]="false" nzLabel="正常"></nz-option>
+                                </nz-select>
+                            </nz-form-control>
+                        </nz-form-item>
+                    </div>
                     <div nz-col nzSpan="8">
                         <nz-form-item>
                             <nz-form-label [nzSpan]="8">交易状态</nz-form-label>
@@ -170,7 +181,7 @@
             </tr>
             </thead>
             <tbody>
-            <tr *ngFor="let data of basicTable.data;let i = index">
+            <tr *ngFor="let data of basicTable.data;let i = index" [ngClass]="{'fontColor': data.exceptionStatus === true }">
                 <td>{{data.orderNo}}</td>
                 <td>{{data.memPhone}}</td>
                 <td>{{data.title}}</td>
@@ -184,6 +195,8 @@
                     <nz-dropdown-menu #menu="nzDropdownMenu">
                         <ul nz-menu nzSelectable>
                             <li nz-menu-item (click)="showOrderDetail(data.orderNo)"><a>详情</a></li>
+                            <li nz-menu-item *ngIf="data.exceptionStatus === true && data.orderStatus=== 2" (click)="refundOrder(data.orderNo)"><a>订单退款</a></li>
+                            <li nz-menu-item *ngIf="data.exceptionStatus === true" (click)="orderNormal(data.orderNo)"><a>异常转正常</a></li>
                         </ul>
                     </nz-dropdown-menu>
                 </td>
@@ -252,13 +265,16 @@
             </nz-tab>
 
             <nz-tab  nzTitle="充值记录">
-                <nz-table nzBordered #childOrder [nzData]="orderDetailObject.mobileOrder.outRechargeChildOrders" [nzHideOnSinglePage]="true">
+                <nz-table nzBordered #childOrder [nzData]="orderDetailObject.mobileOrder.outRechargeChildOrders" [nzHideOnSinglePage]="true"
+                          [nzScroll]="{ x: '1200px'}">
                     <thead>
                     <tr>
-                        <th>请求订单号</th>
-                        <th>充值平台</th>
-                        <th>充值状态</th>
-                        <th>创建时间</th>
+                        <th nzWidth="100px">请求订单号</th>
+                        <th nzWidth="80px">充值平台</th>
+                        <th nzWidth="80px">充值状态</th>
+                        <th nzWidth="200px">充值内容</th>
+                        <th nzWidth="200px">查询内容</th>
+                        <th nzWidth="100px">创建时间</th>
                     </tr>
                     </thead>
                     <tbody>
@@ -266,6 +282,8 @@
                         <td>{{data.orderNo}}</td>
                         <td>{{data.rechargePlatform | platform}}</td>
                         <td>{{data.status | chlidRechargeStatus}}</td>
+                        <td>{{data.ext1}}</td>
+                        <td>{{data.ext3}}</td>
                         <td>{{data['createTime'] | date: 'yyyy-MM-dd HH:mm'}}</td>
                     </tr>
                     </tbody>

src/app/admin/order-manage/mobile-recharge-order-list/mobile-recharge-order-list.component.scss

@@ -1,3 +1,6 @@
 img {
   width: 60px;
 }
+.fontColor {
+  color: red;
+}

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

@@ -8,6 +8,7 @@ import {OrderMobileRechargeService} from '../../../services/order/order-mobile-r
 import {FormBuilder, FormGroup} from '@angular/forms';
 import {NzMessageService} from 'ng-zorro-antd';
 import {animate, state, style, transition, trigger} from '@angular/animations';
+import {NzNotificationService} from "_ng-zorro-antd@9.3.0@ng-zorro-antd";
 
 @Component({
   selector: 'app-mobile-recharge-order-list',
@@ -80,6 +81,7 @@ export class MobileRechargeOrderListComponent implements OnInit {
         private orderMobileRechargeService: OrderMobileRechargeService,
         private companyService: CompanyService,
         private commonsService: CommonsService,
+        private notification: NzNotificationService,
     ) { }
 
     ngOnInit(): void {
@@ -92,6 +94,7 @@ export class MobileRechargeOrderListComponent implements OnInit {
             createTimeArray: [null],
             refundTimeArray: [null],
             title: [null],
+            exceptionStatus: [null],
             companyId: [null],
             payType: [null],
             memCardNo: [null],
@@ -136,7 +139,6 @@ export class MobileRechargeOrderListComponent implements OnInit {
         this.orderMobileRechargeService.getOrderList(whereObject, data => {
             this.loading = false;
             if (data['return_code'] === '000000') {
-                console.log(data);
                 this.requestData = data['return_data'].list;
                 this.total = data['return_data'].total;
             } else {
@@ -175,5 +177,42 @@ export class MobileRechargeOrderListComponent implements OnInit {
         });
     }
 
+
+    public refundOrder(orderNo: string): void {
+
+        this.commonsService.showConfirm('请确定当前订单无充值中记录！！！', item => {
+            if (item) {
+                this.loadingObject.status = true;
+                this.loadingObject.title = '订单退款中...';
+                this.orderMobileRechargeService.refundOrder(orderNo , data => {
+                    if (data['return_code'] === '000000') {
+                        this.getRequest(false, this.searchForm.value);
+                        this.notification.success('成功' , '退款成功');
+                    } else {
+                        this.message.error(data['return_msg']);
+                        this.notification.error( '失败' , data['return_msg']);
+                    }
+                    this.loadingObject.status = false;
+                });
+            }
+        });
+    }
+
+    public orderNormal(orderNo: string): void {
+
+        this.loadingObject.status = true;
+        this.loadingObject.title = '修改中...';
+        this.orderMobileRechargeService.orderNormal(orderNo , data => {
+            if (data['return_code'] === '000000') {
+                this.getRequest(false, this.searchForm.value);
+                this.notification.success('成功' , '修改成功');
+            } else {
+                this.message.error(data['return_msg']);
+                this.notification.error( '失败' , data['return_msg']);
+            }
+            this.loadingObject.status = false;
+        });
+    }
+
 }
 

src/app/services/order/order-mobile-recharge.service.ts

@@ -51,4 +51,32 @@ export class OrderMobileRechargeService {
         });
     }
 
+    /**
+     * @Author Sum1Dream
+     * @methodName refundOrder
+     * @Description // 订单退款
+     * @Date 15:04 2023/5/18
+     * @Param orderNo
+     * @Param callBack
+     */
+    public refundOrder(orderNo: string, callBack) {
+        this.http.get(environment.orderUrl + 'mobileRecharge/refundOrder?orderNo=' + orderNo).subscribe(data => {
+            callBack(data);
+        });
+    }
+
+    /**
+     * @Author Sum1Dream
+     * @methodName orderNormal
+     * @Description // 异常转正常
+     * @Date 17:26 2023/5/18
+     * @Param orderNo
+     * @Param callBack
+     */
+    public orderNormal(orderNo: string, callBack) {
+        this.http.get(environment.orderUrl + 'mobileRecharge/orderNormal?orderNo=' + orderNo).subscribe(data => {
+            callBack(data);
+        });
+    }
+
 }