Selaa lähdekoodia

* 资金管理代码提交

顾绍勇 4 vuotta sitten
vanhempi
commit
e2f6defada

+ 6
- 0
config/routes.js Näytä tiedosto

88
                 name: '消费订单',
88
                 name: '消费订单',
89
                 component: './fundManagement/ConsumeOrder',
89
                 component: './fundManagement/ConsumeOrder',
90
               },
90
               },
91
+              {
92
+                path: '/fundManagement/ConsumeOrderDetail',
93
+                name: '订单详情',
94
+                hideInMenu: true,
95
+                component: './fundManagement/ConsumeOrderDetail',
96
+              },
91
               {
97
               {
92
                 path: '/fundManagement/RefundOrder',
98
                 path: '/fundManagement/RefundOrder',
93
                 name: '退款订单',
99
                 name: '退款订单',

+ 43
- 19
src/pages/fundManagement/ConsumeOrder.jsx Näytä tiedosto

78
             align: 'center',
78
             align: 'center',
79
         },
79
         },
80
         {
80
         {
81
-            title: '消费组织',
81
+            title: '公司',
82
             dataIndex: 'miniAppName',
82
             dataIndex: 'miniAppName',
83
             key: 'miniAppName',
83
             key: 'miniAppName',
84
             align: 'center',
84
             align: 'center',
85
         },
85
         },
86
         {
86
         {
87
-            title: '消费金额',
87
+            title: '金额',
88
             dataIndex: 'amount',
88
             dataIndex: 'amount',
89
             key: 'amount',
89
             key: 'amount',
90
             align: 'center',
90
             align: 'center',
97
             align: 'center',
97
             align: 'center',
98
             render: (x, row) => <><span>{row.consumeType == 'RedPacket' ? '红包' : ''}</span></>
98
             render: (x, row) => <><span>{row.consumeType == 'RedPacket' ? '红包' : ''}</span></>
99
         },
99
         },
100
+        // {
101
+        //     title: '活动名称',
102
+        //     dataIndex: 'activityName',
103
+        //     key: 'activityName',
104
+        //     align: 'center',
105
+        // },
100
         {
106
         {
101
-            title: '活动名称',
102
-            dataIndex: 'activityName',
103
-            key: 'activityName',
104
-            align: 'center',
105
-        },
106
-        {
107
-            title: '消费下单时间',
107
+            title: '下单时间',
108
             dataIndex: 'createDate',
108
             dataIndex: 'createDate',
109
             key: 'createDate',
109
             key: 'createDate',
110
             align: 'center',
110
             align: 'center',
111
             render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
111
             render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
112
         },
112
         },
113
-        {
114
-            title: '接收人手机号',
115
-            dataIndex: 'phone',
116
-            key: 'phone',
117
-            align: 'center',
118
-            render: (x, row) => <><span className={styles.blue} onClick={() => Info(row)}>{row.phone || '13160056114'}</span></>
119
-        },
113
+        // {
114
+        //     title: '接收人手机号',
115
+        //     dataIndex: 'phone',
116
+        //     key: 'phone',
117
+        //     align: 'center',
118
+        //     render: (x, row) => <><span className={styles.blue} onClick={() => Info(row)}>{row.phone || '13160056114'}</span></>
119
+        // },
120
         {
120
         {
121
             title: '消费状态',
121
             title: '消费状态',
122
             dataIndex: 'tradingStatus',
122
             dataIndex: 'tradingStatus',
124
             align: 'center',
124
             align: 'center',
125
             render: (x, row) => <><span>{row.tradingStatus == 'success' ? '成功' : '失败'}</span></>
125
             render: (x, row) => <><span>{row.tradingStatus == 'success' ? '成功' : '失败'}</span></>
126
         },
126
         },
127
+        {
128
+            title: '操作',
129
+            dataIndex: 'handle',
130
+            key: 'handle',
131
+            align: 'center',
132
+            render: (x, row) => (
133
+                <>
134
+                    <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEdit(row.tradeNo, row.orgId, row.consumeType)}>
135
+                        查看详情
136
+                    </span>
137
+                </>
138
+            ),
139
+        },
127
 
