Commit d6f215a5 authored by XieZhiXiong's avatar XieZhiXiong

chore: 添加 在线支付的商户订单号字段

parent f76d7b37
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: XieZhiXiong * @Author: XieZhiXiong
* @Date: 2021-08-05 10:28:06 * @Date: 2021-08-05 10:28:06
* @LastEditors: XieZhiXiong * @LastEditors: XieZhiXiong
* @LastEditTime: 2021-08-26 09:47:51 * @LastEditTime: 2021-08-26 18:16:30
* @Description: 地址选择 FormItem * @Description: 地址选择 FormItem
*/ */
import React, { useState, useEffect, useMemo, useRef } from 'react'; import React, { useState, useEffect, useMemo, useRef } from 'react';
...@@ -465,7 +465,6 @@ const AddressSelect: React.FC<IProps> = (props) => { ...@@ -465,7 +465,6 @@ const AddressSelect: React.FC<IProps> = (props) => {
}, [list]); }, [list]);
if (!editable && value) { if (!editable && value) {
console.log('list', list)
const current = list.find((item) => item.id === value); const current = list.find((item) => item.id === value);
const full = current ? `${current.name} ${current.fullAddress} ${current.phone}` : null; const full = current ? `${current.name} ${current.fullAddress} ${current.phone}` : null;
const isStr = typeof value === 'string'; const isStr = typeof value === 'string';
......
...@@ -390,32 +390,6 @@ class GoodsDrawer extends React.Component<GoodsDrawerProps, GoodsDrawerState> { ...@@ -390,32 +390,6 @@ class GoodsDrawer extends React.Component<GoodsDrawerProps, GoodsDrawerState> {
fullDate.push({ fullDate.push({
...product, ...product,
orderNo: product.orderNo, // 手动补全订单单号 orderNo: product.orderNo, // 手动补全订单单号
payList:
product.payInfoList ?
product.payInfoList.map(item => {
const {
payPrice,
payTime,
payWay,
channel,
payCode,
ruleConfigurationId,
...rest
} = item;
return {
payAmount: payPrice,
payTime: payTime ? moment(payTime).format('YYYY-MM-DD HH:mm:ss') : null,
payWay,
channel,
payWayName: PAYWAY[payWay],
channelName: PAY_CHANNEL[channel],
transactionPayId: payCode,
payRuleId: ruleConfigurationId,
...rest,
}
}) :
[]
,
}); });
} }
}); });
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: XieZhiXiong * @Author: XieZhiXiong
* @Date: 2020-11-05 17:36:45 * @Date: 2020-11-05 17:36:45
* @LastEditors: XieZhiXiong * @LastEditors: XieZhiXiong
* @LastEditTime: 2021-08-26 15:34:25 * @LastEditTime: 2021-08-26 19:54:01
* @Description: 查看退货数量与退款金额 抽屉 * @Description: 查看退货数量与退款金额 抽屉
*/ */
import React, { useEffect, useState } from 'react'; import React, { useEffect, useState } from 'react';
...@@ -20,8 +20,6 @@ import schema from './schema'; ...@@ -20,8 +20,6 @@ import schema from './schema';
import { createEffects } from './effects'; import { createEffects } from './effects';
import Stamp from '../Stamp'; import Stamp from '../Stamp';
import SteamerTicket from './components/SteamerTicket'; import SteamerTicket from './components/SteamerTicket';
import styles from './index.less';
import moment from 'moment';
const schemaAction = createAsyncFormActions(); const schemaAction = createAsyncFormActions();
const { const {
...@@ -222,7 +220,7 @@ const ReturnInfoDrawer: React.FC<ReturnInfoDrawerProps> = ({ ...@@ -222,7 +220,7 @@ const ReturnInfoDrawer: React.FC<ReturnInfoDrawerProps> = ({
payTime: item.payTime, payTime: item.payTime,
payRuleId: item.fundMode, payRuleId: item.fundMode,
externalState: 3, externalState: 3,
transactionPayId: '123', // 微信 或 其他第三方支付返回的 code,原路退款需要 transactionPayId: item.tradeNo, // 微信 或 其他第三方支付返回的 code,原路退款需要
})); }));
} }
} }
......
...@@ -690,7 +690,6 @@ const ReturnForm: React.FC<BillsFormProps> = ({ ...@@ -690,7 +690,6 @@ const ReturnForm: React.FC<BillsFormProps> = ({
extraData: { extraData: {
id: item.id, id: item.id,
returnReason: '', returnReason: '',
payList: item.payList,
taskTypeKey: item.processKey, taskTypeKey: item.processKey,
remaining: item.quantity - (item.returnCount || 0), // 可退货数量 remaining: item.quantity - (item.returnCount || 0), // 可退货数量
orderId: item.orderId, orderId: item.orderId,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment