Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager into dev

src/pages/funds/accountfunds/components/Basic.jsx

@@ -55,7 +55,6 @@ function Basic(props) {
                 setvisiblea(false)
             }).catch(err => {
                 console.log(err)
-                message.err('申请退款失败')
             })
         }
         // setConfirmLoading(true)
@@ -133,7 +132,7 @@ function Basic(props) {
                     <div className={Styles.redHeaderBottom}>对账请在消费订单中查看消费状态为“成功”的消费记录</div>
                 </div>
                 <div className={Styles.redHeader}>
-                    <div className={Styles.redHeaderTop}><div className={Styles.redHeaderTopText}>已退款额/元</div><div className={Styles.redHeaderTopNum}>{data.totalRechargeAmounttotalRefund / 100 || 0}</div></div>
+                    <div className={Styles.redHeaderTop}><div className={Styles.redHeaderTopText}>已退款额/元</div><div className={Styles.redHeaderTopNum}>{data.totalRefund / 100 || 0}</div></div>
                     <div className={Styles.redHeaderBottom}>对账请在退款订单中查看退款状态为“已退款”的退款记录</div>
                 </div>
 

src/pages/funds/accountfunds/components/ConsumerOrder.jsx

@@ -22,12 +22,13 @@ function RechargeOrder(props) {
 
     const getList = params => {
         if (params.startTime) {
-            params.startTime = `${moment(params.startTime).format('YYYY-MM-DDTHH:mm:ss')}Z`;
+            params.startTime = `${moment(params.startTime).format('YYYY-MM-DDT00:00:00')}Z`;
         }
         if (params.endTime) {
-            params.endTime = `${moment(params.endTime).format('YYYY-MM-DDTHH:mm:ss')}Z`;
+            params.endTime = `${moment(params.endTime).format('YYYY-MM-DDT23:59:59')}Z`;
         }
-        request({ ...apis.funds.consumeOrderByConditionlist, params: { ...params, consumeType: 'redPackage' } }).then(data => {
+        console.log("请求数据", params)
+        request({ ...apis.funds.consumeOrderByConditionlist, params: { ...params, consumeType: 'RedPacket' } }).then(data => {
             setData(data)
         })
     }
@@ -38,7 +39,7 @@ function RechargeOrder(props) {
             if (!err) {
                 // eslint-disable-next-line no-console
                 console.log('提交数据: ', values)
-                getList({ pageNum: 1, pageSize: 10 });
+                getList({ pageNum: 1, pageSize: 10, ...values });
             }
         });
     }
@@ -80,10 +81,10 @@ function RechargeOrder(props) {
         },
         {
             title: '消费方式',
-            dataIndex: 'targetName',
-            key: 'targetName',
+            dataIndex: 'itemType',
+            key: 'itemType',
             align: 'center',
-            render: () => <><span>红包</span></>,
+            render: (x, row) => <><span>{`${row.itemType == 'RedPacket' ? '红包' : ''}`}</span></>,
         },
         {
             title: '活动名称',
@@ -107,10 +108,10 @@ function RechargeOrder(props) {
         },
         {
             title: '消费状态',
-            dataIndex: 'auditStatus',
-            key: 'auditStatus',
+            dataIndex: 'tradingStatus',
+            key: 'tradingStatus',
             align: 'center',
-            render: (x, row) => <><span>{x === 1 ? '成功' : '失败'}</span></>,
+            render: (x, row) => <><span>{row.tradingStatus === 'success' ? '成功' : '失败'}</span></>,
         },
     ]
 
@@ -129,8 +130,14 @@ function RechargeOrder(props) {
     }
 
     const exportReport = () => {
-
-        request({ ...apis.funds.exportConsumeOrderByCondition, responseType: 'blob', params: { ...props.form.getFieldsValue(), consumeType: 'redPackage' } }).then(data => {
+        const requestParams = props.form.getFieldsValue();
+        if (requestParams.startTime) {
+            requestParams.startTime = `${moment(requestParams.startTime).format('YYYY-MM-DDT00:00:00')}Z`;
+        }
+        if (requestParams.endTime) {
+            requestParams.endTime = `${moment(requestParams.endTime).format('YYYY-MM-DDT23:59:59')}Z`;
+        }
+        request({ ...apis.funds.exportConsumeOrderByCondition, responseType: 'blob', params: { ...requestParams, consumeType: 'redPackage' } }).then(data => {
             download(data)
         }).catch()
     }
@@ -159,19 +166,19 @@ function RechargeOrder(props) {
                     )}
                 </Form.Item>
                 <Form.Item>
-                    {getFieldDecorator('auditStatus')(
+                    {getFieldDecorator('tradingStatus')(
                         <Select style={{ width: '180px' }} placeholder="消费状态">
                             <Option value="">全部</Option>
-                            <Option value="1">成功</Option>
-                            <Option value="0">失败</Option>
+                            <Option value="success">成功</Option>
+                            <Option value="fail">失败</Option>
                         </Select>,
                     )}
                 </Form.Item>
                 <Form.Item>
                     {getFieldDecorator('consumeType')(
-                        <Select style={{ width: '180px' }} placeholder="消费状态">
+                        <Select style={{ width: '180px' }} placeholder="消费方式">
                             <Option value="">全部</Option>
-                            <Option value="redPackage">红包</Option>
+                            <Option value="RedPacket">红包</Option>
                         </Select>,
                     )}
                 </Form.Item>

src/pages/funds/accountfunds/components/RechargeOrder.jsx

@@ -29,10 +29,10 @@ function RechargeOrder(props) {
 
     const getList = params => {
         if (params.payStartTime) {
-            params.payStartTime = `${moment(params.payStartTime).format('YYYY-MM-DDTHH:mm:ss')}Z`;
+            params.payStartTime = `${moment(params.payStartTime).format('YYYY-MM-DDT00:00:00')}Z`;
         }
         if (params.payEndTime) {
-            params.payEndTime = `${moment(params.payEndTime).format('YYYY-MM-DDTHH:mm:ss')}Z`;
+            params.payEndTime = `${moment(params.payEndTime).format('YYYY-MM-DDT23:59:59')}Z`;
         }
 
         request({ ...apis.funds.czlist, params: { ...params } }).then(data => {
@@ -146,10 +146,10 @@ function RechargeOrder(props) {
     const exportReport = () => {
         const requestParams = props.form.getFieldsValue();
         if (requestParams.payStartTime) {
-            requestParams.payStartTime = `${moment(requestParams.payStartTime).format('YYYY-MM-DDTHH:mm:ss')}Z`;
+            requestParams.payStartTime = `${moment(requestParams.payStartTime).format('YYYY-MM-DDT00:00:00')}Z`;
         }
         if (requestParams.payEndTime) {
-            requestParams.payEndTime = `${moment(requestParams.payEndTime).format('YYYY-MM-DDTHH:mm:ss')}Z`;
+            requestParams.payEndTime = `${moment(requestParams.payEndTime).format('YYYY-MM-DDT23:59:59')}Z`;
         }
         request({ ...apis.funds.czexportList, responseType: 'blob', params: { ...requestParams } }).then(data => {
             download(data)

src/pages/funds/accountfunds/components/RefundOrder.jsx

@@ -25,10 +25,10 @@ function RechargeOrder(props) {
 
     const getList = params => {
         if (params.refundStartTime) {
-            params.refundStartTime = `${moment(params.refundStartTime).format('YYYY-MM-DDTHH:mm:ss')}Z`;
+            params.refundStartTime = `${moment(params.refundStartTime).format('YYYY-MM-DDT00:00:00')}Z`;
         }
         if (params.refundEndTime) {
-            params.refundEndTime = `${moment(params.refundEndTime).format('YYYY-MM-DDTHH:mm:ss')}Z`;
+            params.refundEndTime = `${moment(params.refundEndTime).format('YYYY-MM-DDT23:59:59')}Z`;
         }
         request({ ...apis.funds.refundlist, params: { ...params } }).then(data => {
             setData(data)
@@ -84,6 +84,7 @@ function RechargeOrder(props) {
             dataIndex: 'amount',
             key: 'amount',
             align: 'center',
+        render: (x, row) => <><span>{`${row.amount/100}`}</span></>,
         },
         {
             title: '退款创建时间',
@@ -97,6 +98,7 @@ function RechargeOrder(props) {
             dataIndex: 'auditStatus',
             key: 'auditStatus',
             align: 'center',
+            render: (x, row) => <><span>{row.auditStatus == 'checking' ? '已申请' : (row.auditStatus == 'agree' ? '已退款' : '已驳回')}</span></>,
         },
         {
             title: '驳回原因',
@@ -144,11 +146,11 @@ function RechargeOrder(props) {
 
     const exportReport = () => {
         const requestParams = props.form.getFieldsValue();
-        if (params.refundStartTime) {
-            params.refundStartTime = `${moment(params.refundStartTime).format('YYYY-MM-DDTHH:mm:ss')}Z`;
+        if (requestParams.refundStartTime) {
+            requestParams.refundStartTime = `${moment(requestParams.refundStartTime).format('YYYY-MM-DDT00:00:00')}Z`;
         }
-        if (params.refundEndTime) {
-            params.refundEndTime = `${moment(params.refundEndTime).format('YYYY-MM-DDTHH:mm:ss')}Z`;
+        if (requestParams.refundEndTime) {
+            requestParams.refundEndTime = `${moment(requestParams.refundEndTime).format('YYYY-MM-DDT23:59:59')}Z`;
         }
         request({ ...apis.funds.refundexportList, responseType: 'blob', params: { ...requestParams } }).then(data => {
             download(data)
@@ -182,9 +184,9 @@ function RechargeOrder(props) {
                     {getFieldDecorator('auditStatus')(
                         <Select style={{ width: '180px' }} placeholder="退款状态">
                             <Option value="">全部</Option>
-                            <Option value="1">已申请</Option>
-                            <Option value="2">已驳回</Option>
-                            <Option value="3">已退款</Option>
+                            <Option value="checking">已申请</Option>
+                            <Option value="agree">已驳回</Option>
+                            <Option value="unagree">已退款</Option>
                         </Select>,
                     )}
                 </Form.Item>