140
 
128
     ];
141
     ];
129
     const Info = (row) => {
142
     const Info = (row) => {
133
         })
146
         })
134
     }
147
     }
135
 
148
 
149
+    const toEdit = (tradeNo, orgId, consumeType) => () => {
150
+        router.push({
151
+            pathname: '/fundManagement/ConsumeOrderDetail',
152
+            query: {
153
+                tradeNo,
154
+                orgId,
155
+                consumeType
156
+            },
157
+        });
158
+    }
159
+
136
     function handleReset() {
160
     function handleReset() {
137
         props.form.resetFields();
161
         props.form.resetFields();
138
         getList({ pageNum: 1, pageSize: 10, orderType: 'RedPacket' })
162
         getList({ pageNum: 1, pageSize: 10, orderType: 'RedPacket' })
163
     }
187
     }
164
     const { getFieldDecorator } = props.form
188
     const { getFieldDecorator } = props.form
165
 
189
 
166
-    const lastColumns = props.organize == 'hidden' ? columns.filter(x => x.title != '消费组织') : columns
190
+    const lastColumns = props.organize == 'hidden' ? columns.filter(x => x.title != '公司') : columns
167
     return (
191
     return (
168
 
192
 
169
         <>
193
         <>
196
                         {getFieldDecorator('miniAppName')(
220
                         {getFieldDecorator('miniAppName')(
197
                             <Input
221
                             <Input
198
                                 prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
222
                                 prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
199
-                                placeholder="消费组织"
223
+                                placeholder="公司"
200
                             />,
224
                             />,
201
                         )}
225
                         )}
202
                     </Form.Item>
226
                     </Form.Item>
203
                 }
227
                 }
204
                 <Form.Item>
228
                 <Form.Item>
205
-                    <span style={{ marginRight: '10px' }}>消费时间段:</span>
229
+                    <span style={{ marginRight: '10px' }}>下单时间段:</span>
206
                     {getFieldDecorator('LocalDate')(
230
                     {getFieldDecorator('LocalDate')(
207
                         <RangePicker placeholder={['开始时间', '结束时间']} />
231
                         <RangePicker placeholder={['开始时间', '结束时间']} />
208
                     )}
232
                     )}

+ 5
- 5
src/pages/fundManagement/RechargeOrder.jsx Näytä tiedosto

81
             align: 'center',
81
             align: 'center',
82
         },
82
         },
83
         {
83
         {
84
-            title: '充值组织',
84
+            title: '公司',
85
             dataIndex: 'miniAppName',
85
             dataIndex: 'miniAppName',
86
             key: 'miniAppName',
86
             key: 'miniAppName',
87
             align: 'center',
87
             align: 'center',
88
         },
88
         },
89
         {
89
         {
90
-            title: '充值金额',
90
+            title: '金额',
91
             dataIndex: 'amount',
91
             dataIndex: 'amount',
92
             key: 'amount',
92
             key: 'amount',
93
             align: 'center',
93
             align: 'center',
172
     }
172
     }
173
     const { getFieldDecorator } = props.form
173
     const { getFieldDecorator } = props.form
174
 
174
 
175
-    const lastColumns = props.organize == 'hidden' ? columns.filter(x => x.title != '充值组织') : columns
175
+    const lastColumns = props.organize == 'hidden' ? columns.filter(x => x.title != '公司') : columns
176
 
176
 
177
     return (
177
     return (
178
 
178
 
193
                         {getFieldDecorator('miniAppName')(
193
                         {getFieldDecorator('miniAppName')(
194
                             <Input
194
                             <Input
195
                                 prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
195
                                 prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
196
-                                placeholder="充值组织"
196
+                                placeholder="公司"
197
                             />,
197
                             />,
198
                         )}
198
                         )}
199
                     </Form.Item>
199
                     </Form.Item>
200
                 }
200
                 }
