提交代码

src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.html

@@ -287,6 +287,7 @@
                         <th nzWidth="60px">数量</th>
                         <th nzWidth="60px">单价</th>
                         <th nzWidth="60px">总价</th>
+                        <th nzWidth="80px">订单状态</th>
                     </tr>
                     </thead>
                     <tbody>
@@ -301,6 +302,7 @@
                         <td>{{ data.saleCount }}</td>
                         <td>{{ data.goodsActualPrice }} 元</td>
                         <td>{{ data.totalActualPrice }} 元</td>
+                        <td>{{ data.childOrderStatus | orderChildStatus}} </td>
                     </tr>
                     </tbody>
                 </nz-table>

src/app/admin/order-manage/order-integral-recharge/order-integral-recharge.component.html

@@ -204,6 +204,7 @@
                         <th nzWidth="60px">数量</th>
                         <th nzWidth="60px">单价</th>
                         <th nzWidth="60px">总价</th>
+                        <th nzWidth="80px">订单状态</th>
                     </tr>
                     </thead>
                     <tbody>
@@ -218,6 +219,7 @@
                         <td>{{ data.saleCount }}</td>
                         <td>{{ data.goodsActualPrice }} 元</td>
                         <td>{{ data.totalActualPrice }} 元</td>
+                        <td>{{ data.childOrderStatus | orderChildStatus}} </td>
                     </tr>
                     </tbody>
                 </nz-table>

src/app/admin/order-manage/order-oil/order-oil-list/order-oil-list.component.html

@@ -343,6 +343,7 @@
                         <th nzWidth="60px">数量</th>
                         <th nzWidth="60px">单价</th>
                         <th nzWidth="60px">总价</th>
+                        <th nzWidth="80px">订单状态</th>
                     </tr>
                     </thead>
                     <tbody>
@@ -357,6 +358,7 @@
                         <td>{{ data.saleCount }}</td>
                         <td>{{ data.goodsActualPrice }} 元</td>
                         <td>{{ data.totalActualPrice }} 元</td>
+                        <td>{{ data.childOrderStatus | orderChildStatus}} </td>
                     </tr>
                     </tbody>
                 </nz-table>

src/app/admin/order-manage/order-refund-list/order-refund-list.component.html

@@ -142,6 +142,8 @@
                 <th nzWidth="180px">创建时间</th>
                 <th nzWidth="180px">退款时间</th>
                 <th nzWidth="300px">退款备注</th>
+                <th nzWidth="150px">操作人类型</th>
+                <th nzWidth="150px">操作人名称</th>
                 <th nzWidth="110px" nzRight="0px">操作</th>
             </tr>
             </thead>
@@ -161,6 +163,8 @@
                 <td>{{data.createTime | date : 'yyyy-MM-dd HH:mm:ss'}}</td>
                 <td>{{data.refundTime | date : 'yyyy-MM-dd HH:mm:ss'}}</td>
                 <td nzBreakWord>{{data.refundRemark}}</td   >
+                <td>{{data.opUserType | orderRefundOpuserType}}</td>
+                <td>{{data.opUserName}}</td>
                 <td nzRight="0px" class="table-td-operation">
                     <a nz-dropdown [nzDropdownMenu]="menu"> 操作列表 <i nz-icon nzType="down"></i> </a>
                     <nz-dropdown-menu #menu="nzDropdownMenu">
@@ -210,14 +214,8 @@
             <nz-tab nzTitle="交易时间">
                 <nz-card>
                     <nz-timeline>
