- 退款流程基本走完

2019-05-09 22:46:30 +08:00
parent 3677aab9ae
commit ddf2f0ea1f
13 changed files with 333 additions and 59 deletions
--- a/admin-web/src/models/orderRefunds/orderRefunds.js
+++ b/admin-web/src/models/orderRefunds/orderRefunds.js
@@ -1,4 +1,5 @@
-import { list } from '../../services/orderRefunds';
+import { message } from 'antd';
+import { list, agree, refuse, confirmReceipt, confirmRefund } from '../../services/orderRefunds';

 export default {
  namespace: 'orderRefunds',
@@ -18,6 +19,54 @@ export default {
        payload: response.data,
      });
    },
+    *agree({ payload }, { call }) {
+      const { callback, params } = payload;
+      const response = yield call(agree, params);
+      if (response.code !== 0) {
+        message.error('操作失败!');
+      } else {
+        message.success('操作成功!');
+        if (callback) {
+          callback(response);
+        }
+      }
+    },
+    *refuse({ payload }, { call }) {
+      const { callback, params } = payload;
+      const response = yield call(refuse, params);
+      if (response.code !== 0) {
+        message.error('操作失败!');
+      } else {
+        message.success('操作成功!');
+        if (callback) {
+          callback(response);
+        }
+      }
+    },
+    *confirmReceipt({ payload }, { call }) {
+      const { callback, params } = payload;
+      const response = yield call(confirmReceipt, params);
+      if (response.code !== 0) {
+        message.error('操作失败!');
+      } else {
+        message.success('操作成功!');
+        if (callback) {
+          callback(response);
+        }
+      }
+    },
+    *confirmRefund({ payload }, { call }) {
+      const { callback, params } = payload;
+      const response = yield call(confirmRefund, params);
+      if (response.code !== 0) {
+        message.error('操作失败!');
+      } else {
+        message.success('操作成功!');
+        if (callback) {
+          callback(response);
+        }
+      }
+    },
  },

  reducers: {
--- a/admin-web/src/pages/OrderRefunds/OrderRefundsList.js
+++ b/admin-web/src/pages/OrderRefunds/OrderRefundsList.js
@@ -1,7 +1,7 @@
 import React, { PureComponent } from 'react';
 import { connect } from 'dva';
 import moment from 'moment';
-import { Card, Tabs, Table } from 'antd';
+import { Card, Tabs, Modal, Table, Divider } from 'antd';
 import PageHeaderWrapper from '../../components/PageHeaderWrapper';
 import DictionaryText from '../../components/Dictionary/DictionaryText';
 import TableSearch from './TableSearch';
@@ -19,29 +19,46 @@ import dictionary from '../../utils/dictionary';
 class OrderRefundsList extends PureComponent {
  componentDidMount() {
    // 查询 list
-    this.queryList({ index: 1 }, {});
+    this.queryList({ index: 1, pageSize: 10 }, {});
  }

  handleSearch = searchParams => {
    const { orderRefunds } = this.props;
    const { index, pageSize } = orderRefunds;
-    this.queryList({ index, pageSize }, searchParams);
+    this.queryList(
+      { index, pageSize },
+      {
+        ...searchParams,
+        ...this.tabsValue,
+      }
+    );
  };

-  queryList = ({ index = 0, pageSize = 10 }, searchParams) => {
+  queryList = (pageParams, searchParams) => {
    const { dispatch } = this.props;
+
+    this.pageParams = pageParams;
+    this.searchParams = searchParams;
    dispatch({
      type: 'orderRefunds/list',
      payload: {
-        index,
-        pageSize,
+        ...pageParams,
        ...searchParams,
      },
    });
  };

  handleTabsChange = value => {
-    console.log(value);
+    this.tabsValue = {
+      status: value,
+    };
+    this.queryList(
+      { index: 1, pageSize: 10 },
+      {
+        ...this.searchParams,
+        status: value,
+      }
+    );
  };

  handleTableChange = pagination => {
@@ -49,11 +66,116 @@ class OrderRefundsList extends PureComponent {
    this.queryList({ pageSize, index: current }, {});
  };

+  handleAgreeClick = ({ id }) => {
+    const { dispatch } = this.props;
+    const self = this;
+    Modal.confirm({
+      title: '提示消息',
+      content: '确认同意!',
+      onOk() {
+        dispatch({
+          type: 'orderRefunds/agree',
+          payload: {
+            params: {
+              id,
+            },
+            callback: () => {
+              self.queryList(self.pageParams, self.searchParams);
+            },
+          },
+        });
+      },
+      onCancel() {
+        console.log('Cancel');
+      },
+    });
+  };
+
+  handleRefuse = ({ id }) => {
+    const { dispatch } = this.props;
+    const self = this;
+    Modal.confirm({
+      title: '提示消息',
+      content: '确认拒绝!',
+      onOk() {
+        dispatch({
+          type: 'orderRefunds/refuse',
+          payload: {
+            params: {
+              id,
+            },
+            callback: () => {
+              self.queryList(self.pageParams, self.searchParams);
+            },
+          },
+        });
+      },
+      onCancel() {
+        console.log('Cancel');
+      },
+    });
+  };
+
+  handleConfirmReceipt = ({ id }) => {
+    const { dispatch } = this.props;
+    const self = this;
+    Modal.confirm({
+      title: '提示消息',
+      content: '确认收货!',
+      onOk() {
+        dispatch({
+          type: 'orderRefunds/confirmReceipt',
+          payload: {
+            params: {
+              id,
+            },
+            callback: () => {
+              self.queryList(self.pageParams, self.searchParams);
+            },
+          },
+        });
+      },
+      onCancel() {
+        console.log('Cancel');
+      },
+    });
+  };
+
+  handleConfirmRefund = ({ id }) => {
+    const { dispatch } = this.props;
+    const self = this;
+    Modal.confirm({
+      title: '提示消息',
+      content: '确认退款!',
+      onOk() {
+        dispatch({
+          type: 'orderRefunds/confirmRefund',
+          payload: {
+            params: {
+              id,
+            },
+            callback: () => {
+              self.queryList(self.pageParams, self.searchParams);
+            },
+          },
+        });
+      },
+      onCancel() {
+        console.log('Cancel');
+      },
+    });
+  };
+
  render() {
-    const { orderRefunds } = this.props;
+    const { orderRefunds, loading } = this.props;
    const { list, totalCount, index, pageSize } = orderRefunds;

    const columns = [
+      {
+        title: '订单号',
+        dataIndex: 'orderId',
+        key: 'orderId',
+      },
      {
        title: '服务编号',
        dataIndex: 'serviceNumber',
@@ -111,12 +233,31 @@ class OrderRefundsList extends PureComponent {
      },
      {
        title: '操作',
-        render() {
-          return (
-            <div>
-              <a>同意</a>
-            </div>
-          );
+        render: row => {
+          const { status } = row;
+          let buttons;
+          if (status === 1) {
+            buttons = (
+              <div>
+                <a onClick={this.handleAgreeClick.bind(this, row)}>同意</a>
+                <Divider type="vertical" />
+                <a onClick={this.handleRefuse.bind(this, row)}>拒绝</a>
+              </div>
+            );
+          } else if (status === 2) {
+            buttons = (
+              <div>
+                <a onClick={this.handleConfirmReceipt.bind(this, row)}>确认收货</a>
+              </div>
+            );
+          } else if (status === 5) {
+            buttons = (
+              <div>
+                <a onClick={this.handleConfirmRefund.bind(this, row)}>退款</a>
+              </div>
+            );
+          }
+          return buttons;
        },
      },
    ];
@@ -137,11 +278,14 @@ class OrderRefundsList extends PureComponent {
          <Tabs defaultActiveKey={null} onChange={this.handleTabsChange}>
            <Tabs.TabPane tab="全部" key={null} />
            <Tabs.TabPane tab="待处理" key={1} />
-            <Tabs.TabPane tab="已处理" key={2} />
-            <Tabs.TabPane tab="已完成" key={4} />
+            <Tabs.TabPane tab="待收货" key={2} />
+            <Tabs.TabPane tab="已收货" key={5} />
+            <Tabs.TabPane tab="已完成" key={6} />
+            <Tabs.TabPane tab="已拒绝" key={3} />
          </Tabs>

          <Table
+            loading={loading}
            rowKey="id"
            dataSource={list}
            columns={columns}
--- a/admin-web/src/pages/OrderRefunds/TableSearch.js
+++ b/admin-web/src/pages/OrderRefunds/TableSearch.js
@@ -9,12 +9,13 @@ const FormItem = Form.Item;
 * @type {React.ComponentClass<RcBaseFormProps & Omit<FormComponentProps, keyof FormComponentProps>>}
 */
 const TableSearch = Form.create()(props => {
-  const { getFieldDecorator, form, handleSearch } = props.form;
+  const { handleSearch } = props;
+  const { getFieldDecorator, validateFields, form } = props.form;

  function onSubmit(e) {
    e.preventDefault();

-    form.validateFields((err, fields) => {
+    validateFields((err, fields) => {
      const buildTime = (fieldValue, key) => {
        const res = {};
        if (fieldValue && fieldValue.length >= 2) {
@@ -68,6 +69,11 @@ const TableSearch = Form.create()(props => {
            {getFieldDecorator('orderNo')(<Input placeholder="请输入订单号" />)}
          </FormItem>
        </Col>
+        <Col md={8} sm={24}>
+          <FormItem label="服务号">
+            {getFieldDecorator('serviceNumber')(<Input placeholder="请输入服务号" />)}
+          </FormItem>
+        </Col>
      </Row>

      <Row gutter={{ md: 8, lg: 24, xl: 48 }}>
--- a/admin-web/src/services/orderRefunds.js
+++ b/admin-web/src/services/orderRefunds.js
@@ -8,8 +8,26 @@ export async function list(params) {
  });
 }

-export async function orderPage(params) {
-  return request(`/order-api/admins/order/page?${stringify(params)}`, {
-    method: 'GET',
+export async function agree(params) {
+  return request(`/order-api/admins/order_return/agree?${stringify(params)}`, {
+    method: 'POST',
+  });
+}
+
+export async function refuse(params) {
+  return request(`/order-api/admins/order_return/refuse?${stringify(params)}`, {
+    method: 'POST',
+  });
+}
+
+export async function confirmReceipt(params) {
+  return request(`/order-api/admins/order_return/confirm_receipt?${stringify(params)}`, {
+    method: 'POST',
+  });
+}
+
+export async function confirmRefund(params) {
+  return request(`/order-api/admins/order_return/confirm_refund?${stringify(params)}`, {
+    method: 'POST',
  });
 }