fix(trade): simplify proxy order and respect product whitelist

Drop SMS verification for HQ/partner proxy orders; keep form draft across product picker; hide whitelist-only products from partner catalog.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
2026-07-31 09:43:16 +08:00
parent 2cd4e25682
commit 51f2b5fbfa
10 changed files with 311 additions and 592 deletions
+106 -231
View File
@@ -37,8 +37,6 @@ export default function ProxyOrderModal({ open, onClose, onSuccess }: ProxyOrder
const [options, setOptions] = useState<PartnerProxyOrderOptions | null>(null);
const [loadingOptions, setLoadingOptions] = useState(false);
const [phone, setPhone] = useState('');
const [customerSmsCode, setCustomerSmsCode] = useState('');
const [operatorSmsCode, setOperatorSmsCode] = useState('');
const [receiverName, setReceiverName] = useState('');
const [regionCodes, setRegionCodes] = useState<string[]>([]);
const [addressDetail, setAddressDetail] = useState('');
@@ -47,11 +45,8 @@ export default function ProxyOrderModal({ open, onClose, onSuccess }: ProxyOrder
const [promoCodeId, setPromoCodeId] = useState<string>();
const [deliveryMode, setDeliveryMode] = useState<PartnerProxyDeliveryMode>('ADDRESS');
const [autoReceive, setAutoReceive] = useState(false);
const [confirmStep, setConfirmStep] = useState(false);
const [preview, setPreview] = useState<PartnerProxyOrderPreviewResult | null>(null);
const [previewLoading, setPreviewLoading] = useState(false);
const [customerCooldown, setCustomerCooldown] = useState(0);
const [operatorCooldown, setOperatorCooldown] = useState(0);
const [submitting, setSubmitting] = useState(false);
const region = useMemo(() => parseRegionCodes(regionCodes), [regionCodes]);
@@ -94,8 +89,6 @@ export default function ProxyOrderModal({ open, onClose, onSuccess }: ProxyOrder
function resetForm() {
setPhone('');
setCustomerSmsCode('');
setOperatorSmsCode('');
setReceiverName('');
setRegionCodes([]);
setAddressDetail('');
@@ -103,10 +96,7 @@ export default function ProxyOrderModal({ open, onClose, onSuccess }: ProxyOrder
setPromoCodeId(undefined);
setDeliveryMode('ADDRESS');
setAutoReceive(false);
setConfirmStep(false);
setPreview(null);
setCustomerCooldown(0);
setOperatorCooldown(0);
setProductId(options?.products[0]?.id);
}
@@ -115,52 +105,8 @@ export default function ProxyOrderModal({ open, onClose, onSuccess }: ProxyOrder
onClose();
}
function startCooldown(setter: (n: number | ((s: number) => number)) => void) {
setter(60);
const timer = window.setInterval(() => {
setter((s) => {
if (s <= 1) {
window.clearInterval(timer);
return 0;
}
return s - 1;
});
}, 1000);
}
async function sendCustomerSms() {
if (!/^1\d{10}$/.test(phone.trim())) {
message.warning('请输入有效手机号');
return;
}
try {
const res = await request<{ maskedPhone: string }>('/admin/proxy-orders/send-customer-sms', {
method: 'POST',
body: JSON.stringify({ phone: phone.trim() }),
});
message.success(`客户验证码已发送至 ${res.maskedPhone}`);
startCooldown(setCustomerCooldown);
} catch (e) {
message.error(e instanceof Error ? e.message : '发送失败');
}
}
async function sendOperatorSms() {
try {
const res = await request<{ maskedPhone: string }>('/admin/proxy-orders/send-operator-sms', {
method: 'POST',
body: '{}',
});
message.success(`确认验证码已发送至总部手机 ${res.maskedPhone}`);
startCooldown(setOperatorCooldown);
} catch (e) {
message.error(e instanceof Error ? e.message : '发送失败');
}
}
function validateForm(): string | null {
if (!/^1\d{10}$/.test(phone.trim())) return '请输入有效手机号';
if (!customerSmsCode.trim()) return '请输入客户验证码';
if (!productId) return '请选择商品';
if (deliveryMode === 'ADDRESS') {
if (!region?.province || !region?.city || !region?.district) return '请选择省市区';
@@ -174,32 +120,15 @@ export default function ProxyOrderModal({ open, onClose, onSuccess }: ProxyOrder
return null;
}
async function openConfirmStep() {
const err = validateForm();
if (err) {
message.warning(err);
return;
}
setConfirmStep(true);
setOperatorSmsCode('');
await sendOperatorSms();
}
async function submit() {
const err = validateForm();
if (err) {
message.warning(err);
return;
}
if (!operatorSmsCode.trim()) {
message.warning('请输入总部确认验证码');
return;
}
const payload: HqProxyOrderCreateRequest = {
phone: phone.trim(),
customerSmsCode: customerSmsCode.trim(),
operatorSmsCode: operatorSmsCode.trim(),
deliveryMode,
autoReceive: deliveryMode === 'ADDRESS' ? true : undefined,
receiverName: receiverName.trim() || undefined,
@@ -243,186 +172,132 @@ export default function ProxyOrderModal({ open, onClose, onSuccess }: ProxyOrder
width={640}
destroyOnClose
footer={
confirmStep ? (
<Space>
<Button
onClick={() => {
setConfirmStep(false);
setOperatorSmsCode('');
}}
>
</Button>
<Button type="primary" loading={submitting} onClick={() => void submit()}>
</Button>
</Space>
) : (
<Space>
<Button onClick={handleClose}></Button>
<Button type="primary" loading={loadingOptions} onClick={() => void openConfirmStep()}>
</Button>
</Space>
)
<Space>
<Button onClick={handleClose}></Button>
<Button type="primary" loading={submitting || loadingOptions} onClick={() => void submit()}>
</Button>
</Space>
}
>
<Alert
type="info"
showIcon
style={{ marginBottom: 16 }}
message="线下已收款:提交后订单直接完成并发放好客权益(客户验证码 + 总部确认码)"
message="线下已收款:提交后订单直接完成并发放好客权益"
/>
{!confirmStep ? (
<Form layout="vertical">
<Form.Item label="用户手机号" required>
<Space.Compact style={{ width: '100%' }}>
<Input
placeholder="11 位手机号"
value={phone}
maxLength={11}
onChange={(e) => setPhone(e.target.value.replace(/\D/g, '').slice(0, 11))}
/>
<Button disabled={customerCooldown > 0} onClick={() => void sendCustomerSms()}>
{customerCooldown > 0 ? `${customerCooldown}s` : '获取验证码'}
</Button>
</Space.Compact>
</Form.Item>
<Form layout="vertical">
<Form.Item label="用户手机号" required>
<Input
placeholder="11 位手机号"
value={phone}
maxLength={11}
onChange={(e) => setPhone(e.target.value.replace(/\D/g, '').slice(0, 11))}
/>
</Form.Item>
<Form.Item label="客户验证码" required>
<Input
placeholder="发至客户手机"
value={customerSmsCode}
maxLength={6}
onChange={(e) => setCustomerSmsCode(e.target.value.replace(/\D/g, '').slice(0, 6))}
/>
</Form.Item>
<Form.Item label="酒品" required>
<Select
showSearch
optionFilterProp="label"
loading={loadingOptions}
placeholder="选择商品"
value={productId}
onChange={setProductId}
options={(options?.products ?? []).map((p) => ({
value: p.id,
label: `${p.name} · ${p.spec} · ¥${fmtMoney(p.price)}`,
}))}
/>
</Form.Item>
<Form.Item label="酒品" required>
<Form.Item label="数量" required>
<InputNumber
min={1}
value={quantity}
onChange={(v) => setQuantity(Math.max(1, Number(v) || 1))}
style={{ width: '100%' }}
/>
</Form.Item>
{(options?.promoCodes.length ?? 0) > 0 ? (
<Form.Item label="绑定推广码(选填)">
<Select
showSearch
optionFilterProp="label"
loading={loadingOptions}
placeholder="选择商品"
value={productId}
onChange={setProductId}
options={(options?.products ?? []).map((p) => ({
allowClear
placeholder="不绑定"
value={promoCodeId}
onChange={setPromoCodeId}
options={(options?.promoCodes ?? []).map((p) => ({
value: p.id,
label: `${p.name} · ${p.spec} · ¥${fmtMoney(p.price)}`,
label: `${p.code} · ${p.name}`,
}))}
/>
</Form.Item>
) : null}
<Form.Item label="数量" required>
<InputNumber min={1} value={quantity} onChange={(v) => setQuantity(Math.max(1, Number(v) || 1))} style={{ width: '100%' }} />
</Form.Item>
<Form.Item label="履约方式" required>
<Radio.Group
value={deliveryMode}
onChange={(e) => {
setDeliveryMode(e.target.value);
if (e.target.value !== 'ADDRESS') setAutoReceive(false);
}}
options={[
{ value: 'ADDRESS', label: '配送到址' },
{ value: 'ON_SITE_PICKUP', label: '现场提货' },
]}
/>
</Form.Item>
{(options?.promoCodes.length ?? 0) > 0 ? (
<Form.Item label="绑定推广码(选填)">
<Select
allowClear
placeholder="不绑定"
value={promoCodeId}
onChange={setPromoCodeId}
options={(options?.promoCodes ?? []).map((p) => ({
value: p.id,
label: `${p.code} · ${p.name}`,
}))}
{deliveryMode === 'ADDRESS' ? (
<>
<Form.Item label="收货人(选填)">
<Input
placeholder="默认:用户+手机尾号"
value={receiverName}
maxLength={32}
onChange={(e) => setReceiverName(e.target.value)}
/>
</Form.Item>
) : null}
<Form.Item label="履约方式" required>
<Radio.Group
value={deliveryMode}
onChange={(e) => {
setDeliveryMode(e.target.value);
if (e.target.value !== 'ADDRESS') setAutoReceive(false);
}}
options={[
{ value: 'ADDRESS', label: '配送到址' },
{ value: 'ON_SITE_PICKUP', label: '现场提货' },
]}
/>
</Form.Item>
{deliveryMode === 'ADDRESS' ? (
<>
<Form.Item label="收货人(选填)">
<Input
placeholder="默认:用户+手机尾号"
value={receiverName}
maxLength={32}
onChange={(e) => setReceiverName(e.target.value)}
/>
</Form.Item>
<Form.Item label="省市区" required>
<ChinaRegionCascader value={regionCodes} onChange={setRegionCodes} />
</Form.Item>
<Form.Item label="详细地址" required>
<Input.TextArea
rows={2}
placeholder="街道门牌等"
value={addressDetail}
maxLength={256}
onChange={(e) => setAddressDetail(e.target.value)}
/>
</Form.Item>
<Form.Item>
<Checkbox checked={autoReceive} onChange={(e) => setAutoReceive(e.target.checked)}>
</Checkbox>
</Form.Item>
</>
) : null}
<div style={{ background: '#fafafa', borderRadius: 8, padding: 12 }}>
<Typography.Text type="secondary"></Typography.Text>
{previewLoading ? (
<div></div>
) : preview ? (
<Space direction="vertical" size={2} style={{ width: '100%', marginTop: 8 }}>
<div>{deliveryLabel}</div>
<div>¥{fmtMoney(preview.productAmount)}</div>
<div>¥{fmtMoney(preview.payAmount)}</div>
<div>¥{fmtMoney(preview.benefitAmount)}</div>
</Space>
) : (
<div style={{ marginTop: 8 }}>
<Typography.Text type="secondary"></Typography.Text>
</div>
)}
</div>
</Form>
) : (
<Form layout="vertical">
<Alert
type="warning"
showIcon
style={{ marginBottom: 16 }}
message={`即将为 ${phone} 创建已完成订单并发放权益,请输入发至总部账号手机的确认验证码`}
/>
<Form.Item label="总部确认验证码" required>
<Space.Compact style={{ width: '100%' }}>
<Input
placeholder="发至当前登录 HQ 手机"
value={operatorSmsCode}
maxLength={6}
onChange={(e) => setOperatorSmsCode(e.target.value.replace(/\D/g, '').slice(0, 6))}
<Form.Item label="省市区" required>
<ChinaRegionCascader value={regionCodes} onChange={setRegionCodes} />
</Form.Item>
<Form.Item label="详细地址" required>
<Input.TextArea
rows={2}
placeholder="街道门牌等"
value={addressDetail}
maxLength={256}
onChange={(e) => setAddressDetail(e.target.value)}
/>
<Button disabled={operatorCooldown > 0} onClick={() => void sendOperatorSms()}>
{operatorCooldown > 0 ? `${operatorCooldown}s` : '重新发送'}
</Button>
</Space.Compact>
</Form.Item>
{preview ? (
<Typography.Paragraph type="secondary" style={{ marginBottom: 0 }}>
{deliveryLabel} · ¥{fmtMoney(preview.payAmount)} · ¥{fmtMoney(preview.benefitAmount)}
</Typography.Paragraph>
) : null}
</Form>
)}
</Form.Item>
<Form.Item>
<Checkbox checked={autoReceive} onChange={(e) => setAutoReceive(e.target.checked)}>
</Checkbox>
</Form.Item>
</>
) : null}
<div style={{ background: '#fafafa', borderRadius: 8, padding: 12 }}>
<Typography.Text type="secondary"></Typography.Text>
{previewLoading ? (
<div></div>
) : preview ? (
<Space direction="vertical" size={2} style={{ width: '100%', marginTop: 8 }}>
<div>{deliveryLabel}</div>
<div>¥{fmtMoney(preview.productAmount)}</div>
<div>¥{fmtMoney(preview.payAmount)}</div>
<div>¥{fmtMoney(preview.benefitAmount)}</div>
</Space>
) : (
<div style={{ marginTop: 8 }}>
<Typography.Text type="secondary"></Typography.Text>
</div>
)}
</div>
</Form>
</Modal>
);
}