201
 
201
 
202
                 <Form.Item>
202
                 <Form.Item>
203
-                    <span style={{ marginRight: '10px' }}>支付时间段:</span>
203
+                    <span style={{ marginRight: '10px' }}>下单时间段:</span>
204
                     {getFieldDecorator('LocalDate')(
204
                     {getFieldDecorator('LocalDate')(
205
                         <RangePicker placeholder={['开始时间', '结束时间']} />
205
                         <RangePicker placeholder={['开始时间', '结束时间']} />
206
                     )}
206
                     )}

+ 6
- 6
src/pages/fundManagement/RefundOrder.jsx Näytä tiedosto

88
             align: 'center',
88
             align: 'center',
89
         },
89
         },
90
         {
90
         {
91
-            title: '退款组织',
91
+            title: '公司',
92
             dataIndex: 'miniAppName',
92
             dataIndex: 'miniAppName',
93
             key: 'miniAppName',
93
             key: 'miniAppName',
94
             align: 'center',
94
             align: 'center',
95
         },
95
         },
96
         {
96
         {
97
-            title: '退款金额',
97
+            title: '金额',
98
             dataIndex: 'amount',
98
             dataIndex: 'amount',
99
             key: 'amount',
99
             key: 'amount',
100
             align: 'center',
100
             align: 'center',
101
             render: (x, row) => <span>{regFenToYuan(x)}</span>
101
             render: (x, row) => <span>{regFenToYuan(x)}</span>
102
         },
102
         },
103
         {
103
         {
104
-            title: '退款创建时间',
104
+            title: '下单时间',
105
             dataIndex: 'createDate',
105
             dataIndex: 'createDate',
106
             key: 'createDate',
106
             key: 'createDate',
107
             align: 'center',
107
             align: 'center',
251
     }
251
     }
252
 
252
 
253
     const { getFieldDecorator } = props.form
253
     const { getFieldDecorator } = props.form
254
-    const lastColumns = props.organize == 'hidden' ? columns.filter(x => x.title != '退款组织') : columns
254
+    const lastColumns = props.organize == 'hidden' ? columns.filter(x => x.title != '公司') : columns
255
     return (
255
     return (
256
 
256
 
257
         <>
257
         <>
305
                         {getFieldDecorator('miniAppName')(
305
                         {getFieldDecorator('miniAppName')(
306
                             <Input
306
                             <Input
307
                                 prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
307
                                 prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
308
-                                placeholder="退款组织"
308
+                                placeholder="公司"
309
                             />,
309
                             />,
310
                         )}
310
                         )}
311
                     </Form.Item>
311
                     </Form.Item>
322
                     )}
322
                     )}
323
                 </Form.Item>
323
                 </Form.Item>
324
                 <Form.Item>
324
                 <Form.Item>
325
-                    <span style={{ marginRight: '10px' }}>退款时间段:</span>
325
+                    <span style={{ marginRight: '10px' }}>下单时间段:</span>
326
                     {getFieldDecorator('LocalDate')(
326
                     {getFieldDecorator('LocalDate')(
327
                         <RangePicker placeholder={['开始时间', '结束时间']} />,
327
                         <RangePicker placeholder={['开始时间', '结束时间']} />,
328
                     )}
328
                     )}

+ 5
- 0
src/services/apis.js Näytä tiedosto

213
       method: 'GET',
213
       method: 'GET',
214
       action: 'channel',
214
       action: 'channel',
215
     },
215
     },
216
+    getOrderDetail: {
217
+      url: `${prefix}/taOrgOrder/getOrderDetailByTradeNo`,
218
+      method: 'GET',
219
+      action: 'channel',
220
+    },
216
     refund: {
221
     refund: {
217
       url: `${prefix}/taOrgOrder/refund/:id`,
222
       url: `${prefix}/taOrgOrder/refund/:id`,
218
       method: 'PUT',
223
       method: 'PUT',