调整订单逻辑与销售统计

src/common/menu.js

@@ -1,9 +1,9 @@
 const menuData = [
   {
-    name: '主页',
-    icon: 'dashboard',
-    path: 'dashboard',
-  },{
+  //   name: '主页',
+  //   icon: 'dashboard',
+  //   path: 'dashboard',
+  // },{
     name: '标签管理',
     icon: 'tags',
     path: 'tag',
@@ -55,9 +55,16 @@ const menuData = [
     icon: 'shop',
     path: 'goods',
   },{
-    name: '订单管理',
+    name: '交易管理',
     icon: 'trademark',
-    path: 'order',
+    path: 'trade',
+    children: [{
+    //   name: '购物车管理',
+    //   path: 'shop-cart',
+    // },{
+      name: '订单管理',
+      path: 'order',
+    }],
   },{
     name: '销售统计',
     icon: 'area-chart',

src/common/router.js

@@ -39,9 +39,9 @@ export const getRouterData = (app) => {
     // '/help': {
     //   component: dynamicWrapper(app, [], () => import('../routes/About')),
     // },
-    '/dashboard': {
-      component: dynamicWrapper(app, [], () => import('../routes/Dashboard')),
-    },
+    // '/dashboard': {
+    //   component: dynamicWrapper(app, [], () => import('../routes/Dashboard')),
+    // },
     '/resource/gallery': {
       component: dynamicWrapper(app, ['resource'], () => import('../routes/Resource/gallery')),
     },
@@ -161,21 +161,21 @@ export const getRouterData = (app) => {
       component: dynamicWrapper(app, ['mproduct/detail', 'goods', 'tag/tag'], () => import('../routes/MProduct/Edit')),
       name: '修改商品',
     },
-    '/order': {
+    '/trade/order': {
       component: dynamicWrapper(app, ['order/order'], () => import('../routes/Order/List')),
     },
-    '/order/add': {
+    '/trade/order/add': {
       component: dynamicWrapper(app, ['order/detail', 'terminal/terminal', 'mproduct/mproduct'], () => import('../routes/Order/Add')),
       name: '新建订单',
     },
-    // '/order/edit/:id': {
-    //   component: dynamicWrapper(app, ['order/detail'], () => import('../routes/Order/detail')),
-    //   name: '修改订单',
-    // },
-    '/order/profile/:id': {
-      component: dynamicWrapper(app, ['order/detail'], () => import('../routes/Order/Edit')),
+    '/trade/order/profile/:id': {
+      component: dynamicWrapper(app, ['order/detail'], () => import('../routes/Order/Edit/OrderProfile')),
       name: '订单详情',
     },
+    '/trade/order/sub/profile/:id': {
+      component: dynamicWrapper(app, ['order/detail'], () => import('../routes/Order/Edit/SubOrderProfile')),
+      name: '子订单详情',
+    },
     '/sold': {
       component: dynamicWrapper(app, ['soldProduct'], () => import('../routes/SoldProduct')),
     },

src/index.less

@@ -17,124 +17,124 @@ body {
   height: 8px;
 }
 
-:global {
-  .ant-breadcrumb {
-    & > span {
-      &:last-child {
-        color: #999;
-        font-weight: normal;
-      }
-    }
-  }
-
-  .ant-breadcrumb-link {
-    .anticon + span {
-      margin-left: 4px;
-    }
-  }
-
-  .ant-table {
-    .ant-table-thead > tr > th {
-      text-align: center;
-    }
-
-    .ant-table-tbody > tr > td {
-      text-align: center;
-    }
-
-    &.ant-table-small {
-      .ant-table-thead > tr > th {
-        background: #f7f7f7;
-      }
-
-      .ant-table-body > table {
-        padding: 0;
-      }
-    }
-  }
-
-  .ant-table-pagination {
-    float: none!important;
-    display: table;
-    margin: 16px auto !important;
-  }
-
-  .ant-popover-inner {
-    border: none;
-    border-radius: 0;
-    box-shadow: 0 0 20px rgba(100, 100, 100, 0.2);
-  }
-
-  .vertical-center-modal {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-
-    .ant-modal {
-      top: 0;
-
-      .ant-modal-body {
-        max-height: 80vh;
-        overflow-y: auto;
-      }
-    }
-  }
-
-  .ant-form-item-control {
-    vertical-align: middle;
-  }
-
-  .ant-modal-mask {
-    background-color: rgba(55, 55, 55, 0.2);
-  }
-
-  .ant-modal-content {
-    box-shadow: none;
-  }
-
-  .ant-select-dropdown-menu-item {
-    padding: 12px 16px !important;
-  }
-
-  .margin-right {
-    margin-right: 16px;
-  }
-
-  a:focus {
-    text-decoration: none;
-  }
-}
-@media (min-width: 1600px) {
-  :global {
-    .ant-col-xl-48 {
-      width: 20%;
-    }
-
-    .ant-col-xl-96 {
-      width: 40%;
-    }
-  }
-}
-@media (max-width: 767px) {
-  :global {
-    .ant-pagination-item,
-    .ant-pagination-next,
-    .ant-pagination-options,
-    .ant-pagination-prev {
-      margin-bottom: 8px;
-    }
-
-    .ant-card {
-      .ant-card-head {
-        padding: 0 12px;
-      }
-
-      .ant-card-body {
-        padding: 12px;
-      }
-    }
-  }
-}
+// :global {
+//   .ant-breadcrumb {
+//     & > span {
+//       &:last-child {
+//         color: #999;
+//         font-weight: normal;
+//       }
+//     }
+//   }
+//
+//   .ant-breadcrumb-link {
+//     .anticon + span {
+//       margin-left: 4px;
+//     }
+//   }
+//
+//   .ant-table {
+//     .ant-table-thead > tr > th {
+//       text-align: center;
+//     }
+//
+//     .ant-table-tbody > tr > td {
+//       text-align: center;
+//     }
+//
+//     &.ant-table-small {
+//       .ant-table-thead > tr > th {
+//         background: #f7f7f7;
+//       }
+//
+//       .ant-table-body > table {
+//         padding: 0;
+//       }
+//     }
+//   }
+//
+//   .ant-table-pagination {
+//     float: none!important;
+//     display: table;
+//     margin: 16px auto !important;
+//   }
+//
+//   .ant-popover-inner {
+//     border: none;
+//     border-radius: 0;
+//     box-shadow: 0 0 20px rgba(100, 100, 100, 0.2);
+//   }
+//
+//   .vertical-center-modal {
+//     display: flex;
+//     align-items: center;
+//     justify-content: center;
+//
+//     .ant-modal {
+//       top: 0;
+//
+//       .ant-modal-body {
+//         max-height: 80vh;
+//         overflow-y: auto;
+//       }
+//     }
+//   }
+//
+//   .ant-form-item-control {
+//     vertical-align: middle;
+//   }
+//
+//   .ant-modal-mask {
+//     background-color: rgba(55, 55, 55, 0.2);
+//   }
+//
+//   .ant-modal-content {
+//     box-shadow: none;
+//   }
+//
+//   .ant-select-dropdown-menu-item {
+//     padding: 12px 16px !important;
+//   }
+//
+//   .margin-right {
+//     margin-right: 16px;
+//   }
+//
+//   a:focus {
+//     text-decoration: none;
+//   }
+// }
+// @media (min-width: 1600px) {
+//   :global {
+//     .ant-col-xl-48 {
+//       width: 20%;
+//     }
+//
+//     .ant-col-xl-96 {
+//       width: 40%;
+//     }
+//   }
+// }
+// @media (max-width: 767px) {
+//   :global {
+//     .ant-pagination-item,
+//     .ant-pagination-next,
+//     .ant-pagination-options,
+//     .ant-pagination-prev {
+//       margin-bottom: 8px;
+//     }
+//
+//     .ant-card {
+//       .ant-card-head {
+//         padding: 0 12px;
+//       }
+//
+//       .ant-card-body {
+//         padding: 12px;
+//       }
+//     }
+//   }
+// }
 
 .globalSpin {
   width: 100%;

src/layouts/BasicLayout.js

@@ -132,7 +132,7 @@ class BasicLayout extends React.PureComponent {
                     />
                   ))
                 }
-                <Redirect exact from="/" to="/dashboard" />
+                <Redirect exact from="/" to="/sold" />
                 <Route render={NotFound} />
               </Switch>
             </div>

src/models/order/detail.js

@@ -1,5 +1,5 @@
 import { message } from 'antd';
-import { queryOne, create, update, confirmPay, confirmSend, confirmReceive } from '../../services/order';
+import { queryOne, querySubOrder, create, update, confirmPay, confirmSend, confirmReceive } from '../../services/order';
 import pathToRegexp from 'path-to-regexp';
 import { Codes } from '../../utils/config';
 
@@ -18,11 +18,16 @@ export default {
   subscriptions: {
     setup({ dispatch, history }) {
       history.listen(({ pathname, state, ...rest }) => {
-        const match = pathToRegexp('/order/profile/:id').exec(pathname);
+        const match = pathToRegexp('/trade/order/profile/:id').exec(pathname);
+        const sub = pathToRegexp('/trade/order/sub/profile/:id').exec(pathname);
         if (match) {
           dispatch({ type: 'query', payload: { id: match[1] } });
           dispatch({ type: 'saveFilters', payload: state });
           dispatch({ type: 'saveOperType', payload: { operType: 'view' } });
+        } else if (sub) {
+          dispatch({ type: 'querySubOrder', payload: { id: sub[1] } });
+          dispatch({ type: 'saveFilters', payload: state });
+          dispatch({ type: 'saveOperType', payload: { operType: 'view' } });
         }
       });
     }
@@ -37,6 +42,14 @@ export default {
       }
       yield put({ type: 'changeLoading', payload: { itemLoading: false } });
     },
+    * querySubOrder ({ payload }, { call, put }) {
+      yield put({ type: 'changeLoading', payload: { itemLoading: true } });
+      const { data, success } = yield call(querySubOrder, payload);
+      if (success) {
+        yield put({ type: 'querySuccess', payload: { ...data } });
+      }
+      yield put({ type: 'changeLoading', payload: { itemLoading: false } });
+    },
     * create ({ payload, callback }, { call, put }) {
       const { data, success } = yield call(create, { ...payload });
       if (success) {
@@ -45,14 +58,6 @@ export default {
         if (callback) callback();
       }
     },
-    // * update ({ payload, callback }, { call, put }) {
-    //   const { data, success } = yield call(update, payload);
-    //   if (success) {
-    //     message.success('')
-    //     yield put({ type: 'initState' });
-    //     if (callback) callback();
-    //   }
-    // },
     * orderPay ({ payload, callback }, { call, put }) {
       const { data, success } = yield call(confirmPay, payload);
       if (success) {
@@ -86,6 +91,9 @@ export default {
     saveFilters(state, { payload: filters }) {
       return { ...state, filters };
     },
+    saveOuterParams(state, action) {
+      return { ...state, ...action.payload };
+    },
     showTerminalModal(state, action) {
       return { ...state, ...action.payload, terminalModalShow: true };
     },
@@ -98,20 +106,6 @@ export default {
     hideProductModal(state, action) {
       return { ...state, ...action.payload, productModalShow: false };
     },
-    // savePickedTerminal(state, action) {
-    //   return {
-    //     ...state,
-    //     currentItem: { ...state.currentItem, ...action.payload },
-    //     terminalModalShow: false,
-    //   };
-    // },
-    // savePickedProducts(state, action) {
-    //   return {
-    //     ...state,
-    //     currentItem: { goods: action.payload },
-    //     productModalShow: false,
-    //   };
-    // },
     initState(state) {
       return { ...state, currentItem: {}, itemLoading: false };
     }

src/models/order/order.js

@@ -19,7 +19,7 @@ export default modelExtend(pageModel, {
   subscriptions: {
     setup({ dispatch, history }) {
       history.listen((location) => {
-        if (location.pathname === '/order') {
+        if (location.pathname === '/trade/order') {
           const payload = checkSearchParams(queryString.parse(location.search));
           dispatch({
             type: 'query',

src/models/soldProduct.js

@@ -44,6 +44,7 @@ export default modelExtend(pageModel, {
           }
         });
       }
+      yield put({ type: 'changeLoading', payload: { listLoading: false }});
     }
   },
 

src/routes/Merchant/List/table.less

@@ -2,67 +2,71 @@
 @import "../../../utils/utils.less";
 
 .table {
-  .ant-table-tbody > tr > td,
-  .ant-table-thead > tr > th {
-    height: 62px;
+  :global {
+    .ant-table-tbody > tr > td,
+    .ant-table-thead > tr > th {
+      height: 62px;
+    }
   }
 
   &.motion {
-    .ant-table-tbody > tr > td,
-    .ant-table-thead > tr > th {
-      &:nth-child(1) {
-        width: 17%;
-      }
+    :global {
+      .ant-table-tbody > tr > td,
+      .ant-table-thead > tr > th {
+        &:nth-child(1) {
+          width: 17%;
+        }
 
-      &:nth-child(2) {
-        width: 17%;
-      }
+        &:nth-child(2) {
+          width: 17%;
+        }
 
-      &:nth-child(3) {
-        width: 17%;
-      }
+        &:nth-child(3) {
+          width: 17%;
+        }
 
-      &:nth-child(4) {
-        width: 17%;
-      }
+        &:nth-child(4) {
+          width: 17%;
+        }
 
-      &:nth-child(5) {
-        width: 17%;
-      }
+        &:nth-child(5) {
+          width: 17%;
+        }
 
-      &:nth-child(6) {
-        width: 15%;
+        &:nth-child(6) {
+          width: 15%;
+        }
       }
-    }
 
-    .ant-table-thead {
-      & > tr {
-        transition: none;
-        display: block;
+      .ant-table-thead {
+        & > tr {
+          transition: none;
+          display: block;
 
-        & > th {
-          display: inline-flex;
-          align-items: center;
-          justify-content: center;
+          & > th {
+            display: inline-flex;
+            align-items: center;
+            justify-content: center;
+          }
         }
       }
-    }
 
-    .ant-table-tbody {
-      & > tr {
-        transition: none;
-        display: block;
-        border-bottom: 1px solid #f5f5f5;
+      .ant-table-tbody {
+        & > tr {
+          transition: none;
+          display: block;
+          border-bottom: 1px solid #f5f5f5;
 
-        & > td {
-          border-bottom: none;
-          display: inline-flex;
-          align-items: center;
-          justify-content: center;
-        }
+          & > td {
+            border-bottom: none;
+            display: inline-flex;
+            align-items: center;
+            justify-content: center;
+          }
 
-        &.ant-table-expanded-row-level-1 > td {
-          height: auto;
+          &.ant-table-expanded-row-level-1 > td {
+            height: auto;
+          }
         }
       }
     }

src/routes/Order/Add/index.js

@@ -254,7 +254,7 @@ export default class CreateOrder extends Component {
     const { orderDetail, dispatch } = this.props;
     const { filters } = orderDetail;
     dispatch(routerRedux.push({
-      pathname: '/order',
+      pathname: '/trade/order',
       search: queryString.stringify(filters),
     }));
   }
@@ -284,7 +284,7 @@ export default class CreateOrder extends Component {
         payload: postData,
         callback: () => {
           dispatch(routerRedux.push({
-            pathname: '/order',
+            pathname: '/trade/order',
             search: queryString.stringify(filters),
           }));
         }

src/routes/Order/Edit/OrderProfile.js

@@ -0,0 +1,298 @@
+import React, { Component } from 'react';
+import { connect } from 'dva';
+import { routerRedux } from 'dva/router';
+import queryString from 'query-string';
+import { Card, Modal, Steps, Badge, Button, Table, Divider } from 'antd';
+import moment from 'moment';
+import PageHeaderLayout from '../../../layouts/PageHeaderLayout';
+import FooterToolbar from '../../../components/FooterToolbar';
+import { Codes, orderStatuses, productType, orderSplitStatus } from '../../../utils/config';
+import { provCodeToName } from '../../../utils/city';
+
+@connect(state => ({ orderDetail: state.orderDetail }))
+export default class OrderProfile extends Component {
+  handlePageCancel = () => {
+    const { filters, dispatch } = this.props;
+    dispatch(routerRedux.push({
+      pathname: '/trade/order',
+      search: queryString.stringify(filters),
+    }));
+  }
+
+  // handleOrderStatus = (id, type, name) => {
+  //   const { dispatch, orderDetail } = this.props;
+  //   const { filters } = orderDetail;
+  //   Modal.confirm({
+  //     title: name,
+  //     cancelText: '取消',
+  //     okText: '确认',
+  //     onOk: () =>
+  //       dispatch({
+  //         type: `orderDetail/${type}`,
+  //         payload: { id },
+  //         callback: () => {
+  //           dispatch(routerRedux.push({
+  //             pathname: `/trade/order/profile/${id}`,
+  //             search: queryString.stringify(filters),
+  //           }));
+  //         },
+  //       }),
+  //   });
+  // }
+  //
+  // nextStepOperation = (data) => {
+  //   const { orderStatus, id } = data;
+  //   switch (orderStatus) {
+  //     case Codes.CODE_UNPAID:
+  //       return (
+  //         <Button
+  //           type="primary"
+  //           onClick={() =>
+  //             this.handleOrderStatus(id, 'orderPay', '确定支付该订单?')}
+  //         >立即支付
+  //         </Button>
+  //       );
+  //       break;
+  //     case Codes.CODE_FORSEND:
+  //       return (
+  //         <Button
+  //           type="primary"
+  //           onClick={() =>
+  //             this.handleOrderStatus(id, 'orderSend', '确定发货?')}
+  //         >立即发货
+  //         </Button>
+  //       );
+  //       break;
+  //     case Codes.CODE_SENT:
+  //       return (
+  //         <Button
+  //           type="primary"
+  //           onClick={() =>
+  //             this.handleOrderStatus(id, 'orderReceive', '确认收货?')}
+  //         >确认收货</Button>
+  //       );
+  //       break;
+  //     case Codes.CODE_COMPLETE:
+  //       return null;
+  //       break;
+  //     default:
+  //       return (
+  //         <Button
+  //           type="primary"
+  //           disabled={true}
+  //         >处理中</Button>
+  //       );
+  //       break;
+  //   }
+  // }
+
+  render() {
+    const { orderDetail } = this.props;
+    const { currentItem } = orderDetail;
+    const {
+      id,
+      code,
+      gmtCreated,
+      userCode,
+      status,
+      provinceCode,
+      cityName,
+      zoneName,
+      classroomName,
+      orderStatus,
+      splitStatus,
+      merchantName,
+      originPrice,
+      finalPrice,
+      adjustPrice,
+      name,
+      mobile,
+      address,
+      note,
+      goods,
+    } = currentItem;
+
+    // simply table columns
+    const simplyTableColumns = [{
+      title: 'field',
+      dataIndex: 'field',
+      key: 1,
+      width: '20%',
+    },{
+      title: 'value',
+      dataIndex: 'value',
+      key: 2,
+      width: '80%',
+    }];
+    // 订单信息 - table data
+    const orderInfoTableDatas = [{
+      field: '订单编号',
+      value: id,
+      key: 1,
+    },{
+      field: '下单时间',
+      value: moment(gmtCreated).format('YYYY-MM-DD HH:mm:ss'),
+      key: 2,
+    },{
+      field: '订单状态',
+      value: orderStatuses[orderStatus],
+      key: 3,
+    },{
+      field: '拆分状态',
+      value: orderSplitStatus[splitStatus],
+      key: 4,
+    },{
+      field: '拆分原因',
+      value: '订单中包含实体物品或物品分属不同商家',
+      key: 5,
+    }];
+    // 收货人信息 - table data
+    const consumerInfoTableData = [{
+      field: '购买终端编号',
+      value: userCode,
+      key: 1,
+    },{
+      field: '购买终端名称',
+      value: `${classroomName}`,
+      key: 2,
+    },{
+      field: '终端所属校区',
+      value: `${provCodeToName(provinceCode)}-${cityName}-${zoneName}`,
+      key: 3,
+    },{
+      field: '终端所属渠道',
+      value: merchantName,
+      key: 4,
+    },{
+      field: '收货人姓名',
+      value: name,
+      key: 5,
+    },{
+      field: '收货人电话',
+      value: mobile,
+      key: 6,
+    },{
+      field: '收货地址',
+      value: address,
+      key: 7,
+    }];
+    // 商品清单
+    const goodsTableColumns = [{
+      title: '商品编号',
+      dataIndex: 'code',
+      key: 1,
+      width: '20%',
+    },{
+      title: '商品名称',
+      dataIndex: 'name',
+      key: 2,
+      width: '20%',
+    },{
+      title: '商品类型',
+      dataIndex: 'type',
+      render: (text, row) => productType[text],
+      key: 3,
+      width: '15%',
+    },{
+      title: '商品售价(元)',
+      dataIndex: 'merchantPrice',
+      key: 4,
+      width: '20%',
+    },{
+      title: '商品数量',
+      dataIndex: 'quantity',
+      key: 5,
+      width: '10%',
+    },{
+      title: '操作',
+      dataIndex: 'operation',
+      render: (text, row) => <a>查看详情</a>,
+      key: 6,
+      width: '15%',
+    }];
+    // 子订单列表
+    const subOrderTableColumns = [{
+      title: '子订单编号',
+      dataIndex: 'id',
+      key: 1,
+      width: '20%',
+    }];
+    // 结算信息 - table data
+    const strs = [];
+    (goods || []).forEach(item => strs.push(`${item.merchantPrice}(元) * ${item.quantity}`));
+    const accountTableDatas = [{
+      field: '商品总价',
+      value: `${strs.join(' + ')} = ${originPrice}(元)`,
+      key: 1,
+    },{
+      field: '支付金额',
+      value:
+        <span>
+          {`总价：${originPrice}(元) - 商品优惠：${adjustPrice}(元) = 订单总金额：`}
+          <strong style={{ color: 'red' }}>{`${finalPrice}(元)`}</strong>
+        </span>,
+      key: 2,
+    }]
+
+    // const stepMap = {
+    //   [Codes.CODE_UNPAID]: 0,
+    //   [Codes.CODE_PAID]: 1,
+    //   [Codes.CODE_FORSEND]: 1,
+    //   [Codes.CODE_SENT]: 2,
+    //   [Codes.CODE_RECEIVED]: 3,
+    //   [Codes.CODE_CANCEL]: 4,
+    //   [Codes.CODE_COMPLETE]: 4,
+    // };
+    //
+    return (
+      <PageHeaderLayout title="订单详情">
+        <Card title="订单信息" bordered={false} style={{ marginBottom: 20 }}>
+          <Table
+            size="small"
+            columns={simplyTableColumns}
+            dataSource={orderInfoTableDatas}
+            bordered={true}
+            pagination={false}
+            showHeader={false}
+          />
+        </Card>
+        <Card title="商品清单" bordered={false} style={{ marginBottom: 20 }}>
+          <Table
+            size="small"
+            rowKey={record => record.id}
+            columns={goodsTableColumns}
+            dataSource={goods || []}
+            bordered={true}
+            pagination={false}
+          />
+        </Card>
+        <Card title="收货人信息" bordered={false} style={{ marginBottom: 20 }}>
+          <Table
+            size="small"
+            columns={simplyTableColumns}
+            dataSource={consumerInfoTableData}
+            bordered={true}
+            pagination={false}
+            showHeader={false}
+          />
+        </Card>
+        <Card title="订单备注" bordered={false} style={{ marginBottom: 20 }}>
+          {note ? note : '无'}
+        </Card>
+        <Card title="结算信息" bordered={false}>
+          <Table
+            size="small"
+            columns={simplyTableColumns}
+            dataSource={accountTableDatas}
+            bordered={true}
+            pagination={false}
+            showHeader={false}
+          />
+        </Card>
+        <FooterToolbar>
+          <Button onClick={this.handlePageCancel} type="primary">返回订单列表</Button>
+        </FooterToolbar>
+      </PageHeaderLayout>
+    );
+  }
+}

src/routes/Order/Edit/SubOrderProfile.js

@@ -0,0 +1,298 @@
+import React, { Component } from 'react';
+import { connect } from 'dva';
+import { routerRedux } from 'dva/router';
+import queryString from 'query-string';
+import { Card, Modal, Steps, Badge, Button, Table, Divider, Icon } from 'antd';
+import moment from 'moment';
+import PageHeaderLayout from '../../../layouts/PageHeaderLayout';
+import FooterToolbar from '../../../components/FooterToolbar';
+import { Codes, orderStatuses, productType, orderSplitStatus } from '../../../utils/config';
+import { provCodeToName } from '../../../utils/city';
+
+@connect(state => ({ orderDetail: state.orderDetail }))
+export default class SubOrderProfile extends Component {
+  handlePageCancel = () => {
+    const { filters, dispatch } = this.props;
+    dispatch(routerRedux.push({
+      pathname: '/trade/order',
+      search: queryString.stringify(filters),
+    }));
+  }
+
+  // handleOrderStatus = (id, type, name) => {
+  //   const { dispatch, orderDetail } = this.props;
+  //   const { filters } = orderDetail;
+  //   Modal.confirm({
+  //     title: name,
+  //     cancelText: '取消',
+  //     okText: '确认',
+  //     onOk: () =>
+  //       dispatch({
+  //         type: `orderDetail/${type}`,
+  //         payload: { id },
+  //         callback: () => {
+  //           dispatch(routerRedux.push(`/trade/order/sub/profile/${id}`));
+  //         },
+  //       }),
+  //   });
+  // }
+
+  // nextStepOperation = (data) => {
+  //   const { orderStatus, id } = data;
+  //   switch (orderStatus) {
+  //     case Codes.CODE_UNPAID:
+  //       return (
+  //         <Button
+  //           type="primary"
+  //           onClick={() =>
+  //             this.handleOrderStatus(id, 'orderPay', '确定支付该订单?')}
+  //         >立即支付
+  //         </Button>
+  //       );
+  //       break;
+  //     case Codes.CODE_COMPLETE:
+  //       return null;
+  //       break;
+  //     case Codes.CODE_CANCEL:
+  //       return null;
+  //       break;
+  //     default:
+  //       return (
+  //         <Button
+  //           type="primary"
+  //           disabled={true}
+  //         >进行中</Button>
+  //       );
+  //       break;
+  //   }
+  // }
+
+  render() {
+    const { orderDetail } = this.props;
+    const { currentItem } = orderDetail;
+    const {
+      id,
+      code,
+      gmtCreated,
+      userCode,
+      status,
+      provinceCode,
+      cityName,
+      zoneName,
+      classroomName,
+      orderStatus,
+      splitStatus,
+      merchantName,
+      originPrice,
+      finalPrice,
+      adjustPrice,
+      name,
+      type,
+      mobile,
+      address,
+      note,
+      goods,
+    } = currentItem;
+
+    // simply table columns
+    const simplyTableColumns = [{
+      title: 'field',
+      dataIndex: 'field',
+      key: 1,
+      width: '20%',
+    },{
+      title: 'value',
+      dataIndex: 'value',
+      key: 2,
+      width: '80%',
+    }];
+    // 订单信息 - table data
+    const orderInfoTableDatas = [{
+      field: '订单编号',
+      value: id,
+      key: 1,
+    },{
+      field: '下单时间',
+      value: moment(gmtCreated).format('YYYY-MM-DD HH:mm:ss'),
+      key: 2,
+    },{
+      field: '订单状态',
+      value: orderStatuses[orderStatus],
+      key: 3,
+    },{
+      field: '拆分状态',
+      value: orderSplitStatus[splitStatus],
+      key: 4,
+    },{
+      field: '拆分原因',
+      value: '订单中包含实体物品或物品分属不同商家',
+      key: 5,
+    }];
+    // 收货人信息 - table data
+    const consumerInfoTableData = [{
+      field: '购买终端编号',
+      value: userCode,
+      key: 1,
+    },{
+      field: '购买终端名称',
+      value: `${classroomName}`,
+      key: 2,
+    },{
+      field: '终端所属校区',
+      value: `${provCodeToName(provinceCode)}-${cityName}-${zoneName}`,
+      key: 3,
+    },{
+      field: '终端所属渠道',
+      value: merchantName,
+      key: 4,
+    },{
+      field: '收货人姓名',
+      value: name,
+      key: 5,
+    },{
+      field: '收货人电话',
+      value: mobile,
+      key: 6,
+    },{
+      field: '收货地址',
+      value: address,
+      key: 7,
+    }];
+    // 商品清单
+    const goodsTableColumns = [{
+      title: '商品编号',
+      dataIndex: 'code',
+      key: 1,
+      width: '20%',
+    },{
+      title: '商品名称',
+      dataIndex: 'name',
+      key: 2,
+      width: '20%',
+    },{
+      title: '商品类型',
+      dataIndex: 'type',
+      render: (text, row) => productType[text],
+      key: 3,
+      width: '15%',
+    },{
+      title: '商品售价(元)',
+      dataIndex: 'merchantPrice',
+      key: 4,
+      width: '20%',
+    },{
+      title: '商品数量',
+      dataIndex: 'quantity',
+      key: 5,
+      width: '10%',
+    },{
+      title: '操作',
+      dataIndex: 'operation',
+      render: (text, row) => <a>查看详情</a>,
+      key: 6,
+      width: '15%',
+    }];
+    // 子订单列表
+    const subOrderTableColumns = [{
+      title: '子订单编号',
+      dataIndex: 'id',
+      key: 1,
+      width: '20%',
+    }];
+    // 结算信息 - table data
+    const strs = [];
+    (goods || []).forEach(item => strs.push(`${item.merchantPrice}(元) * ${item.quantity}`));
+    const accountTableDatas = [{
+      field: '商品总价',
+      value: `${strs.join(' + ')} = ${originPrice}(元)`,
+      key: 1,
+    },{
+      field: '支付金额',
+      value:
+        <span>
+          {`总价：${originPrice}(元) - 商品优惠：${adjustPrice}(元) = 订单总金额：`}
+          <strong style={{ color: 'red' }}>{`${finalPrice}(元)`}</strong>
+        </span>,
+      key: 2,
+    }]
+
+    const entityStepMap = {
+      [Codes.CODE_UNPAID]: 0,
+      [Codes.CODE_PAID]: 1,
+      [Codes.CODE_FORSEND]: 1,
+      [Codes.CODE_SENT]: 2,
+      [Codes.CODE_RECEIVED]: 3,
+      [Codes.CODE_CANCEL]: 4,
+      [Codes.CODE_COMPLETE]: 4,
+    };
+    const virtualStepMap = {
+      [Codes.CODE_UNPAID]: 0,
+      [Codes.CODE_PAID]: 1,
+      [Codes.CODE_FORSEND]: 1,
+      [Codes.CODE_SENT]: 1,
+      [Codes.CODE_RECEIVED]: 1,
+      [Codes.CODE_CANCEL]: 4,
+      [Codes.CODE_COMPLETE]: 4,
+    };
+
+    return (
+      <PageHeaderLayout title="子订单详情">
+        {type == Codes.CODE_ENTITY ?
+          <Card title="订单状态" bordered={false} style={{ marginBottom: 20 }}>
+            <Steps current={entityStepMap[orderStatus]}>
+              <Steps.Step title="提交订单" icon={<Icon type="schedule" />} />
+              <Steps.Step title="付款成功" icon={<Icon type="red-envelope" />} />
+              <Steps.Step title="商品出库" icon={<Icon type="inbox" />} />
+              <Steps.Step title="等待收货" icon={<Icon type="rocket" />} />
+              <Steps.Step title="完成" icon={<Icon type="check" />} />
+            </Steps>
+          </Card>
+        :
+          <Card title="订单状态" bordered={false} style={{ marginBottom: 20 }}>
+            <Steps current={virtualStepMap[orderStatus]}>
+              <Steps.Step title="提交订单" icon={<Icon type="schedule" />} />
+              <Steps.Step title="付款成功" icon={<Icon type="red-envelope" />} />
+              <Steps.Step title="完成" icon={<Icon type="check" />} />
+            </Steps>
+          </Card>
+        }
+        <Card title="商品清单" bordered={false} style={{ marginBottom: 20 }}>
+          <Table
+            size="small"
+            rowKey={record => record.id}
+            columns={goodsTableColumns}
+            dataSource={goods || []}
+            bordered={true}
+            pagination={false}
+          />
+        </Card>
+        <Card title="收货人信息" bordered={false} style={{ marginBottom: 20 }}>
+          <Table
+            size="small"
+            columns={simplyTableColumns}
+            dataSource={consumerInfoTableData}
+            bordered={true}
+            pagination={false}
+            showHeader={false}
+          />
+        </Card>
+        <Card title="订单备注" bordered={false} style={{ marginBottom: 20 }}>
+          {note ? note : '无'}
+        </Card>
+        <Card title="结算信息" bordered={false}>
+          <Table
+            size="small"
+            columns={simplyTableColumns}
+            dataSource={accountTableDatas}
+            bordered={true}
+            pagination={false}
+            showHeader={false}
+          />
+        </Card>
+        <FooterToolbar>
+          <Button onClick={this.handlePageCancel} type="primary">返回订单列表</Button>
+        </FooterToolbar>
+      </PageHeaderLayout>
+    );
+  }
+}

src/routes/Order/Edit/index.js

@@ -1,207 +0,0 @@
-import React, { Component } from 'react';
-import { connect } from 'dva';
-import { routerRedux } from 'dva/router';
-import queryString from 'query-string';
-import { Card, Modal, Steps, Badge, Button, Table, Divider } from 'antd';
-import Debounce from 'lodash-decorators/debounce';
-import Bind from 'lodash-decorators/bind';
-import moment from 'moment';
-import PageHeaderLayout from '../../../layouts/PageHeaderLayout';
-import FooterToolbar from '../../../components/FooterToolbar';
-import DescriptionList from '../../../components/DescriptionList';
-import { Codes, orderStatuses } from '../../../utils/config';
-import styles from './index.less';
-
-const { Description } = DescriptionList;
-const getWindowWidth = () => (window.innerWidth || document.documentElement.clientWidth);
-
-@connect(state => ({ orderDetail: state.orderDetail }))
-export default class OrderProfile extends Component {
-  state = {
-    stepDirection: 'horizontal',
-  };
-
-  componentDidMount() {
-    this.setStepDirection();
-    window.addEventListener('resize', this.setStepDirection);
-  }
-
-  componentWillUnmount() {
-    window.removeEventListener('resize', this.setStepDirection);
-    this.setStepDirection.cancel();
-  }
-
-  @Bind()
-  @Debounce(200)
-  setStepDirection() {
-    const { stepDirection } = this.state;
-    const w = getWindowWidth();
-    if (stepDirection !== 'vertical' && w <= 576) {
-      this.setState({
-        stepDirection: 'vertical',
-      });
-    } else if (stepDirection !== 'horizontal' && w > 576) {
-      this.setState({
-        stepDirection: 'horizontal',
-      });
-    }
-  }
-
-  handlePageCancel = () => {
-    const { filters, dispatch } = this.props;
-    dispatch(routerRedux.push({
-      pathname: '/order',
-      search: queryString.stringify(filters),
-    }));
-  }
-
-  handleOrderStatus = ({ id, type, name }) => {
-    const { dispatch, orderDetail } = this.props;
-    const { filters } = orderDetail;
-    Modal.confirm({
-      title: name,
-      cancelText: '取消',
-      okText: '确认',
-      onOk: () =>
-        dispatch({
-          type: `orderDetail/${type}`,
-          payload: { id },
-          callback: () => {
-            dispatch(routerRedux.push({
-              pathname: `/order/profile/${id}`,
-              search: queryString.stringify(filters),
-            }));
-          },
-        }),
-    });
-  }
-
-  render() {
-    const { orderDetail } = this.props;
-    const { stepDirection } = this.state;
-    const { currentItem } = orderDetail;
-    const {
-      id,
-      code,
-      gmtCreated,
-      userCode,
-      status,
-      provinceCode,
-      cityName,
-      zoneName,
-      classroomName,
-      orderStatus,
-      merchantName,
-      finalPrice,
-      adjustPrice,
-      name,
-      mobile,
-      address,
-      note,
-    } = currentItem;
-
-    const goodsTableColumns = [{
-      title: '商品编号',
-      dataIndex: 'code',
-      key: 'code',
-    },{
-      title: '商品类型',
-      dataIndex: 'type',
-      key: 'type',
-    },{
-      title: '商品名称',
-      dataIndex: 'name',
-      key: 'name',
-    },{
-      title: '领教定价',
-      dataIndex: 'lingjiaoPrice',
-      key: 'lingjiaoPrice',
-    },{
-      title: '渠道定价',
-      dataIndex: 'merchantPrice',
-      key: 'merchantPrice',
-    },{
-      title: '实际售价',
-      dataIndex: 'finalPrice',
-      key: 'finalPrice',
-    },{
-      title: '数量',
-      dataIndex: 'quality',
-      key: 'quality',
-    },{
-      title: '单位',
-      dataIndex: 'chargeUnit',
-      key: 'chargeUnit',
-    },{
-      title: '起始时间',
-      dataIndex: 'timeBegin',
-      key: 'timeBegin',
-    },{
-      title: '结束时间',
-      dataIndex: 'timeEnd',
-      key: 'timeEnd',
-    }];
-
-    const stepMap = {
-      [Codes.CODE_UNPAID]: 0,
-      [Codes.CODE_PAID]: 1,
-      [Codes.CODE_FORSEND]: 1,
-      [Codes.CODE_SENT]: 2,
-      [Codes.CODE_RECEIVED]: 3,
-      [Codes.CODE_CANCEL]: 4,
-      [Codes.CODE_COMPLETE]: 4,
-    }
-
-    return (
-      <PageHeaderLayout title="订单详情">
-        <Card title="处理进度" style={{ marginBottom: 20 }} bordered={false}>
-          <Steps direction={stepDirection} current={stepMap[orderStatus]}>
-            <Steps.Step
-              title="待支付"
-              description={orderStatus == Codes.CODE_UNPAID ? <a onClick={() => this.handleOrderStatus({id, type: 'orderPay', name: '确定支付?'})}>立即支付</a> : null}
-            />
-            <Steps.Step title="已支付" />
-            <Steps.Step
-              title="已发货"
-              description={orderStatus == Codes.CODE_SENT ? <a  onClick={() => this.handleOrderStatus({id, type: 'orderReceive', name: '确认收货?'})}>确认收货</a> : null}
-            />
-            <Steps.Step
-              title="已收货"
-            />
-            <Steps.Step title="已完成" />
-          </Steps>
-        </Card>
-        <Card bordered={false}>
-          <DescriptionList size="large" title="订单信息" col={2} style={{ marginBottom: 32 }}>
-            <Description term="订单编号">{code}</Description>
-            <Description term="创建时间">{moment(gmtCreated).format('YYYY-MM-DD HH:mm:ss')}</Description>
-            <Description term="终端编号">{userCode}</Description>
-            <Description term="终端名称">{`${provinceCode}-${cityName}-${zoneName}-${classroomName}`}</Description>
-            <Description term="渠道名称">{merchantName}</Description>
-            <Description term="最终售价">{`${finalPrice} 元`}</Description>
-            <Description term="优惠价格">{`${adjustPrice || 0} 元`}</Description>
-            <Description term="支付状态">{orderStatuses[orderStatus]}</Description>
-          </DescriptionList>
-          <Divider style={{ marginBottom: 32 }} />
-          <DescriptionList size="large" title="收货信息" col={2} style={{ marginBottom: 32 }}>
-            <Description term="收货人">{name}</Description>
-            <Description term="联系电话">{mobile}</Description>
-            <Description term="收货地址">{address}</Description>
-            <Description term="备注">{note}</Description>
-          </DescriptionList>
-          {/*
-          <Divider style={{ marginBottom: 32 }} />
-          <div className={styles.title}>商品清单</div>
-          <Table
-            dataSource={[]}
-            columns={goodsTableColumns}
-          />
-          */}
-        </Card>
-        <FooterToolbar>
-          <Button onClick={this.handlePageCancel} type="primary">返回订单列表</Button>
-        </FooterToolbar>
-      </PageHeaderLayout>
-    );
-  }
-}

src/routes/Order/Edit/index.less

@@ -1,8 +0,0 @@
-@import "~antd/lib/style/themes/default.less";
-
-.title {
-  color: @heading-color;
-  font-size: 16px;
-  font-weight: 500;
-  margin-bottom: 16px;
-}

src/routes/Order/Edit/modal.js

@@ -1,87 +0,0 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-import { Badge, Popover, Icon } from 'antd';
-import SelectModal from '../../../components/SelectModal';
-import styles from './modal.less';
-import { Codes, resourceType } from '../../../utils/config';
-
-export default class WareSelectSortModal extends PureComponent {
-  static propTypes = {
-    selTableData: PropTypes.array.isRequired,
-    modalVisible: PropTypes.bool.isRequired,
-    rowKeyName: PropTypes.string.isRequired,
-  };
-
-  render() {
-    const { selTableData, modalVisible, rowKeyName, onCancel, onOk, onSearch, ...fsTableOpts } = this.props;
-
-    const modalProps = {
-      title: '选择课件',
-      maskClosable: false,
-      visible: modalVisible,
-      onCancel,
-      onOk,
-    };
-
-    const searchProps = {
-      searchField: 'name',
-      searchKeyWord: '',
-      searchSize: 'default',
-      searchSelect: true,
-      searchSelectOptions: [{
-        value: 'name', name: '课件名称', mode: 'input',
-      },{
-        value: 'code', name: '课件编号', mode: 'input',
-      }],
-      searchSelectProps: {
-        defaultValue: 'name',
-      },
-      onSearch: (value) => {
-        onSearch(value);
-      },
-    };
-
-    const selTableProps = {
-      operDel: true,
-      operSort: true,
-      tableClassName: styles.sTable,
-      tablePagination: false,
-      tableDataSource: selTableData,
-      rowKeyName: rowKeyName,
-      tableColumns: [{
-        title: '课件编号',
-        dataIndex: 'code',
-        key: 'code',
-      },{
-        title: '课件名称',
-        dataIndex: 'name',
-        key: 'name',
-      }],
-    };
-
-    //待选资源Table属性
-    const fsTableProps = {
-      fsTableClassName: styles.fsTable,
-      fsTableColumns: [{
-        title: '课件编号',
-        dataIndex: 'code',
-        key: 'code',
-      },{
-        title: '课件名称',
-        dataIndex: 'name',
-        key: 'name',
-      }],
-      ...fsTableOpts,
-    }
-
-    return (
-      <SelectModal
-        mode="multiple"
-        { ...searchProps }
-        { ...modalProps }
-        { ...selTableProps }
-        { ...fsTableProps }
-      />
-    );
-  }
-}

src/routes/Order/Edit/modal.less

@@ -1,120 +0,0 @@
-.fsTable {
-  :global {
-    .ant-table-tbody > tr > td,
-    .ant-table-thead > tr > th {
-      height: 50px;
-    }
-  }
-
-  :global {
-    .ant-table-tbody > tr > td,
-    .ant-table-thead > tr > th {
-      &:nth-child(1) {
-        width: 40%;
-      }
-
-      &:nth-child(2) {
-        width: 40%;
-      }
-
-      &:nth-child(3) {
-        width: 20%;
-      }
-    }
-
-    .ant-table-thead {
-      & > tr {
-        transition: none;
-        display: block;
-
-        & > th {
-          display: inline-flex;
-          align-items: center;
-          justify-content: center;
-        }
-      }
-    }
-
-    .ant-table-tbody {
-      & > tr {
-        transition: none;
-        display: block;
-        border-bottom: 1px solid #f5f5f5;
-
-        & > td {
-          border-bottom: none;
-          display: inline-flex;
-          align-items: center;
-          justify-content: center;
-        }
-
-        &.ant-table-expanded-row-level-1 > td {
-          height: auto;
-        }
-      }
-    }
-  }
-}
-
-
-.sTable {
-  :global {
-    .ant-table-tbody > tr > td,
-    .ant-table-thead > tr > th {
-      height: 50px;
-    }
-  }
-
-  :global {
-    .ant-table-tbody > tr > td,
-    .ant-table-thead > tr > th {
-      &:nth-child(1) {
-        width: 30%;
-      }
-
-      &:nth-child(2) {
-        width: 30%;
-      }
-
-      &:nth-child(3) {
-        width: 20%;
-      }
-
-      &:nth-child(4) {
-        width: 20%;
-      }
-    }
-
-    .ant-table-thead {
-      & > tr {
-        transition: none;
-        display: block;
-
-        & > th {
-          display: inline-flex;
-          align-items: center;
-          justify-content: center;
-        }
-      }
-    }
-
-    .ant-table-tbody {
-      & > tr {
-        transition: none;
-        display: block;
-        border-bottom: 1px solid #f5f5f5;
-
-        & > td {
-          border-bottom: none;
-          display: inline-flex;
-          align-items: center;
-          justify-content: center;
-        }
-
-        &.ant-table-expanded-row-level-1 > td {
-          height: auto;
-        }
-      }
-    }
-  }
-}

src/routes/Order/List/index.js

@@ -53,7 +53,7 @@ export default class Order extends PureComponent {
       onAdd: () => {
         dispatch(
           routerRedux.push({
-            pathname: '/order/add',
+            pathname: '/trade/order/add',
             state: filters,
           })
         );
@@ -88,17 +88,26 @@ export default class Order extends PureComponent {
         }));
       },
       onViewItem: (item) => {
-        dispatch(
-          routerRedux.push({
-            pathname: `/order/profile/${item.id}`,
-            state: filters,
-          })
-        );
+        if (item.flag) {
+          dispatch(
+            routerRedux.push({
+              pathname: `/trade/order/sub/profile/${item.id}`,
+              state: filters,
+            })
+          );
+        } else {
+          dispatch(
+            routerRedux.push({
+              pathname: `/trade/order/profile/${item.id}`,
+              state: filters,
+            })
+          );
+        }
       },
       onEditItem: (item) => {
         dispatch(
           routerRedux.push({
-            pathname: `/order/edit/${item.id}`,
+            pathname: `/trade/order/edit/${item.id}`,
             state: filters,
           })
         );

src/routes/Order/List/list.js

@@ -0,0 +1,122 @@
+import React, { Component } from 'react';
+import { Card, List, Row, Col, Button } from 'antd';
+import moment from 'moment';
+import PageHeaderLayout from '../../../layouts/PageHeaderLayout';
+import { Codes, orderStatuses, goodsType } from '../../../utils/config';
+import styles from './list.less';
+
+export default class OrderStandardList extends Component {
+
+  render() {
+    const { onViewItem, onChange, pagination, dataSource, loading } = this.props;
+    const newPagination = { ...pagination, onChange };
+
+    const OrderItem = ({content, viewable}) => {
+      const operation = () => {
+        if (content.orderStatus == Codes.CODE_UNPAID) {
+          return (
+            <div>
+              <Button type="primary">立即支付</Button>
+            </div>
+          );
+        } else if (content.orderStatus !== Codes.CODE_COMPLETE){
+          return (
+            <div>
+              <Button type="primary" disabled={true}>处理中...</Button>
+            </div>
+          );
+        } else {
+          return (
+            <div>已完成</div>
+          );
+        }
+      }
+      return (
+        <div className={styles.itemWrapper}>
+          <div className={styles.itemHeader}>
+            <div className={styles.time}>{moment(content.gmtCreated).format('YYYY-MM-DD HH:mm:ss')}</div>
+            <div className={styles.code}>{`订单号：${content.id}`}</div>
+            <div className={styles.status}>{`订单状态：${orderStatuses[content.orderStatus]}`}</div>
+          </div>
+          <div className={styles.itemBody}>
+            <div className={styles.goodsInfo}>
+              {'商品类型：' + goodsType[content.type] ? goodsType[content.type] : '未知' }
+            </div>
+            <div className={styles.userInfo}>
+              <ul>
+                <li>{`收货人：${content.name}`}</li>
+                <li>{`联系电话：${content.mobile}`}</li>
+                <li>{`收货地址：${content.address}`}</li>
+              </ul>
+            </div>
+            <div className={styles.jump}>
+              <a disabled={!viewable ? true : false} onClick={() => onViewItem({ id: content.id })}>订单详情</a>
+            </div>
+            <div className={styles.change}>
+              {operation()}
+            </div>
+          </div>
+        </div>
+      );
+    }
+
+    const splitedOrderRowMaker = (item) => {
+      // 未付款
+      if (item.orderStatus == Codes.CODE_UNPAID) {
+        return (
+          <OrderItem key={item.id} content={item} viewable={true}/>
+        );
+      // 已付款 需要拆单的(显示主订单及子订单)
+      } else {
+        return (
+          <div className={styles.orderItemWrapper}>
+            <div className={styles.rowHeader}>
+              <div className={styles.row1}>
+                <div className={styles.time}>{moment(item.gmtCreated).format('YYYY-MM-DD HH:mm:ss')}</div>
+                <div className={styles.code}>{`订单号：${item.id}`}</div>
+                <div className={styles.desc}>订单内包含实体物品或者供应商不同，故拆分成以下订单</div>
+              </div>
+              <div className={styles.row2}>
+                <div className={styles.receiver}>{`收货人：${item.name}`}</div>
+                <div className={styles.price}>{`订单金额：${item.finalPrice}(元)`}</div>
+                <div className={styles.status}>{`订单状态：${orderStatuses[item.orderStatus]}`}</div>
+                <div className={styles.operation}>
+                  <a onClick={() => onViewItem({ id: item.id })}>{`查看拆单详情>`}</a>
+                </div>
+              </div>
+            </div>
+            <div className={styles.subOrder}>
+              {item.detailList.map(one => <OrderItem key={one.id} content={one} viewable={false}/>)}
+            </div>
+          </div>
+        );
+      }
+      // 已付款 不需要拆单的(实际都会拆单)不显示主订单了
+      // } else {
+      //   return (
+      //     <div className={styles.common}>
+      //       {item.detailList.map(one => <OrderItem key={one.id} content={one} viewable={true}/>)}
+      //     </div>
+      //   );
+      // }
+    };
+
+    return (
+      <List
+        size="large"
+        rowKey="id"
+        split={false}
+        loading={loading}
+        pagination={newPagination}
+        dataSource={dataSource}
+        renderItem={item => (
+          <List.Item
+            key={item.id}
+          >
+            {splitedOrderRowMaker(item)}
+          </List.Item>
+        )}
+      />
+    );
+  }
+}

src/routes/Order/List/list.less

@@ -0,0 +1,132 @@
+.orderItemWrapper {
+  width: 100%;
+  height: 100%;
+
+  .rowHeader {
+    background-color: #f5f5f5;
+    border: 1px solid #e5e5e5;
+    border-radius: 5px 5px 0 0;
+    .row1 {
+      position: relative;
+      padding: 5px;
+      height: 40px;
+
+      .time {
+        float: left;
+        width: 20%;
+      }
+
+      .code {
+        float: left;
+        width: 40%;
+      }
+
+      .desc {
+        float: left;
+        width: 40%;
+      }
+    }
+
+    .row2 {
+      position: relative;
+      border-top: 1px solid #e5e5e5;
+      padding: 5px;
+      height: 40px;
+
+      .receiver {
+        float: left;
+        width: 20%;
+      }
+
+      .price {
+        float: left;
+        width: 40%;
+      }
+
+      .status {
+        float: left;
+        width: 20%;
+      }
+
+      .operation {
+        float: left;
+        width: 20%;
+      }
+    }
+  }
+}
+
+.itemWrapper {
+  width: 100%;
+  height: 100%;
+  border-bottom: 1px solid #e5e5e5;
+  border-left: 1px solid #e5e5e5;
+  border-right: 1px solid #e5e5e5;
+
+  .itemHeader {
+    height: 40px;
+    padding: 5px;
+    background-color: #f5f5f5;
+
+    .time {
+      float: left;
+      width: 20%;
+    }
+    .code {
+      float: left;
+      width: 40%;
+    }
+    .status {
+      float: left;
+      width: 40%;
+    }
+  }
+
+  .itemBody {
+    height: 100px;
+    border-top: 1px solid #e5e5e5;
+
+    .goodsInfo {
+      display:flex;
+      justify-content:center;
+      align-items:center;
+      float: left;
+      width: 20%;
+      height: 100%;
+      border-right: 1px solid #e5e5e5;
+    }
+    .userInfo {
+      display:flex;
+      justify-content:center;
+      align-items:center;
+      float: left;
+      width: 40%;
+      height: 100%;
+      border-right: 1px solid #e5e5e5;
+    }
+    .jump {
+      position: relative;
+      display:flex;
+      justify-content:center;
+      align-items:center;
+      float: left;
+      width: 20%;
+      height: 100%;
+      border-right: 1px solid #e5e5e5;
+    }
+    .change {
+      position: relative;
+      display:flex;
+      justify-content:center;
+      align-items:center;
+      float: left;
+      width: 20%;
+      height: 100%;
+    }
+  }
+}
+
+.common {
+  width: 100%;
+  height: 100%;
+}

src/routes/Order/List/search.js

@@ -22,10 +22,6 @@ export default class Search extends PureComponent {
       size: 'default',
       select: true,
       selectOptions: [{
-        value: 'campusName', name: '校区名称', mode: 'input',
-      },{
-        value: 'campusCode', name: '校区编号', mode: 'input',
-      },{
         value: 'userCode', name: '终端编号', mode: 'input',
       }],
       selectProps: {

src/routes/Order/List/table.js

@@ -1,131 +1,42 @@
 import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
 import moment from 'moment';
-import classnames from 'classnames';
 import queryString from 'query-string';
-import { Divider, Modal, DatePicker, Table, Menu, Icon, Badge, Button } from 'antd';
-import AnimTableBody from '../../../components/Animation/AnimTableBody';
-import styles from './table.less';
+import { Modal, Table, Menu, Icon, Badge, Button } from 'antd';
 import { orderStatuses, Codes } from '../../../utils/config';
 
-const { RangePicker } = DatePicker;
-
 export default class TableList extends PureComponent {
 
-  state = {
-    filtered: false,       //是否处于过滤状态
-    timeBegin: null,       //起始时间 - 默认当前时间戳
-    timeEnd: null,         //结束时间 - 默认时间戳
-  }
-
-  componentWillReceiveProps(nextProps) {
-    // 如果父组件传进的属性中包含timeBegin和timeEnd并进行合法性校验,通过则更新state
-    const { timeBegin, timeEnd } = nextProps;
-    const nextTimeBegin = Number(timeBegin);
-    const nextTimeEnd = Number(timeEnd);
-    if (nextTimeBegin && nextTimeEnd && moment(nextTimeBegin).isValid() && moment(nextTimeEnd).isValid()) {
-      this.setState({
-        timeBegin: moment(nextTimeBegin),
-        timeEnd: moment(nextTimeEnd),
-        filtered: true,
-      });
-    }
-  }
-
-  // 选择了筛选的时间段，点击确定后触发
-  handleRangePickerOnOk = (value) => {
-    const timeBegin = value[0];
-    const timeEnd = value[1];
-    this.setState({ timeBegin, timeEnd, filtered: true });
-  }
-
-  // 点击清除选中的时间段
-  handleRangePickerOnChange = (value) => {
-    if (value && !value.length) {
-      this.setState({
-        filtered: false,
-        timeBegin: null,
-        timeEnd: null,
-      });
-    } else {
-      this.setState({
-        filtered: true,
-        timeBegin: value[0],
-        timeEnd: value[1],
-      })
-    }
-  }
-
-  // 点击空白区域，隐藏RangePicker，会触发一次查询
-  handleRangePickerFilter = (visible) => {
-    if (!visible) {
-      const { pagination, onChange } = this.props;
-      // 这里构造成数组类型是为了和table自带的过滤参数类型一致
-      const data = { timeBegin: [], timeEnd: [] };
-      if (this.state.timeBegin && this.state.timeEnd) {
-        data.timeBegin = [this.state.timeBegin.format('X')];
-        data.timeEnd = [this.state.timeEnd.format('X')];
-      }
-      onChange(pagination, data);
-    }
-  }
-
   handleItemView = (record) => {
     const { onViewItem } = this.props;
-    onViewItem({ id: record.id });
+    onViewItem(record);
   }
 
-  // handleMenuClick = (record, e) => {
-  //   const { onDeleteItem, onViewItem, onEditItem, onRecoverItem } = this.props;
-  //   if (e.key === '1') {
-  //     onViewItem(record);
-  //   } else if (e.key === '2') {
-  //     console.log('enter into edit page...');
-  //   }else if (e.key === '3') {
-  //     Modal.confirm({
-  //       title: '你确定要作废该订单?',
-  //       onOk () {
-  //         console.log('deleting...');
-  //         // onDeleteItem(record.id)
-  //       },
-  //     });
-  //   }
-  // }
-
-  // 根据订单状态确定下拉菜单的选项
-  // renderOperationButton = (record) => {
-  //   switch (record.orderStatus) {
-  //     case Codes.CODE_PAID:
-  //       return (
-  //         <div>
-  //           <Button type="primary" size="small">查看</Button>
-  //         </div>
-  //       );
-  //       break;
-  //     case Codes.CODE_UNPAID:
-  //       return (
-  //         <div>
-  //           <a>支付</a>
-  //         </div>
-  //       );
-  //       break;
-  //     case Codes.CODE_CANCEL:
-  //       return (
-  //         <div>
-  //           <a>查看</a>
-  //         </div>
-  //       );
-  //       break;
-  //     default:
-  //       break;
-  //   }
-  // }
-
   render() {
-    const { curStatus, onDeleteItem, onRecoverItem, onEditItem, location, pagination, ...tableProps } = this.props;
-    const { timeBegin, timeEnd, filtered } = this.state;
+    const { onDeleteItem, onRecoverItem, onEditItem, dataSource, pagination, ...tableProps } = this.props;
+    const newDataSource = [...dataSource];
+    newDataSource.forEach(item => {
+      if (Array.isArray(item.detailList) && item.detailList.length) {
+        item.children = item.detailList.map(one => (
+          {
+            ...one,
+            flag: true,
+            userCode: item.userCode,
+            provinceCode: item.provinceCode,
+            cityName: item.cityName,
+            zoneName: item.zoneName,
+          })
+        );
+      }
+    });
 
     const columns = [{
+      title: '订单编号',
+      dataIndex: 'id',
+      key: 'id',
+      fixed: 'left',
+      width: 330,
+    },{
       title: '终端编号',
       dataIndex: 'userCode',
       key: 'userCode',
@@ -137,18 +48,18 @@ export default class TableList extends PureComponent {
         <span>{`${record.provinceCode}-${record.cityName}-${record.zoneName}`}</span>
       ),
     },{
-      title: '商品标价',
+      title: '商品总价(元)',
       dataIndex: 'originPrice',
       key: 'originPrice',
     },{
-      title: '实际售价',
-      dataIndex: 'finalPrice',
-      key: 'finalPrice',
-    },{
-      title: '价格调整',
+      title: '优惠价格(元)',
       dataIndex: 'adjustPrice',
       key: 'adjustPrice',
     },{
+      title: '实际售价(元)',
+      dataIndex: 'finalPrice',
+      key: 'finalPrice',
+    },{
       title: '状态',
       dataIndex: 'orderStatus',
       key: 'orderStatus',
@@ -160,9 +71,6 @@ export default class TableList extends PureComponent {
         };
         return (<Badge status={statusMap[record.orderStatus] || 'processing'} text={orderStatuses[record.orderStatus]} />);
       },
-      filters: Object.keys(orderStatuses).map(key => ({ text: orderStatuses[key], value: key })),
-      filterMultiple: false,
-      filteredValue: [curStatus],
     },{
       title: '下单时间',
       dataIndex: 'gmtCreated',
@@ -170,51 +78,31 @@ export default class TableList extends PureComponent {
       render: (text, record) => (
         <div>{moment(text).format('YYYY-MM-DD HH:mm:ss')}</div>
       ),
-      filterIcon: <Icon type="clock-circle-o" style={{ color: filtered ? '#108ee9' : '#aaa' }} />,
-      filterDropdown: (
-        <div className="custom-filter-dropdown">
-          <RangePicker
-            value={filtered ? [timeBegin, timeEnd] : []}
-            showTime={{ format: 'HH:mm:ss' }}
-            format="YYYY-MM-DD HH:mm:ss"
-            placeholder={["起始时间", "截止时间"]}
-            onChange={this.handleRangePickerOnChange}
-            onOk={this.handleRangePickerOnOk}
-            getCalendarContainer={() => document.querySelector('.custom-filter-dropdown')}
-          />
-        </div>
-      ),
-      onFilterDropdownVisibleChange: this.handleRangePickerFilter,
     },{
       title: '操作',
       dataIndex: 'operation',
       key: 'operation',
-      // render: (text, record) => this.renderOperationButton(record),
-      render: (text, record) => <a onClick={() => this.handleItemView(record)}>查看</a>
+      render: (text, record) => (
+        <div>
+          <a onClick={() => this.handleItemView(record)}>查看</a>
+        </div>
+      ),
+      width: 70,
+      fixed: 'right',
     }];
 
-    // 数据table列表表头的筛选按钮点击重置后status值为空，此时删除该参数
-    columns.map(item => {
-      item.dataIndex == 'orderStatus' && !curStatus ? delete item.filteredValue : null;
-    });
-
     // 配置分页
     tableProps.pagination = !!pagination && { ...pagination, showSizeChanger: true, showQuickJumper: true, showTotal: total => `共 ${total} 条`};
 
-    // 添加动画
-    const AnimationTableBody = (props) => (<AnimTableBody {...props}/>);
-
     return (
       <Table
         simple
         bordered
-        { ...tableProps }
+        dataSource={newDataSource}
         columns={columns}
-        className={classnames({ [styles.table]: true, [styles.motion]: true })}
         rowKey={record => record.id}
-        components={{
-          body: { wrapper: AnimationTableBody }
-        }}
+        { ...tableProps }
+        scroll={{ x: 1500 }}
       />
     );
   }

src/routes/Order/List/table.less

@@ -14,31 +14,31 @@
       .ant-table-tbody > tr > td,
       .ant-table-thead > tr > th {
         &:nth-child(1) {
-          width: 16%;
+          width: 22%;
         }
 
         &:nth-child(2) {
-          width: 18%;
+          width: 22%;
         }
 
         &:nth-child(3) {
-          width: 10%;
+          width: 8%;
         }
 
         &:nth-child(4) {
-          width: 10%;
+          width: 8%;
         }
 
         &:nth-child(5) {
-          width: 10%;
+          width: 8%;
         }
 
         &:nth-child(6) {
-          width: 10%;
+          width: 8%;
         }
 
         &:nth-child(7) {
-          width: 18%;
+          width: 16%;
         }
 
         &:nth-child(8) {

src/routes/SoldProduct/index.js

@@ -1,49 +1,75 @@
 import React, { Component } from 'react';
 import { connect } from 'dva';
-import { Divider, Table, Card, Form, Row, Col, Input, Select, DatePicker, Icon } from 'antd';
+import classnames from 'classnames';
+import {
+  Radio,
+  Row,
+  Col,
+  Table,
+  Form,
+  Card,
+  Select,
+  Input,
+  Icon,
+  Button,
+  DatePicker,
+} from 'antd';
 import moment from 'moment';
-import { productType } from '../../utils/config';
+import AnimTableBody from '../../components/Animation/AnimTableBody';
+import { productType, orderStatuses } from '../../utils/config';
 import styles from './index.less';
 
+const { RangePicker } = DatePicker;
+
 @Form.create()
 @connect(state => ({ snapshot: state.snapshot }))
 export default class SoldProductList extends Component {
+  getFormValue = () => {
+    const { form } = this.props;
+    const { getFieldsValue } = form;
+    const filters = getFieldsValue();
+    if (filters && filters.time) {
+      filters.timeBegin = filters.time[0].format('X');
+      filters.timeEnd = filters.time[1].format('X');
+      delete filters.time;
+    }
+    if (filters.orderStatus == 'all') {
+      delete filters.orderStatus;
+    }
+    return filters;
+  }
+
+  handleFilterSubmit = (e) => {
+    e.preventDefault();
+    const filters = this.getFormValue();
+    this.props.dispatch({ type: 'snapshot/query', payload: filters });
+  }
+
+  handleFilterReset = () => {
+    this.props.form.resetFields();
+    this.props.dispatch({ type: 'snapshot/query', payload: {} });
+  }
+
+  handleTableChange = (pagination) => {
+    const filters = { ...this.getFormValue(), ...pagination };
+    this.props.dispatch({ type: 'snapshot/query', payload: filters });
+  }
+
   render() {
-    // 模拟数据
-    // const mockData = [];
-    // for (let i = 1; i < 2000; i++) {
-    //   mockData.push({
-    //     id: i,
-    //     productCode: 'C-001',
-    //     productName: '小学语文二年级上册',
-    //     productType: 'COURSE',
-    //     userCode: '1500024398001',
-    //     userName: '教室六',
-    //     campusCode: '1500024398',
-    //     campusName: '湖南省-长沙市天水区-育新小学',
-    //     merchantName: '贝尔安亲',
-    //     cpPrice: 1000.85,
-    //     merchantPrice: 20000.890,
-    //     terminalPrice: 21000,
-    //     chargeUnit: '年',
-    //     quantity: 1,
-    //     gmtCreated: 1590000134,
-    //   });
-    // }
-    const { snapshot } = this.props;
-    const { list, listLoading } = snapshot;
+    const { snapshot, form } = this.props;
+    const { getFieldDecorator } = form;
+    const { list, listLoading, pagination } = snapshot;
 
-    // 表格-列对象
     const columns = [{
       title: '产品编号',
       dataIndex: 'productCode',
-      key: 1, //设置了dataIndex可忽略这个属性
+      key: 1,
     },{
       title: '产品名称',
       dataIndex: 'productName',
       key: 2,
     },{
-      title: '产品类型',
+      title: '类型',
       dataIndex: 'productType',
       key: 3,
       render: (text, record) => productType[text],
@@ -84,7 +110,7 @@ export default class SoldProductList extends Component {
       dataIndex: 'quantity',
       key: 12,
     },{
-      title: '计价单位',
+      title: '单位',
       dataIndex: 'chargeUnit',
       key: 13,
     },{
@@ -94,23 +120,75 @@ export default class SoldProductList extends Component {
       render: (text, record) => moment(text).format('YYYY-MM-DD HH:mm:ss'),
     }];
 
-    const { getFieldDecorator } = this.props.form;
+    const newPagination = !!pagination && { ...pagination, showSizeChanger: true, showQuickJumper: true, showTotal: total => `共 ${total} 条`};
+    const AnimationTableBody = (props) => (<AnimTableBody {...props}/>);
 
     return (
       <Card>
-        <div className={styles.tableList}>
-          <span>筛选<Icon type="filter" /></span>
-          <div>
-            <Table
-              loading={listLoading}
-              bordered
-              rowKey={(record) => record.id}
-              columns={columns}
-              dataSource={list}
-              scroll={{ x: 1800 }}
-            />
-          </div>
-        </div>
+        <Form layout="inline" className={styles.tableSearchForm} onSubmit={this.handleFilterSubmit}>
+          <Row gutter={24}>
+            <Col span={12}>
+              <Form.Item label="起始时间">
+                {getFieldDecorator('time', {
+                })(<RangePicker />)}
+              </Form.Item>
+            </Col>
+            <Col span={12}>
+              <Form.Item label="终端编号">
+                {getFieldDecorator('userCode', {
+                })(<Input placeholder="请输入" />)}
+              </Form.Item>
+            </Col>
+          </Row>
+          <Row gutter={24}>
+            <Col span={12}>
+              <Form.Item label="校区编号">
+                {getFieldDecorator('campusCode', {
+                })(<Input placeholder="请输入" />)}
+              </Form.Item>
+            </Col>
+            <Col span={12}>
+              <Form.Item label="校区名称">
+                {getFieldDecorator('campusName', {
+                })(<Input placeholder="请输入" />)}
+              </Form.Item>
+            </Col>
+          </Row>
+          <Row>
+            <Col span={24} style={{ textAlign: 'left' }}>
+              <Form.Item label="订单状态">
+                {getFieldDecorator('orderStatus', {
+                  initialValue: 'all',
+                })(
+                  <Radio.Group style={{ width: '100%' }}>
+                    <Radio key="all" value="all">不限</Radio>
+                    {Object.keys(orderStatuses).map(item => <Radio key={item} value={item}>{orderStatuses[item]}</Radio>)}
+                  </Radio.Group>
+                )}
+              </Form.Item>
+            </Col>
+          </Row>
+          <Row>
+            <Col span={24} style={{ textAlign: 'right' }}>
+              <Button type="primary" htmlType="submit">搜索</Button>
+              <Button onClick={this.handleFilterReset} style={{ marginLeft: 8 }}>重置</Button>
+            </Col>
+          </Row>
+        </Form>
+        <Table
+          bordered
+          loading={listLoading}
+          onChange={this.handleTableChange}
+          rowKey={(record) => record.id}
+          columns={columns}
+          dataSource={list}
+          pagination={newPagination}
+          scroll={{ x: 1800 }}
+          className={classnames({ [styles.table]: true, [styles.motion]: true })}
+          components={{
+            body: { wrapper: AnimationTableBody }
+          }}
+        />
       </Card>
     );
   }

src/routes/SoldProduct/index.less

@@ -1,48 +1,122 @@
 @import "~antd/lib/style/themes/default.less";
 @import "../../utils/utils.less";
 
-.tableList {
-  .tableListOperator {
-    margin-bottom: 16px;
-    button {
-      margin-right: 8px;
+.table {
+  :global {
+    .ant-table-tbody > tr > td,
+    .ant-table-thead > tr > th {
+      height: 50px;
     }
   }
-}
 
-.tableListForm {
-  :global {
-    .ant-form-item {
-      margin-bottom: 24px;
-      margin-right: 0;
-      display: flex;
-      > .ant-form-item-label {
-        width: auto;
-        line-height: 32px;
-        padding-right: 8px;
+  &.motion {
+    :global {
+      .ant-table-tbody > tr > td,
+      .ant-table-thead > tr > th {
+        &:nth-child(1) {
+          width: 8%;
+        }
+
+        &:nth-child(2) {
+          width: 8%;
+        }
+
+        &:nth-child(3) {
+          width: 5%;
+        }
+
+        &:nth-child(4) {
+          width: 9%;
+        }
+
+        &:nth-child(5) {
+          width: 6%;
+        }
+
+        &:nth-child(6) {
+          width: 9%;
+        }
+
+        &:nth-child(7) {
+          width: 9%;
+        }
+
+        &:nth-child(8) {
+          width: 6%;
+        }
+
+        &:nth-child(9) {
+          width: 8%;
+        }
+
+        &:nth-child(10) {
+          width: 7%;
+        }
+
+        &:nth-child(11) {
+          width: 7%;
+        }
+
+        &:nth-child(12) {
+          width: 4%;
+        }
+
+        &:nth-child(13) {
+          width: 4%;
+        }
+
+        &:nth-child(14) {
+          width: 10%;
+        }
       }
-      .ant-form-item-control {
-        line-height: 32px;
+
+      .ant-table-thead {
+        & > tr {
+          transition: none;
+          display: block;
+
+          & > th {
+            display: inline-flex;
+            align-items: center;
+            justify-content: center;
+          }
+        }
+      }
+
+      .ant-table-tbody {
+        & > tr {
+          transition: none;
+          display: block;
+          border-bottom: 1px solid #f5f5f5;
+
+          & > td {
+            border-bottom: none;
+            display: inline-flex;
+            align-items: center;
+            justify-content: center;
+          }
+
+          &.ant-table-expanded-row-level-1 > td {
+            height: auto;
+          }
+        }
       }
-    }
-    .ant-form-item-control-wrapper {
-      flex: 1;
     }
   }
-  .submitButtons {
-    white-space: nowrap;
-    margin-bottom: 24px;
-  }
 }
 
-@media screen and (max-width: @screen-lg) {
-  .tableListForm :global(.ant-form-item) {
-    margin-right: 24px;
+.tableSearchForm {
+  padding: 24px;
+  background: #fbfbfb;
+  border: 1px solid #d9d9d9;
+  border-radius: 6px;
+  margin-bottom: 20px;
+
+  .ant-form-item {
+    display: flex;
   }
-}
 
-@media screen and (max-width: @screen-md) {
-  .tableListForm :global(.ant-form-item) {
-    margin-right: 8px;
+  .ant-form-item-label {
+    overflow: visible;
   }
 }

src/services/order.js

@@ -1,6 +1,6 @@
 import { stringify } from 'qs';
 import request from '../utils/request';
-import { order, orderPay, orderSend, orderReceive } from '../utils/api';
+import { order, subOrder, orderPay, orderSend, orderReceive } from '../utils/api';
 
 export async function query(params) {
   return request(`${order}?${stringify(params)}`);
@@ -10,6 +10,10 @@ export async function queryOne({ id }) {
   return request(`${order}/${id}`);
 }
 
+export async function querySubOrder({ id }) {
+  return request(`${subOrder}/${id}`);
+}
+
 export async function create(params) {
   const options = {
     method: 'POST',
@@ -26,6 +30,7 @@ export async function update(params) {
   return request(`${order}`, options);
 }
 
+// 未支付订单可取消
 export async function remove({ id }) {
   const options = { method: 'DELETE' };
   return request(`${order}`, options);

src/utils/api.js

@@ -30,6 +30,7 @@ module.exports = {
   bundleTag: `${config.apiHost}/merchant/product/tags`,
   goods: `${config.apiHost}/goods`,
   order: `${config.apiHost}/order`,
+  subOrder: `${config.apiHost}/order/detail`,
   orderPay: `${config.apiHost}/order/pay`,
   orderSend: `${config.apiHost}/order/send`,
   orderReceive: `${config.apiHost}/order/receive`,

src/utils/config.js

@@ -25,6 +25,15 @@ Codes.CODE_COMPLETE = 'COMPLETE';
 Codes.CODE_FORSEND = 'FORSEND';
 Codes.CODE_SENT = 'SENT';
 Codes.CODE_RECEIVED = 'RECEIVED';
+
+// 订单的拆分状态
+Codes.CODE_ORDER_SPLIT_YES = 'YES';
+Codes.CODE_ORDER_SPLIT_NO = 'NO';
+Codes.CODE_ORDER_SPLIT_UN = 'UN';
+
+Codes.CODE_ENTITY = 'ENTITY';
+Codes.CODE_VIRTUAL = 'VIRTUAL';
+
 Codes.CODE_CP = 1010;
 Codes.CODE_LJ = 2010;
 Codes.CODE_PJ = 3010;
@@ -97,6 +106,17 @@ module.exports = {
     [Codes.CODE_SENT]: '已发货',
     [Codes.CODE_RECEIVED]: '已收货',
   },
+  // 订单拆分状态
+  orderSplitStatus: {
+    [Codes.CODE_ORDER_SPLIT_YES]: '已拆分',
+    [Codes.CODE_ORDER_SPLIT_NO]: '未拆分',
+    [Codes.CODE_ORDER_SPLIT_UN]: '不需要拆分',
+  },
+  // 商品类型
+  goodsType: {
+    [Codes.CODE_ENTITY]: '实体物品',
+    [Codes.CODE_VIRTUAL]: '虚拟物品'
+  },
   // 计价单位 名字: 时长
   chargeUnit: {
     [Codes.CODE_SEASON]: 90,