|
@@ -17,16 +17,15 @@ const OrderList = React.createClass({
|
|
|
method: "get",
|
|
|
dataType: "json",
|
|
|
crossDomain: false,
|
|
|
- url: globalConfig.context + "/api/admin/member/selectMemberOrderBa",
|
|
|
+ url: globalConfig.context + "/api/admin/consultorder/list",
|
|
|
data: {
|
|
|
pageNo: pageNo || 1,
|
|
|
pageSize: this.state.pagination.pageSize,
|
|
|
- id: this.state.searchOrderNumber,
|
|
|
- nickname: this.state.searchName,
|
|
|
- mobile: this.state.searchAftNumber,
|
|
|
- orderState: this.state.searchOrderStatus,
|
|
|
- startTime: this.state.searchTime[0],
|
|
|
- endTime: this.state.searchTime[1]
|
|
|
+ number: this.state.searchNumber,
|
|
|
+ toNumber: this.state.searchToNumber,
|
|
|
+ id: this.state.searchId,
|
|
|
+ paymentId: this.state.searchPaymentId,
|
|
|
+ state: this.state.searchState
|
|
|
},
|
|
|
success: function (data) {
|
|
|
if (!data.data || !data.data.list) {
|
|
@@ -39,22 +38,21 @@ const OrderList = React.createClass({
|
|
|
this.state.data.push({
|
|
|
key: i,
|
|
|
id: thisdata.id,
|
|
|
- formattedOrderTime: thisdata.formattedOrderTime,
|
|
|
- formattedPaymentTime: thisdata.formattedPaymentTime,
|
|
|
- formattedValidTime: thisdata.formattedValidTime,
|
|
|
- expertName: thisdata.expertName,
|
|
|
- nickname: thisdata.nickname,
|
|
|
- mobile: thisdata.mobile,
|
|
|
+ price: thisdata.price,
|
|
|
orderState: thisdata.orderState,
|
|
|
orderTime: thisdata.orderTime,
|
|
|
- paymentId: thisdata.paymentId,
|
|
|
+ orderTimeFormatted: thisdata.orderTimeFormatted,
|
|
|
+ userId: thisdata.userId,
|
|
|
+ toUserId: thisdata.toUserId,
|
|
|
+ nickname: thisdata.nickname,
|
|
|
+ number: thisdata.number,
|
|
|
+ toNickname: thisdata.toUsername || thisdata.toNickname,
|
|
|
+ toNumber: thisdata.toNumber,
|
|
|
paymentTime: thisdata.paymentTime,
|
|
|
- paymentType: thisdata.paymentType,
|
|
|
+ paymentTimeFormatted: thisdata.paymentTimeFormatted,
|
|
|
paymentValue: thisdata.paymentValue,
|
|
|
- price: thisdata.price,
|
|
|
- userId: thisdata.userId,
|
|
|
- validMonth: thisdata.validMonth,
|
|
|
- validTime: thisdata.validTime,
|
|
|
+ paymentType: thisdata.paymentType,
|
|
|
+ paymentId: thisdata.paymentId,
|
|
|
});
|
|
|
};
|
|
|
this.state.pagination.current = data.data.pNo;
|
|
@@ -74,9 +72,12 @@ const OrderList = React.createClass({
|
|
|
getInitialState () {
|
|
|
return {
|
|
|
searchMore: true,
|
|
|
+ selectedRows: [],
|
|
|
+ selectedRowKeys: [],
|
|
|
data: [],
|
|
|
modalData: {},
|
|
|
visible: false,
|
|
|
+ delVisible: false,
|
|
|
searchTime: [],
|
|
|
loading: false,
|
|
|
pagination: {
|
|
@@ -97,36 +98,65 @@ const OrderList = React.createClass({
|
|
|
dataIndex: 'id',
|
|
|
key: 'id',
|
|
|
}, {
|
|
|
- title: '账号',
|
|
|
- dataIndex: 'mobile',
|
|
|
- key: 'mobile',
|
|
|
+ title: '用户编号',
|
|
|
+ dataIndex: 'number',
|
|
|
+ key: 'number',
|
|
|
}, {
|
|
|
- title: '认证名称',
|
|
|
+ title: '用户名称',
|
|
|
dataIndex: 'nickname',
|
|
|
- key: 'nickname',
|
|
|
+ key: 'nickname'
|
|
|
+ }, {
|
|
|
+ title: '专家编号',
|
|
|
+ dataIndex: 'toNumber',
|
|
|
+ key: 'toNumber',
|
|
|
}, {
|
|
|
title: '专家名称',
|
|
|
- dataIndex: 'expertName',
|
|
|
- key: 'expertName',
|
|
|
+ dataIndex: 'toNickname',
|
|
|
+ key: 'toNickname'
|
|
|
}, {
|
|
|
title: '订单状态',
|
|
|
dataIndex: 'orderState',
|
|
|
key: 'orderState',
|
|
|
- render: (text) => {
|
|
|
+ render: (text, record) => {
|
|
|
if (text == 1) {
|
|
|
return '已支付'
|
|
|
+ } else if (text == 9) {
|
|
|
+ return '已取消'
|
|
|
+ } else if (text == 2) {
|
|
|
+ return '支付中'
|
|
|
} else {
|
|
|
- return '未支付'
|
|
|
- };
|
|
|
+ let now = new Date();
|
|
|
+ let endTime = new Date(record.orderTime + 24 * 60 * 60 * 1000 * 15)
|
|
|
+ if (now > endTime) {
|
|
|
+ return '已失效'
|
|
|
+ } else {
|
|
|
+ return '未支付'
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}, {
|
|
|
title: '生成时间',
|
|
|
- dataIndex: 'formattedOrderTime',
|
|
|
- key: 'formattedOrderTime',
|
|
|
+ dataIndex: 'orderTimeFormatted',
|
|
|
+ key: 'orderTimeFormatted',
|
|
|
+ }, {
|
|
|
+ title: '支付金额',
|
|
|
+ dataIndex: 'price',
|
|
|
+ key: 'price',
|
|
|
+ render: (index, record) => {
|
|
|
+ if (record.paymentValue && record.paymentValue != 0) {
|
|
|
+ return record.paymentValue
|
|
|
+ } else {
|
|
|
+ return index
|
|
|
+ }
|
|
|
+ }
|
|
|
}, {
|
|
|
title: '支付时间',
|
|
|
- dataIndex: 'formattedPaymentTime',
|
|
|
- key: 'formattedPaymentTime',
|
|
|
+ dataIndex: 'paymentTimeFormatted',
|
|
|
+ key: 'paymentTimeFormatted',
|
|
|
+ }, {
|
|
|
+ title: '支付流水',
|
|
|
+ dataIndex: 'paymentId',
|
|
|
+ key: 'paymentId'
|
|
|
}
|
|
|
],
|
|
|
dataSource: []
|
|
@@ -139,15 +169,16 @@ const OrderList = React.createClass({
|
|
|
this.loadData();
|
|
|
},
|
|
|
reset () {
|
|
|
- this.state.searchOrderNumber = undefined;
|
|
|
- this.state.searchAftNumber = undefined;
|
|
|
- this.state.searchOrderStatus = undefined;
|
|
|
- this.state.searchName = undefined;
|
|
|
+ this.state.searchNumber = undefined;
|
|
|
+ this.state.searchToNumber = undefined;
|
|
|
+ this.state.searchId = undefined;
|
|
|
+ this.state.searchPaymentId = undefined;
|
|
|
+ this.state.searchState = undefined;
|
|
|
this.state.searchTime = [];
|
|
|
this.loadData();
|
|
|
},
|
|
|
submit () {
|
|
|
- if (this.state.modalData.paymentType == 1 && !this.state.modalData.formattedPaymentTime) {
|
|
|
+ if (this.state.modalData.paymentType == 1 && !this.state.modalData.paymentTimeFormatted) {
|
|
|
message.warning('状态为已支付时支付时间必填');
|
|
|
return
|
|
|
}
|
|
@@ -156,15 +187,12 @@ const OrderList = React.createClass({
|
|
|
method: "post",
|
|
|
dataType: "json",
|
|
|
crossDomain: false,
|
|
|
- url: globalConfig.context + "/api/admin/member/updateMemberOrder",
|
|
|
+ url: globalConfig.context + "/api/admin/consultorder/update",
|
|
|
data: {
|
|
|
id: this.state.modalData.id,
|
|
|
- userId: this.state.modalData.userId,
|
|
|
- memberRank: this.state.modalData.menberType,
|
|
|
- validMonth: this.state.modalData.validMonth,
|
|
|
paymentValue: this.state.modalData.paymentValue,
|
|
|
orderState: this.state.modalData.orderState,
|
|
|
- paymentTime: this.state.modalData.formattedPaymentTime,
|
|
|
+ paymentTime: this.state.modalData.paymentTimeFormatted,
|
|
|
paymentType: this.state.modalData.paymentType,
|
|
|
paymentId: this.state.modalData.paymentId
|
|
|
}
|
|
@@ -188,6 +216,44 @@ const OrderList = React.createClass({
|
|
|
this.state.modalData = theObj;
|
|
|
this.setState({ visible: true });
|
|
|
},
|
|
|
+ deleteRow () {
|
|
|
+ let deletedId;
|
|
|
+ for (let idx = 0; idx < this.state.selectedRows.length; idx++) {
|
|
|
+ let rowItem = this.state.selectedRows[idx];
|
|
|
+ if (rowItem.orderState !== 0) {
|
|
|
+ message.warning('订单状态不是未支付,无法删除!');
|
|
|
+ this.setState({ delVisible: false });
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (rowItem.id) {
|
|
|
+ deletedId = rowItem.id
|
|
|
+ };
|
|
|
+ };
|
|
|
+ this.setState({
|
|
|
+ selectedRowKeys: [],
|
|
|
+ loading: deletedId.length > 0
|
|
|
+ });
|
|
|
+ $.ajax({
|
|
|
+ method: "POST",
|
|
|
+ dataType: "json",
|
|
|
+ crossDomain: false,
|
|
|
+ url: globalConfig.context + "/api/admin/consultorder/del",
|
|
|
+ data: {
|
|
|
+ id: deletedId
|
|
|
+ }
|
|
|
+ }).done(function (data) {
|
|
|
+ if (!data.error.length) {
|
|
|
+ message.success('删除成功!');
|
|
|
+ } else {
|
|
|
+ message.warning(data.error[0].message);
|
|
|
+ };
|
|
|
+ this.setState({
|
|
|
+ loading: false,
|
|
|
+ delVisible: false
|
|
|
+ });
|
|
|
+ this.loadData();
|
|
|
+ }.bind(this));
|
|
|
+ },
|
|
|
render () {
|
|
|
const rowSelection = {
|
|
|
selectedRowKeys: this.state.selectedRowKeys,
|
|
@@ -207,18 +273,22 @@ const OrderList = React.createClass({
|
|
|
<span>专家咨询订单列表</span>
|
|
|
</div>
|
|
|
<div className="user-search">
|
|
|
- <Input placeholder="订单编号" value={this.state.searchOrderNumber}
|
|
|
- onChange={(e) => { this.setState({ searchOrderNumber: e.target.value }); }} />
|
|
|
- <Input placeholder="用户账号" value={this.state.searchAftNumber}
|
|
|
- onChange={(e) => { this.setState({ searchAftNumber: e.target.value }); }} />
|
|
|
- <Input placeholder="认证名称" value={this.state.searchName}
|
|
|
- onChange={(e) => { this.setState({ searchName: e.target.value }); }} />
|
|
|
- <Select placeholder="订单状态" value={this.state.searchOrderStatus} style={{ width: 120 }}
|
|
|
- onChange={(e) => { this.setState({ searchOrderStatus: e }) }}>
|
|
|
+ <Input placeholder="会员编号" value={this.state.searchNumber}
|
|
|
+ onChange={(e) => { this.setState({ searchNumber: e.target.value }); }} />
|
|
|
+ <Input placeholder="专家编号" value={this.state.searchToNumber}
|
|
|
+ onChange={(e) => { this.setState({ searchToNumber: e.target.value }); }} />
|
|
|
+ <Input placeholder="订单编号" value={this.state.searchId}
|
|
|
+ onChange={(e) => { this.setState({ searchId: e.target.value }); }} />
|
|
|
+ <Select placeholder="订单状态" value={this.state.searchState} style={{ width: 120 }}
|
|
|
+ onChange={(e) => { this.setState({ searchState: e }) }}>
|
|
|
<Option value="0">未付款</Option>
|
|
|
<Option value="1">已付款</Option>
|
|
|
+ <Option value="9">已取消</Option>
|
|
|
+ <Option value="10">已失效</Option>
|
|
|
</Select>
|
|
|
- <div className="search-div">
|
|
|
+ <Input placeholder="支付流水" value={this.state.searchPaymentId}
|
|
|
+ onChange={(e) => { this.setState({ searchPaymentId: e.target.value }); }} />
|
|
|
+ <div className="search-div" style={{ display: "none" }}>
|
|
|
<span>订单生成时间:</span>
|
|
|
<RangePicker
|
|
|
allowClear={false}
|
|
@@ -230,7 +300,7 @@ const OrderList = React.createClass({
|
|
|
<Button onClick={this.reset}>重置</Button>
|
|
|
<Button style={{ background: "#3fcf9e", border: "none", color: "#fff" }}
|
|
|
disabled={!hasSelected}
|
|
|
- onClick={this.delectRow}>删除<Icon type="minus" /></Button>
|
|
|
+ onClick={() => { this.setState({ delVisible: true }) }}>删除<Icon type="minus" /></Button>
|
|
|
</div>
|
|
|
<div className="patent-table">
|
|
|
<Spin spinning={this.state.loading}>
|
|
@@ -250,12 +320,6 @@ const OrderList = React.createClass({
|
|
|
<Spin spinning={this.state.loading}>
|
|
|
<div className="clearfix">
|
|
|
<div className="modal-box">
|
|
|
- <span className="modal-box-title">专家名称</span>
|
|
|
- <div className="modal-box-detail">
|
|
|
- <span>{this.state.modalData.expertName}</span>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- <div className="modal-box">
|
|
|
<span className="modal-box-title">订单金额</span>
|
|
|
<div className="modal-box-detail" style={{ width: '160px' }}>
|
|
|
<span>{this.state.modalData.price}</span>
|
|
@@ -306,9 +370,9 @@ const OrderList = React.createClass({
|
|
|
showTime
|
|
|
format="YYYY-MM-DD HH:mm:ss"
|
|
|
placeholder="选择支付时间"
|
|
|
- value={this.state.modalData.formattedPaymentTime ? moment(this.state.modalData.formattedPaymentTime, "YYYY-MM-DD HH:mm:ss") : undefined}
|
|
|
+ value={this.state.modalData.paymentTimeFormatted ? moment(this.state.modalData.paymentTimeFormatted, "YYYY-MM-DD HH:mm:ss") : undefined}
|
|
|
onChange={(t, str) => {
|
|
|
- this.state.modalData.formattedPaymentTime = str;
|
|
|
+ this.state.modalData.paymentTimeFormatted = str;
|
|
|
this.setState({ modalData: this.state.modalData });
|
|
|
}} />
|
|
|
</div>
|
|
@@ -320,6 +384,23 @@ const OrderList = React.createClass({
|
|
|
</div>
|
|
|
</Spin>
|
|
|
</Modal>
|
|
|
+ <Modal title="删除确认" width={600} className="activity-modal"
|
|
|
+ visible={this.state.delVisible}
|
|
|
+ maskClosable={false}
|
|
|
+ footer={null}
|
|
|
+ onCancel={() => { this.setState({ delVisible: false }) }} >
|
|
|
+ <Spin spinning={this.state.loading}>
|
|
|
+ <div className="clearfix">
|
|
|
+ <div className="modal-box">
|
|
|
+ <span>是否确定删除这条记录?删除后数据不可恢复!</span>
|
|
|
+ </div>
|
|
|
+ <div className="modal-box" >
|
|
|
+ <Button type="primary" onClick={this.deleteRow}>提交</Button>
|
|
|
+ <Button type="ghost" onClick={() => { this.setState({ delVisible: false }) }}>取消</Button>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </Spin>
|
|
|
+ </Modal>
|
|
|
</div >
|
|
|
);
|
|
|
}
|