🎈 perf(1000732【收银台加密优化】):
This commit is contained in:
parent
4302a8fa67
commit
46b80f0700
@ -1,51 +1,50 @@
|
||||
import { Text, View } from "@tarojs/components";
|
||||
import { memo, useCallback, useEffect, useMemo, useRef, useState } from "react";
|
||||
import AmountShow from "../amountShow";
|
||||
import classnames from "classnames";
|
||||
import { Text, View } from '@tarojs/components'
|
||||
import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react'
|
||||
import AmountShow from '../amountShow'
|
||||
import classnames from 'classnames'
|
||||
import styles from './index.module.scss'
|
||||
|
||||
import MCheckbox from "@/components/checkbox";
|
||||
import Popup from "@/components/popup";
|
||||
import OfflinePay from "../offlinePay";
|
||||
import ScanPay from "../scanPay";
|
||||
import { GetOrderPayApi, SubmitOrderPayApi, GetPrepayOrderPayApi, SubmitPrepayOrderPayApi } from "@/api/orderPay";
|
||||
import { formatPriceDiv } from "@/common/fotmat";
|
||||
import {alert} from "@/common/common"
|
||||
import { ORDER_STATUS, PAYMENT_METHOD, SUBSCRIPTION_MESSAGE_SCENE } from "@/common/enum";
|
||||
import { UseSubscriptionMessage } from "@/use/useCommon";
|
||||
import { throttle } from "@/common/util";
|
||||
import MCheckbox from '@/components/checkbox'
|
||||
import Popup from '@/components/popup'
|
||||
import OfflinePay from '../offlinePay'
|
||||
import ScanPay from '../scanPay'
|
||||
import { GetOrderPayApi, SubmitOrderPayApi, GetPrepayOrderPayApi, SubmitPrepayOrderPayApi } from '@/api/orderPay'
|
||||
import { formatPriceDiv } from '@/common/fotmat'
|
||||
import { alert } from '@/common/common'
|
||||
import { ORDER_STATUS, PAYMENT_METHOD, SUBSCRIPTION_MESSAGE_SCENE } from '@/common/enum'
|
||||
import { UseSubscriptionMessage } from '@/use/useCommon'
|
||||
import { throttle } from '@/common/util'
|
||||
|
||||
type Param = {
|
||||
show?: true|false,
|
||||
onClose?: () => void,
|
||||
onSubmitSuccess?: () => void, //支付成功
|
||||
orderInfo?: OrderInfo,
|
||||
show?: true | false
|
||||
onClose?: () => void
|
||||
onSubmitSuccess?: () => void //支付成功
|
||||
orderInfo?: OrderInfo
|
||||
}
|
||||
|
||||
type OrderInfo = {
|
||||
id?: number, //销售单id
|
||||
should_collect_order_id?: number, //应付单id
|
||||
pre_collect_order_id?: number, //预付单id
|
||||
status?: number, //订单状态
|
||||
payment_method?: number, //支付方式
|
||||
sale_mode?: number, //订单类型 0：大货 1剪板 2散剪
|
||||
actual_weight?: number, //实际重量
|
||||
estimate_weight?: number, //预估重量
|
||||
id?: number //销售单id
|
||||
should_collect_order_id?: number //应付单id
|
||||
pre_collect_order_id?: number //预付单id
|
||||
status?: number //订单状态
|
||||
payment_method?: number //支付方式
|
||||
sale_mode?: number //订单类型 0：大货 1剪板 2散剪
|
||||
actual_weight?: number //实际重量
|
||||
estimate_weight?: number //预估重量
|
||||
[val: string]: any
|
||||
}
|
||||
|
||||
type PayStatus = 1 | 2 | 3 | 4 | 5 | null //1:预存款， 2:账期，3：线下汇款， 4：扫码支付, 5:货到付款
|
||||
export default memo(({ show = false, onClose, orderInfo, onSubmitSuccess }: Param) => {
|
||||
|
||||
//支付方式枚举
|
||||
const { PaymentMethodPreDeposit, PaymentMethodAccountPeriod, PaymentMethodCashOnDelivery } = PAYMENT_METHOD
|
||||
//订单状态枚举
|
||||
const { SaleorderstatusWaitingPrePayment } = ORDER_STATUS
|
||||
|
||||
//提交参数
|
||||
const [submitData, setSubmitData] = useState<{id:number, payment_method: PayStatus}>({
|
||||
const [submitData, setSubmitData] = useState<{ id: number; payment_method: PayStatus }>({
|
||||
id: 0,
|
||||
payment_method: null
|
||||
payment_method: null,
|
||||
})
|
||||
|
||||
//线下付款
|
||||
@ -116,7 +115,10 @@ export default memo(({show = false, onClose, orderInfo, onSubmitSuccess}:Param)
|
||||
return false
|
||||
}
|
||||
//账期支付，或预付款并且不是剪板才会订阅
|
||||
if((submitData.payment_method == PaymentMethodAccountPeriod.value || orderInfo?.status == SaleorderstatusWaitingPrePayment.value)&& orderInfo?.sale_mode != 1) {
|
||||
if (
|
||||
(submitData.payment_method == PaymentMethodAccountPeriod.value || orderInfo?.status == SaleorderstatusWaitingPrePayment.value) &&
|
||||
orderInfo?.sale_mode != 1
|
||||
) {
|
||||
await openSubscriptionMessage({ orderId: orderInfo?.id, scenes: ToPay.value })
|
||||
}
|
||||
alert.showLoading('正在支付')
|
||||
@ -139,7 +141,9 @@ export default memo(({show = false, onClose, orderInfo, onSubmitSuccess}:Param)
|
||||
const advance_payment = useMemo(() => {
|
||||
const price = payInfo?.should_collect_money - payInfo?.amount_paid
|
||||
return (
|
||||
<View className={styles.payment_list_item_left_price}>{(payInfo?.advance_deposit_balance < price)&&'余额不足，' }剩余 ¥{formatPriceDiv(payInfo?.advance_deposit_balance)}</View>
|
||||
<View className={styles.payment_list_item_left_price}>
|
||||
{payInfo?.advance_deposit_balance < price && '余额不足，'}剩余 ¥{formatPriceDiv(payInfo?.advance_deposit_balance)}
|
||||
</View>
|
||||
)
|
||||
}, [payInfo])
|
||||
|
||||
@ -160,14 +164,15 @@ export default memo(({show = false, onClose, orderInfo, onSubmitSuccess}:Param)
|
||||
const account_peyment = useMemo(() => {
|
||||
const price = payInfo?.should_collect_money - payInfo?.amount_paid
|
||||
return (
|
||||
<View className={styles.payment_list_item_left_price}>{(payInfo?.account_period_credit_available_line < price)&&'额度不足, '}剩余 ¥{formatPriceDiv(payInfo?.account_period_credit_available_line)}</View>
|
||||
<View className={styles.payment_list_item_left_price}>
|
||||
{payInfo?.account_period_credit_available_line < price && '额度不足, '}剩余 ¥{formatPriceDiv(payInfo?.account_period_credit_available_line)}
|
||||
</View>
|
||||
)
|
||||
}, [payInfo])
|
||||
|
||||
//在线支付所需数据
|
||||
const onlinePayData = useMemo(() => {
|
||||
return {...orderInfo, offline_remittance_information: payInfo?.offline_remittance_information}
|
||||
|
||||
return { ...orderInfo, ...payInfo }
|
||||
}, [orderInfo, payInfo])
|
||||
|
||||
return (
|
||||
@ -179,7 +184,7 @@ export default memo(({show = false, onClose, orderInfo, onSubmitSuccess}:Param)
|
||||
<View className={styles.amount}>
|
||||
<AmountShow status={2} number={formatPriceDiv(payInfo?.amount_to_be_paid) as number} />
|
||||
</View>
|
||||
{(payInfo?.delivery_payment_name)&&<View className={styles.playMode}>已使用{payInfo?.delivery_payment_name}方式付款</View>}
|
||||
{payInfo?.delivery_payment_name && <View className={styles.playMode}>已使用{payInfo?.delivery_payment_name}方式付款</View>}
|
||||
<View className={styles.payment_list}>
|
||||
<View className={styles.payment_list_top_border}></View>
|
||||
<View className={styles.payment_list_title}>
|
||||
@ -204,9 +209,15 @@ export default memo(({show = false, onClose, orderInfo, onSubmitSuccess}:Param)
|
||||
</View>
|
||||
{advance_payment}
|
||||
</View>
|
||||
<MCheckbox ref={advanceRef} status={submitData.payment_method == PaymentMethodPreDeposit.value} onSelect={() => advanceSelectData(PaymentMethodPreDeposit.value)} onClose={() => advanceSelectData(null)}/>
|
||||
<MCheckbox
|
||||
ref={advanceRef}
|
||||
status={submitData.payment_method == PaymentMethodPreDeposit.value}
|
||||
onSelect={() => advanceSelectData(PaymentMethodPreDeposit.value)}
|
||||
onClose={() => advanceSelectData(null)}
|
||||
/>
|
||||
</View>
|
||||
{show_account_payment&&<View className={styles.payment_list_item} onClick={accountPeriodSelect}>
|
||||
{show_account_payment && (
|
||||
<View className={styles.payment_list_item} onClick={accountPeriodSelect}>
|
||||
<View className={styles.payment_list_item_left}>
|
||||
<View className={styles.payment_list_item_left_name}>
|
||||
<View className={classnames('iconfont icon-xtianzhangqi', styles.miconfont, styles.account_period)}></View>
|
||||
@ -214,8 +225,14 @@ export default memo(({show = false, onClose, orderInfo, onSubmitSuccess}:Param)
|
||||
</View>
|
||||
{account_peyment}
|
||||
</View>
|
||||
<MCheckbox ref={accountPeriodRef} status={submitData.payment_method == PaymentMethodAccountPeriod.value} onSelect={() => periodSelectData(PaymentMethodAccountPeriod.value)} onClose={() => periodSelectData(null)}/>
|
||||
</View>}
|
||||
<MCheckbox
|
||||
ref={accountPeriodRef}
|
||||
status={submitData.payment_method == PaymentMethodAccountPeriod.value}
|
||||
onSelect={() => periodSelectData(PaymentMethodAccountPeriod.value)}
|
||||
onClose={() => periodSelectData(null)}
|
||||
/>
|
||||
</View>
|
||||
)}
|
||||
<View className={styles.payment_list_item} onClick={onShowOfflinePay}>
|
||||
<View className={styles.payment_list_item_left}>
|
||||
<View className={styles.payment_list_item_left_name}>
|
||||
@ -236,12 +253,13 @@ export default memo(({show = false, onClose, orderInfo, onSubmitSuccess}:Param)
|
||||
</View>
|
||||
</View>
|
||||
</View>
|
||||
<View className={styles.btns} onClick={submitPay}>确认交易</View>
|
||||
<View className={styles.btns} onClick={submitPay}>
|
||||
确认交易
|
||||
</View>
|
||||
</View>
|
||||
</Popup>
|
||||
<OfflinePay show={offlinePayShow} onClose={() => setofflinePayShow(false)} offlineInfo={payInfo?.offline_remittance_information} />
|
||||
<ScanPay orderInfo={onlinePayData} show={scanPayShow} onClose={() => setScanPayShow(false)} />
|
||||
</View>
|
||||
|
||||
)
|
||||
})
|
||||
@ -56,6 +56,7 @@ export default memo(({ show = true, onClose, company, orderInfo }: Param) => {
|
||||
})
|
||||
})
|
||||
})
|
||||
console.log('md5_key:::', orderInfo.md5_key)
|
||||
setDetail(() => ({
|
||||
title: '面料销售电子确认单',
|
||||
company: orderInfo.company_name, //后端公司
|
||||
@ -77,7 +78,7 @@ export default memo(({ show = true, onClose, company, orderInfo }: Param) => {
|
||||
order_total_price: formatPriceDiv(orderInfo.bill_total_sale_price).toString(), //订单价格
|
||||
show_order_total_price: orderInfo.is_display_price,
|
||||
order_total_num: orderInfo.total_number + '',
|
||||
qrcode: `${PAY_H5_CODE_URL}?sale_order_no=${orderInfo.order_no}`, //跳转链接
|
||||
qrcode: `${PAY_H5_CODE_URL}?key=${orderInfo.md5_key}`, //跳转链接
|
||||
order_total_weight: formatWeightDiv(orderInfo.total_weight || orderInfo.total_estimate_weight).toString(), //订单布匹重量
|
||||
list: lists,
|
||||
show_qrcode: true, //是否显示码单
|
||||
@ -95,7 +96,7 @@ export default memo(({ show = true, onClose, company, orderInfo }: Param) => {
|
||||
order_total_weight_error: formatWeightDiv(orderInfo.total_weight_error).toString(), //总空差重量
|
||||
}))
|
||||
}
|
||||
}, [orderInfo])
|
||||
}, [orderInfo, show])
|
||||
|
||||
//收货地址
|
||||
const address = (addressInfo) => {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user