Merge branch 'master' of http://gitlab.corp.qinqinxiaobao.com:9880/uniplat/customer-service

model/order.ts

@@ -28,6 +28,8 @@ export const statusMapping = new Map<OrderStatus, string>([
 
 
 export interface OrderTableListItem {
 export interface OrderTableListItem {
     id: string;
     id: string;
+    v: string;
+    no: string;
     title: string;
     title: string;
     time: string;
     time: string;
     chat: number;
     chat: number;
@@ -50,11 +52,14 @@ export interface OrderTableListItem {
     RefundedAmount: number;
     RefundedAmount: number;
 }
 }
 
 
-export const orderTableListItemPredict = {
+export const orderPredict = {
     id: "ID",
     id: "ID",
+    v: 'uniplat_version',
+    no: 'OrderDocNo',
     title: "ProductId#product.OuterName",
     title: "ProductId#product.OuterName",
     status: "Status",
     status: "Status",
     time: "CreatedDate",
     time: "CreatedDate",
+    createTime: 'CreatedDate',
     PayAmount: "PayAmount",
     PayAmount: "PayAmount",
     PaidAmount: "PaidAmount",
     PaidAmount: "PaidAmount",
     RefundAmount: "RefundAmount",
     RefundAmount: "RefundAmount",
@@ -128,14 +133,6 @@ export const enum OperationType {
     Backend,
     Backend,
 }
 }
 
 
-export interface OrderRowItem {
-    status: OrderStatus;
-    no: string;
-    createTime: string;
-    v: string;
-    id: string;
-}
-
 export interface PaymentDetail {
 export interface PaymentDetail {
     status: PayStatus;
     status: PayStatus;
     time: string;
     time: string;

service/order.ts

@@ -4,12 +4,11 @@ import {
     OperationType,
     OperationType,
     OrderStatus,
     OrderStatus,
     OrderTableListItem,
     OrderTableListItem,
-    orderTableListItemPredict,
+    orderPredict,
     SrcPlatform,
     SrcPlatform,
     OrderPayItem,
     OrderPayItem,
     PaymentDetail,
     PaymentDetail,
     UploadImageItem,
     UploadImageItem,
-    OrderRowItem
 } from "../model";
 } from "../model";
 
 
 class OrderService {
 class OrderService {
@@ -68,7 +67,7 @@ class OrderService {
             .then((r) =>
             .then((r) =>
                 this.handler.buildRows<OrderTableListItem>(
                 this.handler.buildRows<OrderTableListItem>(
                     r.pageData.rows,
                     r.pageData.rows,
-                    orderTableListItemPredict
+                    orderPredict
                 )
                 )
             );
             );
     }
     }
@@ -148,13 +147,7 @@ class OrderService {
     }
     }
 
 
     public buildOrder(o: metaRow) {
     public buildOrder(o: metaRow) {
-        return this.handler.buildRow<OrderRowItem>(o, {
-            status: 'Status',
-            no: 'OrderDocNo',
-            createTime: 'CreatedDate',
-            v: 'uniplat_version',
-            id: 'ID'
-        });
+        return this.handler.buildRow<OrderTableListItem>(o, orderPredict);
     }
     }
 }
 }