diff --git a/addons/shopro/controller/UserWalletApply.php b/addons/shopro/controller/UserWalletApply.php index 0a85be0..72b7b04 100644 --- a/addons/shopro/controller/UserWalletApply.php +++ b/addons/shopro/controller/UserWalletApply.php @@ -169,16 +169,11 @@ class UserWalletApply extends Base } $huifu = $primary['huifu_onboard']; - $show = false; + $show = count($bindings) > 0; $canSubmitBind = false; foreach ($bindings as $binding) { $item = $binding['huifu_onboard']; - $approved = ($item['status'] ?? '') === 'approved'; - if (!$approved) { - $show = true; - } if (!empty($item['can_submit']) || !empty($item['can_save_draft'])) { - $show = true; $canSubmitBind = true; } } diff --git a/addons/shopro_huifu/library/onboard/HuifuOnboardAdminView.php b/addons/shopro_huifu/library/onboard/HuifuOnboardAdminView.php index 75b177b..5aa4d3c 100644 --- a/addons/shopro_huifu/library/onboard/HuifuOnboardAdminView.php +++ b/addons/shopro_huifu/library/onboard/HuifuOnboardAdminView.php @@ -527,6 +527,31 @@ class HuifuOnboardAdminView return $roleType; } + /** + * 小程序端回显已提交的进件资料(完整字段,仅当前登录用户接口使用) + */ + public static function clientFormFromRow($row) + { + if (!$row) { + return null; + } + $data = is_array($row) ? $row : $row->toArray(); + $payload = self::parsePayload($data['payload'] ?? ''); + if (!$payload) { + return null; + } + $form = array_merge(self::defaultFormData(), $payload); + foreach ([ + 'id_card_front_url', 'id_card_back_url', 'bank_card_url', 'license_url', + 'legal_id_front_url', 'legal_id_back_url', 'account_permit_url', + ] as $field) { + if (!empty($form[$field])) { + $form[$field] = self::fullUrl($form[$field]); + } + } + return $form; + } + public static function formDataFromRow($row) { $data = is_array($row) ? $row : $row->toArray(); diff --git a/addons/shopro_huifu/library/onboard/HuifuOnboardGate.php b/addons/shopro_huifu/library/onboard/HuifuOnboardGate.php index 6ff8a50..b31b752 100644 --- a/addons/shopro_huifu/library/onboard/HuifuOnboardGate.php +++ b/addons/shopro_huifu/library/onboard/HuifuOnboardGate.php @@ -125,6 +125,7 @@ class HuifuOnboardGate 'status' => null, 'huifu_id' => '', 'reject_reason' => '', + 'draft' => null, ]; } return [ @@ -137,6 +138,7 @@ class HuifuOnboardGate 'huifu_id' => $row['huifu_id'] ? substr($row['huifu_id'], 0, 4) . '****' . substr($row['huifu_id'], -4) : '', 'reject_reason' => $row['reject_reason'] ?? '', 'apply_no' => $row['apply_no'] ?? '', + 'draft' => HuifuOnboardAdminView::clientFormFromRow($row), ]; } }