-                        <nz-timeline-item *ngIf="orderDetailObject.createTime != null">
+                        <nz-timeline-item *ngIf="orderDetailObject.createTime != null">创建时间：{{orderDetailObject.createTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item>
-                            <p>创建时间：{{orderDetailObject.createTime | date : 'yyyy-MM-dd HH:mm:ss'}}</p>
+                        <nz-timeline-item *ngIf="orderDetailObject.cancelTime != null">取消时间：{{orderDetailObject.cancelTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item>
-                            <p>备注：{{orderDetailObject.remarks?orderDetailObject.tradeOrder.remarks:'无'}}</p>
-                        </nz-timeline-item>
-                        <nz-timeline-item *ngIf="orderDetailObject.cancelTime != null">
-                            <p>取消时间：{{orderDetailObject.cancelTime | date : 'yyyy-MM-dd HH:mm:ss'}}</p>
-                            <p>备注：{{orderDetailObject.cancelRemarks?orderDetailObject.cancelRemarks:'无'}}</p>
-                        </nz-timeline-item>
                         <nz-timeline-item *ngIf="orderDetailObject.payTime != null">支付时间：{{orderDetailObject.payTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item>
                         <nz-timeline-item *ngIf="orderDetailObject.finishTime != null">完成时间：{{orderDetailObject.finishTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item>
                         <nz-timeline-item *ngIf="orderDetailObject.refundTime != null">退款时间：{{orderDetailObject.refundTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item>
@@ -225,21 +223,24 @@
                 </nz-card>
             </nz-tab>
             <nz-tab nzTitle="产品信息">
-                <nz-table #childOrder [nzData]="orderDetailObject.highChildOrderList" [nzHideOnSinglePage]="true">
+                <nz-table #childOrder [nzData]="orderDetailObject.tradeOrder.highChildOrderList" [nzHideOnSinglePage]="true" [nzScroll]="{ x: '1000px'}">
                     <thead>
                     <tr>
+                        <th nzWidth="110px">订单编号</th>
                         <th nzWidth="60px">产品类型</th>
                         <th nzWidth="150px">产品名称</th>
                         <th nzWidth="80px">产品规格</th>
-                        <th nzWidth="20px">数量</th>
+                        <th nzWidth="60px">数量</th>
-                        <th nzWidth="20px">单价</th>
+                        <th nzWidth="60px">单价</th>
-                        <th nzWidth="20px">总价</th>
+                        <th nzWidth="60px">总价</th>
+                        <th nzWidth="80px">订单状态</th>
                     </tr>
                     </thead>
                     <tbody>
                     <tr *ngFor="let data of childOrder.data">
+                        <td>{{ data.childOrderNo}}</td>
                         <td>{{ data.goodsType | orderChildGoodsType}}</td>
-                        <td>
+                        <td nzEllipsis>
                             {{ data.goodsName }}
                             <nz-tag *ngIf="data.giveawayType == 1" [nzColor]="'magenta'">赠品</nz-tag>
                         </td>
@@ -247,6 +248,7 @@
                         <td>{{ data.saleCount }}</td>
                         <td>{{ data.goodsActualPrice }} 元</td>
                         <td>{{ data.totalActualPrice }} 元</td>
+                        <td>{{ data.childOrderStatus | orderChildStatus}} </td>
                     </tr>
                     </tbody>
                 </nz-table>

src/app/app-common.module.ts

@@ -61,7 +61,7 @@ import {
     PlatformPipe,
     OilTypePipe,
     OilPriceTaskStatusPipe,
-    OilPriceTaskExecutionTypePipe, OilPriceTaskPriceTypePipe, IntegralTypePipe, IntegralProductPipe, ProductTypePipe
+    OilPriceTaskExecutionTypePipe, OilPriceTaskPriceTypePipe, IntegralTypePipe, IntegralProductPipe, ProductTypePipe, OrderRefundOpuserTypePipe, OrderChildStatusPipe
 } from './pipes';
 import {MsgTypePipe} from "./pipes/msg/msg-type.pipe";
 
@@ -121,6 +121,8 @@ const PIPES = [
     OrderPayTypePipe,
     OrderChildGoodsTypePipe,
     OrderRefundStatusPipe,
+    OrderRefundOpuserTypePipe,
+    OrderChildStatusPipe,
 ];
 
 

src/app/pipes/index.ts

@@ -45,6 +45,8 @@ export * from './order/order-oil-status.pipe';
 export * from './order/order-status.pipe';
 export * from './order/order-pay-type.pipe';
 export * from './order/order-child-goods-type.pipe';
+export * from './order/order-refund-opuser-type.pipe';
+export * from './order/order-child-status.pipe';
 export * from './third-product/product-type.pipe';
 export * from './order/order-refund-status.pipe';
 export * from './store/oil-type.pipe';

src/app/pipes/order/order-child-status.pipe.ts

@@ -0,0 +1,27 @@
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({
+  name: 'orderChildStatus'
+})
+export class OrderChildStatusPipe implements PipeTransform {
+
+  transform(value: number): string {
+    switch (value) {
+      case 1:
+        return '待支付';
+      case 2:
+        return '已支付';
+      case 3:
+        return '已完成';
+      case 4:
+        return '已退款';
+      case 5:
+        return '已取消';
+      case 6:
+        return '退款中';
+      case 7:
+        return '退款失败';
+    }
+  }
+
+}

src/app/pipes/order/order-pay-type.pipe.ts

@@ -21,8 +21,6 @@ export class OrderPayTypePipe implements PipeTransform {
         return '银联分期';
       case 7:
         return '嗨森逛油卡';
-        default:
-        return '积分抵扣';
     }
   }
 

src/app/pipes/order/order-refund-opuser-type.pipe.ts

@@ -0,0 +1,19 @@
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({
+  name: 'orderRefundOpuserType'
+})
+export class OrderRefundOpuserTypePipe implements PipeTransform {
+
+  transform(value: number): string {
+    switch (value) {
+      case 1:
+        return '系统';
+      case 2:
+        return '管理员';
+      case 3:
+        return '用户';
+    }
+  }
+
+}

src/environments/environment.ts

@@ -4,11 +4,11 @@
 
 export const environment = {
   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/',
-  // baseUrl: 'https://hsgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
+  baseUrl: 'https://hsgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
-  // orderUrl: 'https://hsgcs.dctpay.com/order/',
+  orderUrl: 'https://hsgcs.dctpay.com/order/',
   imageUrl: 'https://hsgcs.dctpay.com/filesystem/',
   key: 'https://hsgcs.dctpay.com/phone-recharge-H5/index.html?codeValue=',
   inviteUrl: 'https://hsgcs.dctpay.com/wx/?action=ic&id=',